Automate Updates to the API Client Library

Removed client-kit generated code from git repo.
This code is now generated under the target folder.
client-kit now uses latest appc-provider-lcm.yang
on the branch.

Change-Id: I7a20774b60bb447343886997c32ca3b3c5dcbafa
Issue-ID: APPC-360
Signed-off-by: Joey Sullivan <joey.sullivan@amdocs.com>

102 files changed, 307 insertions, 8872 deletions

diff --git a/appc-client/client-kit/pom.xml b/appc-client/client-kit/pom.xml
index cc21d0401..3ff3b7844 100644
--- a/appc-client/client-kit/pom.xml
+++ b/appc-client/client-kit/pom.xml
@@ -38,6 +38,52 @@
         <licenseDir>${project.parent.parent.basedir}</licenseDir>

     </properties>

 

+    <build>

+        <plugins>

+            <plugin>

+                <groupId>org.onap.appc.client</groupId>

+                <artifactId>code-generator</artifactId>

+                <version>${project.parent.version}</version>

+                <dependencies>

+                    <dependency>

+                        <groupId>org.onap.appc</groupId>

+                        <artifactId>appc-provider-model</artifactId>

+                        <version>${project.parent.version}</version>

+                    </dependency>

+                </dependencies>

+                <executions>

+                    <execution>

+                        <id>code-generate-json</id>

+                        <goals>

+                            <goal>generate-sources</goal>

+                        </goals>

+                        <configuration>

+                            <sourceFileName>META-INF/yang/appc-provider-lcm.yang</sourceFileName>

+                            <outputFileName>target/generated-sources/appc-provider-lcm/appc-provider-lcm.json</outputFileName>

+                            <templateName>templates/open-api/yang-to-open-api.ftl</templateName>

+                            <contextBuilderClassName>org.onap.appc.tools.generator.extensions.YangContextBuilderImpl

+                            </contextBuilderClassName>

+                            <contextConfigFileName>APPC</contextConfigFileName>

+                        </configuration>

+                    </execution>

+                    <execution>

+                        <id>code-generate-java</id>

+                        <goals>

+                            <goal>generate-sources</goal>

+                        </goals>

+                        <configuration>

+                            <sourceFileName>target/generated-sources/appc-provider-lcm/appc-provider-lcm.json</sourceFileName>

+                            <outputFileName>target/generated-sources/appc-provider-lcm/output.txt</outputFileName>

+                            <templateName>templates/client-kit/open-api-to-java.ftl</templateName>

+                            <contextBuilderClassName>org.onap.appc.tools.generator.extensions.JsonContextBuilderImpl</contextBuilderClassName>

+                            <contextConfigFileName>configuration/client-kit.properties</contextConfigFileName>

+                        </configuration>

+                    </execution>

+                </executions>

+            </plugin>

+        </plugins>

+    </build>

+

     <dependencies>

         <dependency>

             <groupId>org.onap.appc.client</groupId>

@@ -50,5 +96,6 @@
             <version>${yang.parser.impl.version}</version>

             <scope>test</scope>

         </dependency>

+

     </dependencies>

 </project>

diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/api/LifeCycleManagerStateful.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/api/LifeCycleManagerStateful.java
deleted file mode 100644
index 0efbcc3a3..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/api/LifeCycleManagerStateful.java
+++ /dev/null
@@ -1,783 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/*
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.api;
-
-import org.onap.appc.client.lcm.model.ActionStatusOutput;
-import org.onap.appc.client.lcm.model.ActionStatusInput;
-import org.onap.appc.client.lcm.model.AttachVolumeOutput;
-import org.onap.appc.client.lcm.model.AttachVolumeInput;
-import org.onap.appc.client.lcm.model.AuditOutput;
-import org.onap.appc.client.lcm.model.AuditInput;
-import org.onap.appc.client.lcm.model.CheckLockOutput;
-import org.onap.appc.client.lcm.model.CheckLockInput;
-import org.onap.appc.client.lcm.model.ConfigBackupOutput;
-import org.onap.appc.client.lcm.model.ConfigBackupInput;
-import org.onap.appc.client.lcm.model.ConfigBackupDeleteOutput;
-import org.onap.appc.client.lcm.model.ConfigBackupDeleteInput;
-import org.onap.appc.client.lcm.model.ConfigExportOutput;
-import org.onap.appc.client.lcm.model.ConfigExportInput;
-import org.onap.appc.client.lcm.model.ConfigModifyOutput;
-import org.onap.appc.client.lcm.model.ConfigModifyInput;
-import org.onap.appc.client.lcm.model.ConfigRestoreOutput;
-import org.onap.appc.client.lcm.model.ConfigRestoreInput;
-import org.onap.appc.client.lcm.model.ConfigScaleoutOutput;
-import org.onap.appc.client.lcm.model.ConfigScaleoutInput;
-import org.onap.appc.client.lcm.model.ConfigureOutput;
-import org.onap.appc.client.lcm.model.ConfigureInput;
-import org.onap.appc.client.lcm.model.DetachVolumeOutput;
-import org.onap.appc.client.lcm.model.DetachVolumeInput;
-import org.onap.appc.client.lcm.model.EvacuateOutput;
-import org.onap.appc.client.lcm.model.EvacuateInput;
-import org.onap.appc.client.lcm.model.HealthCheckOutput;
-import org.onap.appc.client.lcm.model.HealthCheckInput;
-import org.onap.appc.client.lcm.model.LiveUpgradeOutput;
-import org.onap.appc.client.lcm.model.LiveUpgradeInput;
-import org.onap.appc.client.lcm.model.LockOutput;
-import org.onap.appc.client.lcm.model.LockInput;
-import org.onap.appc.client.lcm.model.MigrateOutput;
-import org.onap.appc.client.lcm.model.MigrateInput;
-import org.onap.appc.client.lcm.model.QueryOutput;
-import org.onap.appc.client.lcm.model.QueryInput;
-import org.onap.appc.client.lcm.model.QuiesceTrafficOutput;
-import org.onap.appc.client.lcm.model.QuiesceTrafficInput;
-import org.onap.appc.client.lcm.model.RebootOutput;
-import org.onap.appc.client.lcm.model.RebootInput;
-import org.onap.appc.client.lcm.model.RebuildOutput;
-import org.onap.appc.client.lcm.model.RebuildInput;
-import org.onap.appc.client.lcm.model.RestartOutput;
-import org.onap.appc.client.lcm.model.RestartInput;
-import org.onap.appc.client.lcm.model.ResumeTrafficOutput;
-import org.onap.appc.client.lcm.model.ResumeTrafficInput;
-import org.onap.appc.client.lcm.model.RollbackOutput;
-import org.onap.appc.client.lcm.model.RollbackInput;
-import org.onap.appc.client.lcm.model.SnapshotOutput;
-import org.onap.appc.client.lcm.model.SnapshotInput;
-import org.onap.appc.client.lcm.model.SoftwareUploadOutput;
-import org.onap.appc.client.lcm.model.SoftwareUploadInput;
-import org.onap.appc.client.lcm.model.StartOutput;
-import org.onap.appc.client.lcm.model.StartInput;
-import org.onap.appc.client.lcm.model.StartApplicationOutput;
-import org.onap.appc.client.lcm.model.StartApplicationInput;
-import org.onap.appc.client.lcm.model.StopOutput;
-import org.onap.appc.client.lcm.model.StopInput;
-import org.onap.appc.client.lcm.model.StopApplicationOutput;
-import org.onap.appc.client.lcm.model.StopApplicationInput;
-import org.onap.appc.client.lcm.model.SyncOutput;
-import org.onap.appc.client.lcm.model.SyncInput;
-import org.onap.appc.client.lcm.model.TerminateOutput;
-import org.onap.appc.client.lcm.model.TerminateInput;
-import org.onap.appc.client.lcm.model.TestOutput;
-import org.onap.appc.client.lcm.model.TestInput;
-import org.onap.appc.client.lcm.model.UnlockOutput;
-import org.onap.appc.client.lcm.model.UnlockInput;
-import org.onap.appc.client.lcm.model.UpgradeBackoutOutput;
-import org.onap.appc.client.lcm.model.UpgradeBackoutInput;
-import org.onap.appc.client.lcm.model.UpgradeBackupOutput;
-import org.onap.appc.client.lcm.model.UpgradeBackupInput;
-import org.onap.appc.client.lcm.model.UpgradePostCheckOutput;
-import org.onap.appc.client.lcm.model.UpgradePostCheckInput;
-import org.onap.appc.client.lcm.model.UpgradePreCheckOutput;
-import org.onap.appc.client.lcm.model.UpgradePreCheckInput;
-import org.onap.appc.client.lcm.model.UpgradeSoftwareOutput;
-import org.onap.appc.client.lcm.model.UpgradeSoftwareInput;
-import org.onap.appc.client.lcm.exceptions.AppcClientException;
-import org.onap.appc.RPC;
-
-/**
-* Defines the services and request/response requirements for the ECOMP APP-C component.
-*/
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-27T12:27:49.205-06:00",
-    comments = "Auto-generated from Open API specification")
-public interface LifeCycleManagerStateful {
-
-    /**
-     * An operation to get the current state of the previously submitted LCM request
-     *
-     * @param actionStatusInput - RPC input object
-     */
-    @RPC(name="action-status", outputType=ActionStatusOutput.class)
-    ActionStatusOutput actionStatus(ActionStatusInput actionStatusInput) throws AppcClientException;
-
-    /**
-     * An operation to get the current state of the previously submitted LCM request
-     *
-     * @param actionStatusInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="action-status", outputType=ActionStatusOutput.class)
-    void actionStatus(ActionStatusInput actionStatusInput, ResponseHandler<ActionStatusOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to attach a cinder volume to a VM
-     *
-     * @param attachVolumeInput - RPC input object
-     */
-    @RPC(name="attach-volume", outputType=AttachVolumeOutput.class)
-    AttachVolumeOutput attachVolume(AttachVolumeInput attachVolumeInput) throws AppcClientException;
-
-    /**
-     * An operation to attach a cinder volume to a VM
-     *
-     * @param attachVolumeInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="attach-volume", outputType=AttachVolumeOutput.class)
-    void attachVolume(AttachVolumeInput attachVolumeInput, ResponseHandler<AttachVolumeOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to audit the configurations of a virtual network function (or VM)
-     *
-     * @param auditInput - RPC input object
-     */
-    @RPC(name="audit", outputType=AuditOutput.class)
-    AuditOutput audit(AuditInput auditInput) throws AppcClientException;
-
-    /**
-     * An operation to audit the configurations of a virtual network function (or VM)
-     *
-     * @param auditInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="audit", outputType=AuditOutput.class)
-    void audit(AuditInput auditInput, ResponseHandler<AuditOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to check VNF lock status
-     *
-     * @param checkLockInput - RPC input object
-     */
-    @RPC(name="check-lock", outputType=CheckLockOutput.class)
-    CheckLockOutput checkLock(CheckLockInput checkLockInput) throws AppcClientException;
-
-    /**
-     * An operation to check VNF lock status
-     *
-     * @param checkLockInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="check-lock", outputType=CheckLockOutput.class)
-    void checkLock(CheckLockInput checkLockInput, ResponseHandler<CheckLockOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to Backup configurations of a virtual network function (or VM)
-     *
-     * @param configBackupInput - RPC input object
-     */
-    @RPC(name="config-backup", outputType=ConfigBackupOutput.class)
-    ConfigBackupOutput configBackup(ConfigBackupInput configBackupInput) throws AppcClientException;
-
-    /**
-     * An operation to Backup configurations of a virtual network function (or VM)
-     *
-     * @param configBackupInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="config-backup", outputType=ConfigBackupOutput.class)
-    void configBackup(ConfigBackupInput configBackupInput, ResponseHandler<ConfigBackupOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to Delete backup configurations of a virtual network function (or VM)
-     *
-     * @param configBackupDeleteInput - RPC input object
-     */
-    @RPC(name="config-backup-delete", outputType=ConfigBackupDeleteOutput.class)
-    ConfigBackupDeleteOutput configBackupDelete(ConfigBackupDeleteInput configBackupDeleteInput) throws AppcClientException;
-
-    /**
-     * An operation to Delete backup configurations of a virtual network function (or VM)
-     *
-     * @param configBackupDeleteInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="config-backup-delete", outputType=ConfigBackupDeleteOutput.class)
-    void configBackupDelete(ConfigBackupDeleteInput configBackupDeleteInput, ResponseHandler<ConfigBackupDeleteOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to Export configurations of a virtual network function (or VM)
-     *
-     * @param configExportInput - RPC input object
-     */
-    @RPC(name="config-export", outputType=ConfigExportOutput.class)
-    ConfigExportOutput configExport(ConfigExportInput configExportInput) throws AppcClientException;
-
-    /**
-     * An operation to Export configurations of a virtual network function (or VM)
-     *
-     * @param configExportInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="config-export", outputType=ConfigExportOutput.class)
-    void configExport(ConfigExportInput configExportInput, ResponseHandler<ConfigExportOutput> listener) throws AppcClientException;
-
-    /**
-     * Use the ModifyConfig command when a full configuration cycle is either not required or is considered too costly. The ModifyConfig LCM action affects only a subset of the total configuration data of a VNF. The set of configuration parameters to be affected is a subset of the total configuration data of the target VNF type. The payload Stop Application must contain the configuration parameters to be modified and their values. A successful modify returns a success response. A failed modify returns a failure response and the specific failure messages in the response payload Stop Application
-     *
-     * @param configModifyInput - RPC input object
-     */
-    @RPC(name="config-modify", outputType=ConfigModifyOutput.class)
-    ConfigModifyOutput configModify(ConfigModifyInput configModifyInput) throws AppcClientException;
-
-    /**
-     * Use the ModifyConfig command when a full configuration cycle is either not required or is considered too costly. The ModifyConfig LCM action affects only a subset of the total configuration data of a VNF. The set of configuration parameters to be affected is a subset of the total configuration data of the target VNF type. The payload Stop Application must contain the configuration parameters to be modified and their values. A successful modify returns a success response. A failed modify returns a failure response and the specific failure messages in the response payload Stop Application
-     *
-     * @param configModifyInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="config-modify", outputType=ConfigModifyOutput.class)
-    void configModify(ConfigModifyInput configModifyInput, ResponseHandler<ConfigModifyOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to restore the configurations of a virtual network function (or VM)
-     *
-     * @param configRestoreInput - RPC input object
-     */
-    @RPC(name="config-restore", outputType=ConfigRestoreOutput.class)
-    ConfigRestoreOutput configRestore(ConfigRestoreInput configRestoreInput) throws AppcClientException;
-
-    /**
-     * An operation to restore the configurations of a virtual network function (or VM)
-     *
-     * @param configRestoreInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="config-restore", outputType=ConfigRestoreOutput.class)
-    void configRestore(ConfigRestoreInput configRestoreInput, ResponseHandler<ConfigRestoreOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to scaleout the configurations of a virtual network function (or VM)
-     *
-     * @param configScaleoutInput - RPC input object
-     */
-    @RPC(name="config-scaleout", outputType=ConfigScaleoutOutput.class)
-    ConfigScaleoutOutput configScaleout(ConfigScaleoutInput configScaleoutInput) throws AppcClientException;
-
-    /**
-     * An operation to scaleout the configurations of a virtual network function (or VM)
-     *
-     * @param configScaleoutInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="config-scaleout", outputType=ConfigScaleoutOutput.class)
-    void configScaleout(ConfigScaleoutInput configScaleoutInput, ResponseHandler<ConfigScaleoutOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to configure the configurations of a virtual network function (or VM)
-     *
-     * @param configureInput - RPC input object
-     */
-    @RPC(name="configure", outputType=ConfigureOutput.class)
-    ConfigureOutput configure(ConfigureInput configureInput) throws AppcClientException;
-
-    /**
-     * An operation to configure the configurations of a virtual network function (or VM)
-     *
-     * @param configureInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="configure", outputType=ConfigureOutput.class)
-    void configure(ConfigureInput configureInput, ResponseHandler<ConfigureOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to detach a cinder volume from a VM
-     *
-     * @param detachVolumeInput - RPC input object
-     */
-    @RPC(name="detach-volume", outputType=DetachVolumeOutput.class)
-    DetachVolumeOutput detachVolume(DetachVolumeInput detachVolumeInput) throws AppcClientException;
-
-    /**
-     * An operation to detach a cinder volume from a VM
-     *
-     * @param detachVolumeInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="detach-volume", outputType=DetachVolumeOutput.class)
-    void detachVolume(DetachVolumeInput detachVolumeInput, ResponseHandler<DetachVolumeOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to evacuate a virtual network function (or VM)
-     *
-     * @param evacuateInput - RPC input object
-     */
-    @RPC(name="evacuate", outputType=EvacuateOutput.class)
-    EvacuateOutput evacuate(EvacuateInput evacuateInput) throws AppcClientException;
-
-    /**
-     * An operation to evacuate a virtual network function (or VM)
-     *
-     * @param evacuateInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="evacuate", outputType=EvacuateOutput.class)
-    void evacuate(EvacuateInput evacuateInput, ResponseHandler<EvacuateOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to perform health check of vSCP prior its upgrading
-     *
-     * @param healthCheckInput - RPC input object
-     */
-    @RPC(name="health-check", outputType=HealthCheckOutput.class)
-    HealthCheckOutput healthCheck(HealthCheckInput healthCheckInput) throws AppcClientException;
-
-    /**
-     * An operation to perform health check of vSCP prior its upgrading
-     *
-     * @param healthCheckInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="health-check", outputType=HealthCheckOutput.class)
-    void healthCheck(HealthCheckInput healthCheckInput, ResponseHandler<HealthCheckOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to perform upgrade of vSCP
-     *
-     * @param liveUpgradeInput - RPC input object
-     */
-    @RPC(name="live-upgrade", outputType=LiveUpgradeOutput.class)
-    LiveUpgradeOutput liveUpgrade(LiveUpgradeInput liveUpgradeInput) throws AppcClientException;
-
-    /**
-     * An operation to perform upgrade of vSCP
-     *
-     * @param liveUpgradeInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="live-upgrade", outputType=LiveUpgradeOutput.class)
-    void liveUpgrade(LiveUpgradeInput liveUpgradeInput, ResponseHandler<LiveUpgradeOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to perform VNF lock operation
-     *
-     * @param lockInput - RPC input object
-     */
-    @RPC(name="lock", outputType=LockOutput.class)
-    LockOutput lock(LockInput lockInput) throws AppcClientException;
-
-    /**
-     * An operation to perform VNF lock operation
-     *
-     * @param lockInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="lock", outputType=LockOutput.class)
-    void lock(LockInput lockInput, ResponseHandler<LockOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to migrate a virtual network function (or VM)
-     *
-     * @param migrateInput - RPC input object
-     */
-    @RPC(name="migrate", outputType=MigrateOutput.class)
-    MigrateOutput migrate(MigrateInput migrateInput) throws AppcClientException;
-
-    /**
-     * An operation to migrate a virtual network function (or VM)
-     *
-     * @param migrateInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="migrate", outputType=MigrateOutput.class)
-    void migrate(MigrateInput migrateInput, ResponseHandler<MigrateOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to query the status of a targe VNF. Returns information on each VM, including state (active or standby) and status (healthy or unhealthy)
-     *
-     * @param queryInput - RPC input object
-     */
-    @RPC(name="query", outputType=QueryOutput.class)
-    QueryOutput query(QueryInput queryInput) throws AppcClientException;
-
-    /**
-     * An operation to query the status of a targe VNF. Returns information on each VM, including state (active or standby) and status (healthy or unhealthy)
-     *
-     * @param queryInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="query", outputType=QueryOutput.class)
-    void query(QueryInput queryInput, ResponseHandler<QueryOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to stop traffic gracefully on the VF. It stops traffic gracefully without stopping the application
-     *
-     * @param quiesceTrafficInput - RPC input object
-     */
-    @RPC(name="quiesce-traffic", outputType=QuiesceTrafficOutput.class)
-    QuiesceTrafficOutput quiesceTraffic(QuiesceTrafficInput quiesceTrafficInput) throws AppcClientException;
-
-    /**
-     * An operation to stop traffic gracefully on the VF. It stops traffic gracefully without stopping the application
-     *
-     * @param quiesceTrafficInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="quiesce-traffic", outputType=QuiesceTrafficOutput.class)
-    void quiesceTraffic(QuiesceTrafficInput quiesceTrafficInput, ResponseHandler<QuiesceTrafficOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to reboot a specified virtual machine (VM)
-     *
-     * @param rebootInput - RPC input object
-     */
-    @RPC(name="reboot", outputType=RebootOutput.class)
-    RebootOutput reboot(RebootInput rebootInput) throws AppcClientException;
-
-    /**
-     * An operation to reboot a specified virtual machine (VM)
-     *
-     * @param rebootInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="reboot", outputType=RebootOutput.class)
-    void reboot(RebootInput rebootInput, ResponseHandler<RebootOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to rebuild a virtual network function (or VM)
-     *
-     * @param rebuildInput - RPC input object
-     */
-    @RPC(name="rebuild", outputType=RebuildOutput.class)
-    RebuildOutput rebuild(RebuildInput rebuildInput) throws AppcClientException;
-
-    /**
-     * An operation to rebuild a virtual network function (or VM)
-     *
-     * @param rebuildInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="rebuild", outputType=RebuildOutput.class)
-    void rebuild(RebuildInput rebuildInput, ResponseHandler<RebuildOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to restart a virtual network function (or VM)
-     *
-     * @param restartInput - RPC input object
-     */
-    @RPC(name="restart", outputType=RestartOutput.class)
-    RestartOutput restart(RestartInput restartInput) throws AppcClientException;
-
-    /**
-     * An operation to restart a virtual network function (or VM)
-     *
-     * @param restartInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="restart", outputType=RestartOutput.class)
-    void restart(RestartInput restartInput, ResponseHandler<RestartOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to resume traffic gracefully on the VF. It resumes traffic gracefully without stopping the application
-     *
-     * @param resumeTrafficInput - RPC input object
-     */
-    @RPC(name="resume-traffic", outputType=ResumeTrafficOutput.class)
-    ResumeTrafficOutput resumeTraffic(ResumeTrafficInput resumeTrafficInput) throws AppcClientException;
-
-    /**
-     * An operation to resume traffic gracefully on the VF. It resumes traffic gracefully without stopping the application
-     *
-     * @param resumeTrafficInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="resume-traffic", outputType=ResumeTrafficOutput.class)
-    void resumeTraffic(ResumeTrafficInput resumeTrafficInput, ResponseHandler<ResumeTrafficOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to rollback to particular snapshot of a virtual network function (or VM)
-     *
-     * @param rollbackInput - RPC input object
-     */
-    @RPC(name="rollback", outputType=RollbackOutput.class)
-    RollbackOutput rollback(RollbackInput rollbackInput) throws AppcClientException;
-
-    /**
-     * An operation to rollback to particular snapshot of a virtual network function (or VM)
-     *
-     * @param rollbackInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="rollback", outputType=RollbackOutput.class)
-    void rollback(RollbackInput rollbackInput, ResponseHandler<RollbackOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to create a snapshot of a virtual network function (or VM)
-     *
-     * @param snapshotInput - RPC input object
-     */
-    @RPC(name="snapshot", outputType=SnapshotOutput.class)
-    SnapshotOutput snapshot(SnapshotInput snapshotInput) throws AppcClientException;
-
-    /**
-     * An operation to create a snapshot of a virtual network function (or VM)
-     *
-     * @param snapshotInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="snapshot", outputType=SnapshotOutput.class)
-    void snapshot(SnapshotInput snapshotInput, ResponseHandler<SnapshotOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to upload a new version of vSCP image to vSCP for updating it
-     *
-     * @param softwareUploadInput - RPC input object
-     */
-    @RPC(name="software-upload", outputType=SoftwareUploadOutput.class)
-    SoftwareUploadOutput softwareUpload(SoftwareUploadInput softwareUploadInput) throws AppcClientException;
-
-    /**
-     * An operation to upload a new version of vSCP image to vSCP for updating it
-     *
-     * @param softwareUploadInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="software-upload", outputType=SoftwareUploadOutput.class)
-    void softwareUpload(SoftwareUploadInput softwareUploadInput, ResponseHandler<SoftwareUploadOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to start a virtual network function (or VM)
-     *
-     * @param startInput - RPC input object
-     */
-    @RPC(name="start", outputType=StartOutput.class)
-    StartOutput start(StartInput startInput) throws AppcClientException;
-
-    /**
-     * An operation to start a virtual network function (or VM)
-     *
-     * @param startInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="start", outputType=StartOutput.class)
-    void start(StartInput startInput, ResponseHandler<StartOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to perform VNF Start Application operation
-     *
-     * @param startApplicationInput - RPC input object
-     */
-    @RPC(name="start-application", outputType=StartApplicationOutput.class)
-    StartApplicationOutput startApplication(StartApplicationInput startApplicationInput) throws AppcClientException;
-
-    /**
-     * An operation to perform VNF Start Application operation
-     *
-     * @param startApplicationInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="start-application", outputType=StartApplicationOutput.class)
-    void startApplication(StartApplicationInput startApplicationInput, ResponseHandler<StartApplicationOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to stop the configurations of a virtual network function (or VM)
-     *
-     * @param stopInput - RPC input object
-     */
-    @RPC(name="stop", outputType=StopOutput.class)
-    StopOutput stop(StopInput stopInput) throws AppcClientException;
-
-    /**
-     * An operation to stop the configurations of a virtual network function (or VM)
-     *
-     * @param stopInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="stop", outputType=StopOutput.class)
-    void stop(StopInput stopInput, ResponseHandler<StopOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to Stop Application traffic to a virtual network function
-     *
-     * @param stopApplicationInput - RPC input object
-     */
-    @RPC(name="stop-application", outputType=StopApplicationOutput.class)
-    StopApplicationOutput stopApplication(StopApplicationInput stopApplicationInput) throws AppcClientException;
-
-    /**
-     * An operation to Stop Application traffic to a virtual network function
-     *
-     * @param stopApplicationInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="stop-application", outputType=StopApplicationOutput.class)
-    void stopApplication(StopApplicationInput stopApplicationInput, ResponseHandler<StopApplicationOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to sync the configurations of a virtual network function (or VM)
-     *
-     * @param syncInput - RPC input object
-     */
-    @RPC(name="sync", outputType=SyncOutput.class)
-    SyncOutput sync(SyncInput syncInput) throws AppcClientException;
-
-    /**
-     * An operation to sync the configurations of a virtual network function (or VM)
-     *
-     * @param syncInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="sync", outputType=SyncOutput.class)
-    void sync(SyncInput syncInput, ResponseHandler<SyncOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to terminate the configurations of a virtual network function (or VM)
-     *
-     * @param terminateInput - RPC input object
-     */
-    @RPC(name="terminate", outputType=TerminateOutput.class)
-    TerminateOutput terminate(TerminateInput terminateInput) throws AppcClientException;
-
-    /**
-     * An operation to terminate the configurations of a virtual network function (or VM)
-     *
-     * @param terminateInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="terminate", outputType=TerminateOutput.class)
-    void terminate(TerminateInput terminateInput, ResponseHandler<TerminateOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to test the configurations of a virtual network function (or VM)
-     *
-     * @param testInput - RPC input object
-     */
-    @RPC(name="test", outputType=TestOutput.class)
-    TestOutput test(TestInput testInput) throws AppcClientException;
-
-    /**
-     * An operation to test the configurations of a virtual network function (or VM)
-     *
-     * @param testInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="test", outputType=TestOutput.class)
-    void test(TestInput testInput, ResponseHandler<TestOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to perform VNF unlock operation
-     *
-     * @param unlockInput - RPC input object
-     */
-    @RPC(name="unlock", outputType=UnlockOutput.class)
-    UnlockOutput unlock(UnlockInput unlockInput) throws AppcClientException;
-
-    /**
-     * An operation to perform VNF unlock operation
-     *
-     * @param unlockInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="unlock", outputType=UnlockOutput.class)
-    void unlock(UnlockInput unlockInput, ResponseHandler<UnlockOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation does a backout after an UpgradeSoftware is completed (either successfully or unsuccessfully).
-     *
-     * @param upgradeBackoutInput - RPC input object
-     */
-    @RPC(name="upgrade-backout", outputType=UpgradeBackoutOutput.class)
-    UpgradeBackoutOutput upgradeBackout(UpgradeBackoutInput upgradeBackoutInput) throws AppcClientException;
-
-    /**
-     * An operation does a backout after an UpgradeSoftware is completed (either successfully or unsuccessfully).
-     *
-     * @param upgradeBackoutInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="upgrade-backout", outputType=UpgradeBackoutOutput.class)
-    void upgradeBackout(UpgradeBackoutInput upgradeBackoutInput, ResponseHandler<UpgradeBackoutOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to do full backup of the VNF data prior to an upgrade.
-     *
-     * @param upgradeBackupInput - RPC input object
-     */
-    @RPC(name="upgrade-backup", outputType=UpgradeBackupOutput.class)
-    UpgradeBackupOutput upgradeBackup(UpgradeBackupInput upgradeBackupInput) throws AppcClientException;
-
-    /**
-     * An operation to do full backup of the VNF data prior to an upgrade.
-     *
-     * @param upgradeBackupInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="upgrade-backup", outputType=UpgradeBackupOutput.class)
-    void upgradeBackup(UpgradeBackupInput upgradeBackupInput, ResponseHandler<UpgradeBackupOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to check the VNF upgrade has been successful completed and all processes are running properly.
-     *
-     * @param upgradePostCheckInput - RPC input object
-     */
-    @RPC(name="upgrade-post-check", outputType=UpgradePostCheckOutput.class)
-    UpgradePostCheckOutput upgradePostCheck(UpgradePostCheckInput upgradePostCheckInput) throws AppcClientException;
-
-    /**
-     * An operation to check the VNF upgrade has been successful completed and all processes are running properly.
-     *
-     * @param upgradePostCheckInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="upgrade-post-check", outputType=UpgradePostCheckOutput.class)
-    void upgradePostCheck(UpgradePostCheckInput upgradePostCheckInput, ResponseHandler<UpgradePostCheckOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to check that the VNF has the correct software version needed for a software upgrade.
-     *
-     * @param upgradePreCheckInput - RPC input object
-     */
-    @RPC(name="upgrade-pre-check", outputType=UpgradePreCheckOutput.class)
-    UpgradePreCheckOutput upgradePreCheck(UpgradePreCheckInput upgradePreCheckInput) throws AppcClientException;
-
-    /**
-     * An operation to check that the VNF has the correct software version needed for a software upgrade.
-     *
-     * @param upgradePreCheckInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="upgrade-pre-check", outputType=UpgradePreCheckOutput.class)
-    void upgradePreCheck(UpgradePreCheckInput upgradePreCheckInput, ResponseHandler<UpgradePreCheckOutput> listener) throws AppcClientException;
-
-    /**
-     * An operation to upgrade the target VNF to a new version and expected that the VNF is in a quiesced status .
-     *
-     * @param upgradeSoftwareInput - RPC input object
-     */
-    @RPC(name="upgrade-software", outputType=UpgradeSoftwareOutput.class)
-    UpgradeSoftwareOutput upgradeSoftware(UpgradeSoftwareInput upgradeSoftwareInput) throws AppcClientException;
-
-    /**
-     * An operation to upgrade the target VNF to a new version and expected that the VNF is in a quiesced status .
-     *
-     * @param upgradeSoftwareInput - RPC input object
-     * @return listener - callback implementation
-     */
-    @RPC(name="upgrade-software", outputType=UpgradeSoftwareOutput.class)
-    void upgradeSoftware(UpgradeSoftwareInput upgradeSoftwareInput, ResponseHandler<UpgradeSoftwareOutput> listener) throws AppcClientException;
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/impl/business/CoreAsyncResponseHandlerImpl.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/impl/business/CoreAsyncResponseHandlerImpl.java
index be43d023c..ff6006807 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/impl/business/CoreAsyncResponseHandlerImpl.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/impl/business/CoreAsyncResponseHandlerImpl.java
@@ -24,10 +24,10 @@
 
 package org.onap.appc.client.lcm.impl.business;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.onap.appc.client.impl.core.ICoreAsyncResponseHandler;
 import org.onap.appc.client.lcm.api.ResponseHandler;
 import org.onap.appc.client.lcm.exceptions.AppcClientException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 
 class CoreAsyncResponseHandlerImpl<T> extends CoreResponseHandler implements ICoreAsyncResponseHandler {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Action.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Action.java
deleted file mode 100644
index 4b024a9ef..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Action.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-
-/**
-* The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-*
-*/
-public enum Action {
-
-    Restart("Restart"),
-    Rebuild("Rebuild"),
-    Migrate("Migrate"),
-    Evacuate("Evacuate"),
-    Snapshot("Snapshot"),
-    Rollback("Rollback"),
-    Sync("Sync"),
-    Audit("Audit"),
-    Stop("Stop"),
-    Start("Start"),
-    Terminate("Terminate"),
-    SoftwareUpload("SoftwareUpload"),
-    HealthCheck("HealthCheck"),
-    LiveUpgrade("LiveUpgrade"),
-    Lock("Lock"),
-    Unlock("Unlock"),
-    Test("Test"),
-    CheckLock("CheckLock"),
-    Configure("Configure"),
-    ConfigModify("ConfigModify"),
-    ConfigScaleOut("ConfigScaleOut"),
-    ConfigRestore("ConfigRestore"),
-    ConfigBackup("ConfigBackup"),
-    ConfigBackupDelete("ConfigBackupDelete"),
-    ConfigExport("ConfigExport"),
-    StopApplication("StopApplication"),
-    StartApplication("StartApplication"),
-    ActionStatus("ActionStatus"),
-    Query("Query"),
-    Reboot("Reboot"),
-    AttachVolume("AttachVolume"),
-    DetachVolume("DetachVolume"),
-    Quiesce("Quiesce");
-
-    private String value;
-
-    Action(String value) {
-        this.value = value;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static Action fromValue(String text) {
-        for (Action var : Action.values()) {
-            if (String.valueOf(var.value).equals(text)) {
-                return var;
-            }
-        }
-        return null;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ActionIdentifiers.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ActionIdentifiers.java
deleted file mode 100644
index 60910bde1..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ActionIdentifiers.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-/**
- * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
- */
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.322Z",
-    comments = "Auto-generated from Open API specification")
-public class ActionIdentifiers {
-
-    @JsonProperty("service-instance-id")
-    private String serviceInstanceId;
-
-    @JsonProperty("vnf-id")
-    private String vnfId;
-
-    @JsonProperty("vf-module-id")
-    private String vfModuleId;
-
-    @JsonProperty("vnfc-name")
-    private String vnfcName;
-
-    @JsonProperty("vserver-id")
-    private String vserverId;
-
-    /**
-     * identifies a specific service the command refers to. When multiple APP-C instances are used and applied to a subset of services, this will become significant . The field is mandatory when the vnf-id is empty
-     */
-    public String getServiceInstanceId() {
-        return serviceInstanceId;
-    }
-
-    /**
-     * identifies a specific service the command refers to. When multiple APP-C instances are used and applied to a subset of services, this will become significant . The field is mandatory when the vnf-id is empty
-     */
-    public void setServiceInstanceId(String serviceInstanceId) {
-        this.serviceInstanceId = serviceInstanceId;
-    }
-
-    /**
-     * identifies the VNF to which this action is to be applied(vnf-id uniquely identifies the service-instance referred to). Note that some actions are applied to multiple VNFs in the same service. When this is the case, vnf-id may be left out, but service-instance-id must appear. The field is mandatory when service-instance-id is empty
-     */
-    public String getVnfId() {
-        return vnfId;
-    }
-
-    /**
-     * identifies the VNF to which this action is to be applied(vnf-id uniquely identifies the service-instance referred to). Note that some actions are applied to multiple VNFs in the same service. When this is the case, vnf-id may be left out, but service-instance-id must appear. The field is mandatory when service-instance-id is empty
-     */
-    public void setVnfId(String vnfId) {
-        this.vnfId = vnfId;
-    }
-
-    /**
-     * identifies the VF module to which this action is to be applied.
-     */
-    public String getVfModuleId() {
-        return vfModuleId;
-    }
-
-    /**
-     * identifies the VF module to which this action is to be applied.
-     */
-    public void setVfModuleId(String vfModuleId) {
-        this.vfModuleId = vfModuleId;
-    }
-
-    /**
-     * identifies the VNFC to which this action is to be applied. Some actions apply only to a component within a VNF (e.g. RESTART is sometimes applied to on VM only). In such a case, the name of the VNFC is used to search for the component within the VNF
-     */
-    public String getVnfcName() {
-        return vnfcName;
-    }
-
-    /**
-     * identifies the VNFC to which this action is to be applied. Some actions apply only to a component within a VNF (e.g. RESTART is sometimes applied to on VM only). In such a case, the name of the VNFC is used to search for the component within the VNF
-     */
-    public void setVnfcName(String vnfcName) {
-        this.vnfcName = vnfcName;
-    }
-
-    /**
-     * identifies a specific VM within the given service/vnf to which this action is to be applied
-     */
-    public String getVserverId() {
-        return vserverId;
-    }
-
-    /**
-     * identifies a specific VM within the given service/vnf to which this action is to be applied
-     */
-    public void setVserverId(String vserverId) {
-        this.vserverId = vserverId;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ActionStatusInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ActionStatusInput.java
deleted file mode 100644
index 5b5a0c1fa..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ActionStatusInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.328Z",
-    comments = "Auto-generated from Open API specification")
-public class ActionStatusInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ActionStatusOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ActionStatusOutput.java
deleted file mode 100644
index 1eeda6bd2..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ActionStatusOutput.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.33Z",
-    comments = "Auto-generated from Open API specification")
-public class ActionStatusOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/AttachVolumeInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/AttachVolumeInput.java
deleted file mode 100644
index 5b8348b1c..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/AttachVolumeInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.332Z",
-    comments = "Auto-generated from Open API specification")
-public class AttachVolumeInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/AttachVolumeOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/AttachVolumeOutput.java
deleted file mode 100644
index 6fdb7a9de..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/AttachVolumeOutput.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.334Z",
-    comments = "Auto-generated from Open API specification")
-public class AttachVolumeOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/AuditInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/AuditInput.java
deleted file mode 100644
index 6542ff3c7..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/AuditInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.335Z",
-    comments = "Auto-generated from Open API specification")
-public class AuditInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/AuditOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/AuditOutput.java
deleted file mode 100644
index deacf177b..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/AuditOutput.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.336Z",
-    comments = "Auto-generated from Open API specification")
-public class AuditOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ONAP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ONAP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/CheckLockInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/CheckLockInput.java
deleted file mode 100644
index 9b70f5fc2..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/CheckLockInput.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.342Z",
-    comments = "Auto-generated from Open API specification")
-public class CheckLockInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/CheckLockOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/CheckLockOutput.java
deleted file mode 100644
index 04b2a0092..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/CheckLockOutput.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.343Z",
-    comments = "Auto-generated from Open API specification")
-public class CheckLockOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    public enum Locked {
-        TRUE,
-        FALSE;
-    }
-
-    @JsonProperty("locked")
-    private Locked locked;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-    /**
-     * TRUE/FALSE - returns TRUE when the given VNF was locked, otherwise returns FALSE
-     */
-    public Locked getLocked() {
-        return locked;
-    }
-
-    /**
-     * TRUE/FALSE - returns TRUE when the given VNF was locked, otherwise returns FALSE
-     */
-    public void setLocked(Locked locked) {
-        this.locked = locked;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/CommonHeader.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/CommonHeader.java
deleted file mode 100644
index 6c32fd680..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/CommonHeader.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-/**
- * A common header for all APP-C requests
- */
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.312Z",
-    comments = "Auto-generated from Open API specification")
-public class CommonHeader {
-
-    @JsonProperty("timestamp")
-    private ZULU timestamp;
-
-    @JsonProperty("api-ver")
-    private String apiVer;
-
-    @JsonProperty("originator-id")
-    private String originatorId;
-
-    @JsonProperty("request-id")
-    private String requestId;
-
-    @JsonProperty("sub-request-id")
-    private String subRequestId;
-
-    @JsonProperty("flags")
-    private Flags flags;
-
-    /**
-     * Define a common definition of a time stamp (expressed as a formatted string) as follows yyyy-MM-ddTHH:mm:ss.SSSSSSSSZ
-     */
-    public ZULU getTimestamp() {
-        return timestamp;
-    }
-
-    /**
-     * Define a common definition of a time stamp (expressed as a formatted string) as follows yyyy-MM-ddTHH:mm:ss.SSSSSSSSZ
-     */
-    public void setTimestamp(ZULU timestamp) {
-        this.timestamp = timestamp;
-    }
-
-    /**
-     * api-ver is the API version identifier. A given release of APPC should support all previous versions of APPC API (correlate with general requirements)
-     */
-    public String getApiVer() {
-        return apiVer;
-    }
-
-    /**
-     * api-ver is the API version identifier. A given release of APPC should support all previous versions of APPC API (correlate with general requirements)
-     */
-    public void setApiVer(String apiVer) {
-        this.apiVer = apiVer;
-    }
-
-    /**
-     * originator-id an identifier of the calling system which can be used addressing purposes, i.e. returning asynchronous response to the proper destination over DMaaP (especially in case of multiple consumers of APP-C APIs)
-     */
-    public String getOriginatorId() {
-        return originatorId;
-    }
-
-    /**
-     * originator-id an identifier of the calling system which can be used addressing purposes, i.e. returning asynchronous response to the proper destination over DMaaP (especially in case of multiple consumers of APP-C APIs)
-     */
-    public void setOriginatorId(String originatorId) {
-        this.originatorId = originatorId;
-    }
-
-    /**
-     * UUID for the request ID. An OSS/BSS identifier for the request that caused the current action. Multiple API calls may be made with the same request-id The request-id shall be recorded throughout the operations on a single request
-     */
-    public String getRequestId() {
-        return requestId;
-    }
-
-    /**
-     * UUID for the request ID. An OSS/BSS identifier for the request that caused the current action. Multiple API calls may be made with the same request-id The request-id shall be recorded throughout the operations on a single request
-     */
-    public void setRequestId(String requestId) {
-        this.requestId = requestId;
-    }
-
-    /**
-     * Uniquely identifies a specific LCM action. It is persistent over the life-cycle of a single request
-     */
-    public String getSubRequestId() {
-        return subRequestId;
-    }
-
-    /**
-     * Uniquely identifies a specific LCM action. It is persistent over the life-cycle of a single request
-     */
-    public void setSubRequestId(String subRequestId) {
-        this.subRequestId = subRequestId;
-    }
-
-    /**
-     * Flags are generic flags that apply to any and all commands, all are optional
-     */
-    public Flags getFlags() {
-        return flags;
-    }
-
-    /**
-     * Flags are generic flags that apply to any and all commands, all are optional
-     */
-    public void setFlags(Flags flags) {
-        this.flags = flags;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupDeleteInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupDeleteInput.java
deleted file mode 100644
index d5b9d2348..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupDeleteInput.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.347Z",
-    comments = "Auto-generated from Open API specification")
-public class ConfigBackupDeleteInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupDeleteOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupDeleteOutput.java
deleted file mode 100644
index cdadf15ae..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupDeleteOutput.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.355Z",
-    comments = "Auto-generated from Open API specification")
-public class ConfigBackupDeleteOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupInput.java
deleted file mode 100644
index 91aa25b4c..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.344Z",
-    comments = "Auto-generated from Open API specification")
-public class ConfigBackupInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupOutput.java
deleted file mode 100644
index a96006800..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupOutput.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.346Z",
-    comments = "Auto-generated from Open API specification")
-public class ConfigBackupOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigExportInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigExportInput.java
deleted file mode 100644
index ea927534d..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigExportInput.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.356Z",
-    comments = "Auto-generated from Open API specification")
-public class ConfigExportInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigExportOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigExportOutput.java
deleted file mode 100644
index b8a251c51..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigExportOutput.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.357Z",
-    comments = "Auto-generated from Open API specification")
-public class ConfigExportOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigModifyInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigModifyInput.java
deleted file mode 100644
index ff10ae6b1..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigModifyInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.358Z",
-    comments = "Auto-generated from Open API specification")
-public class ConfigModifyInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigModifyOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigModifyOutput.java
deleted file mode 100644
index 72ecfdea0..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigModifyOutput.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.36Z",
-    comments = "Auto-generated from Open API specification")
-public class ConfigModifyOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigRestoreInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigRestoreInput.java
deleted file mode 100644
index 6c5827476..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigRestoreInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.361Z",
-    comments = "Auto-generated from Open API specification")
-public class ConfigRestoreInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigRestoreOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigRestoreOutput.java
deleted file mode 100644
index fcb4770e1..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigRestoreOutput.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.363Z",
-    comments = "Auto-generated from Open API specification")
-public class ConfigRestoreOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigScaleoutInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigScaleoutInput.java
deleted file mode 100644
index 039074431..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigScaleoutInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.374Z",
-    comments = "Auto-generated from Open API specification")
-public class ConfigScaleoutInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigScaleoutOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigScaleoutOutput.java
deleted file mode 100644
index f6138c266..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigScaleoutOutput.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.375Z",
-    comments = "Auto-generated from Open API specification")
-public class ConfigScaleoutOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigureInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigureInput.java
deleted file mode 100644
index 4acb10e74..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigureInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.376Z",
-    comments = "Auto-generated from Open API specification")
-public class ConfigureInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigureOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigureOutput.java
deleted file mode 100644
index 6e9f72a20..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigureOutput.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.378Z",
-    comments = "Auto-generated from Open API specification")
-public class ConfigureOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/DetachVolumeInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/DetachVolumeInput.java
deleted file mode 100644
index 975550781..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/DetachVolumeInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.379Z",
-    comments = "Auto-generated from Open API specification")
-public class DetachVolumeInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/DetachVolumeOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/DetachVolumeOutput.java
deleted file mode 100644
index 9d799c431..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/DetachVolumeOutput.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.38Z",
-    comments = "Auto-generated from Open API specification")
-public class DetachVolumeOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/EvacuateInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/EvacuateInput.java
deleted file mode 100644
index bf288bbd5..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/EvacuateInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.381Z",
-    comments = "Auto-generated from Open API specification")
-public class EvacuateInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/EvacuateOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/EvacuateOutput.java
deleted file mode 100644
index 7f6466913..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/EvacuateOutput.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.382Z",
-    comments = "Auto-generated from Open API specification")
-public class EvacuateOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Flags.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Flags.java
deleted file mode 100644
index a254e412f..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Flags.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-/**
- * Flags are generic flags that apply to any and all commands, all are optional
- */
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.32Z",
-    comments = "Auto-generated from Open API specification")
-public class Flags {
-
-    public enum Mode {
-        EXCLUSIVE,
-        NORMAL;
-    }
-
-    @JsonProperty("mode")
-    private Mode mode;
-
-    public enum Force {
-        TRUE,
-        FALSE;
-    }
-
-    @JsonProperty("force")
-    private Force force;
-
-    @JsonProperty("ttl")
-    private int ttl;
-
-    /**
-     * EXCLUSIVE (accept no queued requests on this VNF while processing) or NORMAL (queue other requests until complete)
-     */
-    public Mode getMode() {
-        return mode;
-    }
-
-    /**
-     * EXCLUSIVE (accept no queued requests on this VNF while processing) or NORMAL (queue other requests until complete)
-     */
-    public void setMode(Mode mode) {
-        this.mode = mode;
-    }
-
-    /**
-     * TRUE/FALSE - Execute action even if target is in unstable (i.e. locked, transiting, etc.) state
-     */
-    public Force getForce() {
-        return force;
-    }
-
-    /**
-     * TRUE/FALSE - Execute action even if target is in unstable (i.e. locked, transiting, etc.) state
-     */
-    public void setForce(Force force) {
-        this.force = force;
-    }
-
-    /**
-     * The timeout value (expressed in seconds) for action execution, between action being received by APPC and action initiation
-     */
-    public int getTtl() {
-        return ttl;
-    }
-
-    /**
-     * The timeout value (expressed in seconds) for action execution, between action being received by APPC and action initiation
-     */
-    public void setTtl(int ttl) {
-        this.ttl = ttl;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/HealthCheckInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/HealthCheckInput.java
deleted file mode 100644
index 2be84d19d..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/HealthCheckInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.386Z",
-    comments = "Auto-generated from Open API specification")
-public class HealthCheckInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/HealthCheckOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/HealthCheckOutput.java
deleted file mode 100644
index 1ab7327b6..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/HealthCheckOutput.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.391Z",
-    comments = "Auto-generated from Open API specification")
-public class HealthCheckOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LcmActionStatus.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LcmActionStatus.java
deleted file mode 100644
index 34d72a9a6..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LcmActionStatus.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-
-/**
-* The status of the requested LCM action
-*
-*/
-public enum LcmActionStatus {
-
-    IN_PROGRESS("IN_PROGRESS"),
-    SUCCESSFUL("SUCCESSFUL"),
-    FAILED("FAILED"),
-    NOT_FOUND("NOT_FOUND"),
-    ABORTED("ABORTED"),
-    MULTIPLE_REQUESTS_FOUND("MULTIPLE_REQUESTS_FOUND");
-
-    private String value;
-
-    LcmActionStatus(String value) {
-        this.value = value;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static LcmActionStatus fromValue(String text) {
-        for (LcmActionStatus var : LcmActionStatus.values()) {
-            if (String.valueOf(var.value).equals(text)) {
-                return var;
-            }
-        }
-        return null;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LiveUpgradeInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LiveUpgradeInput.java
deleted file mode 100644
index dd95fc43f..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LiveUpgradeInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.392Z",
-    comments = "Auto-generated from Open API specification")
-public class LiveUpgradeInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LiveUpgradeOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LiveUpgradeOutput.java
deleted file mode 100644
index 33c5fb4e8..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LiveUpgradeOutput.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.396Z",
-    comments = "Auto-generated from Open API specification")
-public class LiveUpgradeOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LockInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LockInput.java
deleted file mode 100644
index c665ca833..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LockInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.397Z",
-    comments = "Auto-generated from Open API specification")
-public class LockInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LockOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LockOutput.java
deleted file mode 100644
index abdfa0e6e..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LockOutput.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.4Z",
-    comments = "Auto-generated from Open API specification")
-public class LockOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/MigrateInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/MigrateInput.java
deleted file mode 100644
index 42bd0c6b3..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/MigrateInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.401Z",
-    comments = "Auto-generated from Open API specification")
-public class MigrateInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/MigrateOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/MigrateOutput.java
deleted file mode 100644
index b0e506e45..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/MigrateOutput.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.403Z",
-    comments = "Auto-generated from Open API specification")
-public class MigrateOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Payload.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Payload.java
deleted file mode 100644
index 5be1df26d..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Payload.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
- */
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.292Z",
-    comments = "Auto-generated from Open API specification")
-public class Payload {
-
-    private String value;
-
-    public Payload() {}
-
-    @JsonCreator
-    public Payload(String value) {
-        this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QueryInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QueryInput.java
deleted file mode 100644
index b8ff318da..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QueryInput.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.404Z",
-    comments = "Auto-generated from Open API specification")
-public class QueryInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QueryOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QueryOutput.java
deleted file mode 100644
index 9a31e0a0b..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QueryOutput.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.405Z",
-    comments = "Auto-generated from Open API specification")
-public class QueryOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    @JsonProperty("query-results")
-    private QueryResults queryResults;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-    public QueryResults getQueryResults() {
-        return queryResults;
-    }
-
-    public void setQueryResults(QueryResults queryResults) {
-        this.queryResults = queryResults;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QueryResults.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QueryResults.java
deleted file mode 100644
index 4f91ad5d8..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QueryResults.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.326Z",
-    comments = "Auto-generated from Open API specification")
-public class QueryResults {
-
-    @JsonProperty("vserver-id")
-    private String vserverId;
-
-    @JsonProperty("vm-state")
-    private VmState vmState;
-
-    @JsonProperty("vm-status")
-    private VmStatus vmStatus;
-
-    /**
-     * Identifier of a VM
-     */
-    public String getVserverId() {
-        return vserverId;
-    }
-
-    /**
-     * Identifier of a VM
-     */
-    public void setVserverId(String vserverId) {
-        this.vserverId = vserverId;
-    }
-
-    /**
-     * The state of a VM
-     */
-    public VmState getVmState() {
-        return vmState;
-    }
-
-    /**
-     * The state of a VM
-     */
-    public void setVmState(VmState vmState) {
-        this.vmState = vmState;
-    }
-
-    /**
-     * The status of a VM
-     */
-    public VmStatus getVmStatus() {
-        return vmStatus;
-    }
-
-    /**
-     * The status of a VM
-     */
-    public void setVmStatus(VmStatus vmStatus) {
-        this.vmStatus = vmStatus;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QuiesceTrafficInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QuiesceTrafficInput.java
deleted file mode 100644
index c1b309ff6..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QuiesceTrafficInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-27T12:27:49.028-06:00",
-    comments = "Auto-generated from Open API specification")
-public class QuiesceTrafficInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QuiesceTrafficOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QuiesceTrafficOutput.java
deleted file mode 100644
index bf322cf0e..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QuiesceTrafficOutput.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-27T12:27:49.032-06:00",
-    comments = "Auto-generated from Open API specification")
-public class QuiesceTrafficOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RebootInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RebootInput.java
deleted file mode 100644
index 5fce23c6c..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RebootInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.407Z",
-    comments = "Auto-generated from Open API specification")
-public class RebootInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RebootOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RebootOutput.java
deleted file mode 100644
index 10f1188a5..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RebootOutput.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.408Z",
-    comments = "Auto-generated from Open API specification")
-public class RebootOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RebuildInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RebuildInput.java
deleted file mode 100644
index 7efd26864..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RebuildInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.411Z",
-    comments = "Auto-generated from Open API specification")
-public class RebuildInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RebuildOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RebuildOutput.java
deleted file mode 100644
index c516c08a2..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RebuildOutput.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.412Z",
-    comments = "Auto-generated from Open API specification")
-public class RebuildOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RestartInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RestartInput.java
deleted file mode 100644
index e2119b709..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RestartInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.413Z",
-    comments = "Auto-generated from Open API specification")
-public class RestartInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RestartOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RestartOutput.java
deleted file mode 100644
index 6fbcf9282..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RestartOutput.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.414Z",
-    comments = "Auto-generated from Open API specification")
-public class RestartOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ResumeTrafficInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ResumeTrafficInput.java
deleted file mode 100644
index d6f9b362a..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ResumeTrafficInput.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-27T12:27:49.064-06:00",
-    comments = "Auto-generated from Open API specification")
-public class ResumeTrafficInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ResumeTrafficOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ResumeTrafficOutput.java
deleted file mode 100644
index 89207cbb2..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ResumeTrafficOutput.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-27T12:27:49.068-06:00",
-    comments = "Auto-generated from Open API specification")
-public class ResumeTrafficOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RollbackInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RollbackInput.java
deleted file mode 100644
index ffa0d91ff..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RollbackInput.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.421Z",
-    comments = "Auto-generated from Open API specification")
-public class RollbackInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    @JsonProperty("identity-url")
-    private String identityUrl;
-
-    @JsonProperty("snapshot-id")
-    private String snapshotId;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-    public String getIdentityUrl() {
-        return identityUrl;
-    }
-
-    public void setIdentityUrl(String identityUrl) {
-        this.identityUrl = identityUrl;
-    }
-
-    public String getSnapshotId() {
-        return snapshotId;
-    }
-
-    public void setSnapshotId(String snapshotId) {
-        this.snapshotId = snapshotId;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RollbackOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RollbackOutput.java
deleted file mode 100644
index 84f121d3c..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RollbackOutput.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.429Z",
-    comments = "Auto-generated from Open API specification")
-public class RollbackOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SnapshotInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SnapshotInput.java
deleted file mode 100644
index ef4a70326..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SnapshotInput.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.429Z",
-    comments = "Auto-generated from Open API specification")
-public class SnapshotInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    @JsonProperty("identity-url")
-    private String identityUrl;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-    public String getIdentityUrl() {
-        return identityUrl;
-    }
-
-    public void setIdentityUrl(String identityUrl) {
-        this.identityUrl = identityUrl;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SnapshotOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SnapshotOutput.java
deleted file mode 100644
index 9d4780e8e..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SnapshotOutput.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.432Z",
-    comments = "Auto-generated from Open API specification")
-public class SnapshotOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    @JsonProperty("snapshot-id")
-    private String snapshotId;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-    public String getSnapshotId() {
-        return snapshotId;
-    }
-
-    public void setSnapshotId(String snapshotId) {
-        this.snapshotId = snapshotId;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SoftwareUploadInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SoftwareUploadInput.java
deleted file mode 100644
index 208778073..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SoftwareUploadInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.433Z",
-    comments = "Auto-generated from Open API specification")
-public class SoftwareUploadInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SoftwareUploadOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SoftwareUploadOutput.java
deleted file mode 100644
index 061f76bef..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SoftwareUploadOutput.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.434Z",
-    comments = "Auto-generated from Open API specification")
-public class SoftwareUploadOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartApplicationInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartApplicationInput.java
deleted file mode 100644
index f6f5d0a27..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartApplicationInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.436Z",
-    comments = "Auto-generated from Open API specification")
-public class StartApplicationInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartApplicationOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartApplicationOutput.java
deleted file mode 100644
index 4d7f8bee4..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartApplicationOutput.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.437Z",
-    comments = "Auto-generated from Open API specification")
-public class StartApplicationOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartInput.java
deleted file mode 100644
index 78c3d7d9c..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.435Z",
-    comments = "Auto-generated from Open API specification")
-public class StartInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartOutput.java
deleted file mode 100644
index f589a23b8..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartOutput.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.435Z",
-    comments = "Auto-generated from Open API specification")
-public class StartOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Status.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Status.java
deleted file mode 100644
index b3593b483..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Status.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-/**
- * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
- */
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.325Z",
-    comments = "Auto-generated from Open API specification")
-public class Status {
-
-    @JsonProperty("code")
-    private int code;
-
-    @JsonProperty("message")
-    private String message;
-
-    /**
-     * Response code
-     */
-    public int getCode() {
-        return code;
-    }
-
-    /**
-     * Response code
-     */
-    public void setCode(int code) {
-        this.code = code;
-    }
-
-    /**
-     * Response message
-     */
-    public String getMessage() {
-        return message;
-    }
-
-    /**
-     * Response message
-     */
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopApplicationInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopApplicationInput.java
deleted file mode 100644
index 3ba9cb98f..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopApplicationInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.439Z",
-    comments = "Auto-generated from Open API specification")
-public class StopApplicationInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopApplicationOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopApplicationOutput.java
deleted file mode 100644
index 11c97685c..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopApplicationOutput.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.44Z",
-    comments = "Auto-generated from Open API specification")
-public class StopApplicationOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopInput.java
deleted file mode 100644
index de65a9669..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.438Z",
-    comments = "Auto-generated from Open API specification")
-public class StopInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopOutput.java
deleted file mode 100644
index ba852c8fe..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopOutput.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.439Z",
-    comments = "Auto-generated from Open API specification")
-public class StopOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SyncInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SyncInput.java
deleted file mode 100644
index c8e1d997b..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SyncInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.441Z",
-    comments = "Auto-generated from Open API specification")
-public class SyncInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SyncOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SyncOutput.java
deleted file mode 100644
index 8ad92139e..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SyncOutput.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.441Z",
-    comments = "Auto-generated from Open API specification")
-public class SyncOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TerminateInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TerminateInput.java
deleted file mode 100644
index 00c3ffa24..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TerminateInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.442Z",
-    comments = "Auto-generated from Open API specification")
-public class TerminateInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TerminateOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TerminateOutput.java
deleted file mode 100644
index b323be906..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TerminateOutput.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.451Z",
-    comments = "Auto-generated from Open API specification")
-public class TerminateOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TestInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TestInput.java
deleted file mode 100644
index 88872fa00..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TestInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.452Z",
-    comments = "Auto-generated from Open API specification")
-public class TestInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TestOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TestOutput.java
deleted file mode 100644
index 139e2c8b2..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TestOutput.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.453Z",
-    comments = "Auto-generated from Open API specification")
-public class TestOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UnlockInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UnlockInput.java
deleted file mode 100644
index c0deccff9..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UnlockInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.459Z",
-    comments = "Auto-generated from Open API specification")
-public class UnlockInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UnlockOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UnlockOutput.java
deleted file mode 100644
index a6d5de193..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UnlockOutput.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.468Z",
-    comments = "Auto-generated from Open API specification")
-public class UnlockOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeBackoutInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeBackoutInput.java
deleted file mode 100644
index 85a0e687a..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeBackoutInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-27T12:27:49.159-06:00",
-    comments = "Auto-generated from Open API specification")
-public class UpgradeBackoutInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeBackoutOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeBackoutOutput.java
deleted file mode 100644
index 2ca81eb9f..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeBackoutOutput.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-27T12:27:49.162-06:00",
-    comments = "Auto-generated from Open API specification")
-public class UpgradeBackoutOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeBackupInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeBackupInput.java
deleted file mode 100644
index f93142fb0..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeBackupInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-27T12:27:49.165-06:00",
-    comments = "Auto-generated from Open API specification")
-public class UpgradeBackupInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeBackupOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeBackupOutput.java
deleted file mode 100644
index 55d12c29f..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeBackupOutput.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-27T12:27:49.169-06:00",
-    comments = "Auto-generated from Open API specification")
-public class UpgradeBackupOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradePostCheckInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradePostCheckInput.java
deleted file mode 100644
index 268833737..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradePostCheckInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-27T12:27:49.172-06:00",
-    comments = "Auto-generated from Open API specification")
-public class UpgradePostCheckInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradePostCheckOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradePostCheckOutput.java
deleted file mode 100644
index 010b0f316..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradePostCheckOutput.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-27T12:27:49.175-06:00",
-    comments = "Auto-generated from Open API specification")
-public class UpgradePostCheckOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradePreCheckInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradePreCheckInput.java
deleted file mode 100644
index d102fae57..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradePreCheckInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-27T12:27:49.178-06:00",
-    comments = "Auto-generated from Open API specification")
-public class UpgradePreCheckInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradePreCheckOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradePreCheckOutput.java
deleted file mode 100644
index f2765c27f..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradePreCheckOutput.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-27T12:27:49.182-06:00",
-    comments = "Auto-generated from Open API specification")
-public class UpgradePreCheckOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeSoftwareInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeSoftwareInput.java
deleted file mode 100644
index 3e217dff9..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeSoftwareInput.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-27T12:27:49.186-06:00",
-    comments = "Auto-generated from Open API specification")
-public class UpgradeSoftwareInput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("action")
-    private Action action;
-
-    @JsonProperty("action-identifiers")
-    private ActionIdentifiers actionIdentifiers;
-
-    @JsonProperty("payload")
-    private Payload payload;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
-     */
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    /**
-     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
-     */
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public Payload getPayload() {
-        return payload;
-    }
-
-    /**
-     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
-     */
-    public void setPayload(Payload payload) {
-        this.payload = payload;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeSoftwareOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeSoftwareOutput.java
deleted file mode 100644
index e0dc518aa..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeSoftwareOutput.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-27T12:27:49.19-06:00",
-    comments = "Auto-generated from Open API specification")
-public class UpgradeSoftwareOutput {
-
-    @JsonProperty("common-header")
-    private CommonHeader commonHeader;
-
-    @JsonProperty("status")
-    private Status status;
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    /**
-     * A common header for all APP-C requests
-     */
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
-     */
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/VmState.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/VmState.java
deleted file mode 100644
index 350ca2796..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/VmState.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-
-/**
-* The state of a VM
-*
-*/
-public enum VmState {
-
-    active("active"),
-    standby("standby"),
-    inactive("inactive"),
-    unknown("unknown");
-
-    private String value;
-
-    VmState(String value) {
-        this.value = value;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static VmState fromValue(String text) {
-        for (VmState var : VmState.values()) {
-            if (String.valueOf(var.value).equals(text)) {
-                return var;
-            }
-        }
-        return null;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/VmStatus.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/VmStatus.java
deleted file mode 100644
index 3193a4fce..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/VmStatus.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-
-/**
-* The status of a VM
-*
-*/
-public enum VmStatus {
-
-    healthy("healthy"),
-    unhealthy("unhealthy"),
-    unknown("unknown");
-
-    private String value;
-
-    VmStatus(String value) {
-        this.value = value;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static VmStatus fromValue(String text) {
-        for (VmStatus var : VmStatus.values()) {
-            if (String.valueOf(var.value).equals(text)) {
-                return var;
-            }
-        }
-        return null;
-    }
-
-}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ZULU.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ZULU.java
deleted file mode 100644
index 5d8c33678..000000000
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ZULU.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * NOTE: This file is auto-generated and should not be changed manually.
- */
-package org.onap.appc.client.lcm.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * Define a common definition of a time stamp (expressed as a formatted string) as follows yyyy-MM-ddTHH:mm:ss.SSSSSSSSZ
- */
-@javax.annotation.Generated(
-    value = {"client-kit/open-api-to-java.ftl"},
-    date = "2017-11-16T17:10:10.189Z",
-    comments = "Auto-generated from Open API specification")
-public class ZULU {
-
-    private String value;
-
-    public ZULU() {}
-
-    @JsonCreator
-    public ZULU(String value) {
-        this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-}
diff --git a/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/api/CLI.java b/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/api/CLI.java
index e28b3706a..bcd68c8ab 100644
--- a/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/api/CLI.java
+++ b/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/api/CLI.java
@@ -26,6 +26,8 @@ package org.onap.appc.tools.generator.api;
 
 import org.onap.appc.tools.generator.impl.ModelGenerator;
 
+import java.io.File;
+
 public class CLI {
     public static void main(String... args) throws Exception {
         String sourceFile = args[0];
@@ -61,6 +63,6 @@ public class CLI {
                     + " "+builderName
                     + " <conf file>'");
         ModelGenerator generator = new ModelGenerator();
-        generator.execute(sourceFile, destinationFile, templateFile, builderName, contextConfName);
+        generator.execute((new File(sourceFile)).toURI().toURL(), destinationFile, templateFile, builderName, contextConfName);
     }
 }
diff --git a/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/api/ContextBuilder.java b/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/api/ContextBuilder.java
index a1826f270..e2831dec8 100644
--- a/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/api/ContextBuilder.java
+++ b/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/api/ContextBuilder.java
@@ -24,11 +24,11 @@
 
 package org.onap.appc.tools.generator.api;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.net.URL;
 import java.util.Map;
 
 public interface ContextBuilder {
 
-    Map<String, Object> buildContext(String sourceFile, String contextConf) throws IOException;
+    Map<String, Object> buildContext(URL sourceURL, String contextConf) throws IOException;
 }
diff --git a/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/api/MavenPlugin.java b/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/api/MavenPlugin.java
index 9e160eed2..d26170774 100644
--- a/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/api/MavenPlugin.java
+++ b/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/api/MavenPlugin.java
@@ -24,7 +24,6 @@
 
 package org.onap.appc.tools.generator.api;
 
-import org.onap.appc.tools.generator.impl.ModelGenerator;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -32,12 +31,17 @@ import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
+import org.onap.appc.tools.generator.impl.ModelGenerator;
 
+import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.nio.file.Paths;
 
 @Mojo(
-        name = "generate",
+        name = "generate-sources",
         defaultPhase = LifecyclePhase.GENERATE_SOURCES
 )
 public class MavenPlugin extends AbstractMojo {
@@ -65,20 +69,84 @@ public class MavenPlugin extends AbstractMojo {
         ModelGenerator generator = new ModelGenerator();
         try {
             trace("\t === Called MavenPlugin on builder <" + contextBuilderClassName +">\n");
-            generator.execute(sourceFileName,outputFileName,templateName,contextBuilderClassName,contextConfigFileName);
-            String workDirectory = getWorkDirectory(outputFileName);
+
+            //the source file may be in the class path
+            //or on the file system
+            URL sourceFileURL = lookupURL(sourceFileName);
+
+            //prefix with the project absolute path to the output file
+            outputFileName = toAbsoluteFile(outputFileName);
+            String workDirectory = Paths.get(outputFileName).getParent().toString();
+            generator.execute(sourceFileURL,outputFileName,templateName,contextBuilderClassName,contextConfigFileName);
             project.addCompileSourceRoot(workDirectory);
         } catch (Exception e) {
-            e.printStackTrace();
-            throw new MojoExecutionException(e.getMessage());
+            throw new MojoExecutionException(e.getMessage(),e);
         }
     }
 
-    private String getWorkDirectory(String outputFileName) throws IOException {
-        String workDirPath = Paths.get(outputFileName.toString()).getParent().toString();
-        return workDirPath;
+
+    /**
+     * Converts the file to absolute path.  If the file does not exist prefix the maven project absolute path.
+     * @param filePath
+     * @return
+     */
+    private String toAbsoluteFile(String filePath){
+
+        File file = new File(filePath);
+
+        //if the file already exist just return the absolutePath
+        if(file.exists()){
+            return file.getAbsolutePath();
+    }
+
+
+        //prefix with the project absolute path to the output file
+        if(!file.isAbsolute()){
+            File projectDir = new File(this.project.getBuild().getDirectory()).getParentFile();
+            filePath = projectDir.getAbsolutePath() + "/" + filePath;
+        }
+
+        return filePath;
     }
 
+    /**
+     * Tries three lookups
+     * First try to lookup the file in the classpath.
+     * else try relative path
+     * else try prefixing the relative path with the maven project path.
+
+     * @param filePath - A String denoting the source yang file path.
+     * @return URL - to the source yang file
+     * @throws MalformedURLException
+     */
+    private URL lookupURL(String filePath) throws IOException {
+        //check out the class path first
+        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+        URL sourceYangURL = classLoader.getResource(filePath);
+
+        if (sourceYangURL != null) {
+            return sourceYangURL;
+        }
+
+        String errorMessage = String.format(
+                "YANG file <%s> not found in classpath or on the file system."
+                ,filePath
+        );
+
+        //check the file system first
+        File sourceFile = new File(toAbsoluteFile(filePath));
+        if (!sourceFile.exists()) {
+            throw new FileNotFoundException(errorMessage);
+        }
+        try {
+            sourceYangURL = sourceFile.toURI().toURL();
+        } catch (MalformedURLException e) {
+            throw new IOException(errorMessage,e);
+        }
+        return sourceYangURL;
+    }
+
+
     private void trace(String message) {
         getLog().info(message);
     }
diff --git a/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/extensions/JsonContextBuilderImpl.java b/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/extensions/JsonContextBuilderImpl.java
index 6c408dd1d..34471ff4e 100644
--- a/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/extensions/JsonContextBuilderImpl.java
+++ b/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/extensions/JsonContextBuilderImpl.java
@@ -24,14 +24,14 @@
 
 package org.onap.appc.tools.generator.extensions;
 
-import org.onap.appc.tools.generator.api.ContextBuilder;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.onap.appc.tools.generator.api.ContextBuilder;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
@@ -39,15 +39,18 @@ import java.util.Properties;
 public class JsonContextBuilderImpl implements ContextBuilder {
 
     @Override
-    public Map<String, Object> buildContext(String sourceFile, String contextConf) throws IOException {
+    public Map<String, Object> buildContext(URL sourceURL, String contextConf) throws IOException {
         //read json file
         ObjectMapper mapper = new ObjectMapper();
-        JsonNode model = mapper.readTree(new File(sourceFile));
+        JsonNode model = mapper.readTree(sourceURL);
 
         //get context config file
         Properties properties = new Properties();
         ClassLoader classloader = Thread.currentThread().getContextClassLoader();
         InputStream inputStream = classloader.getResourceAsStream(contextConf);
+        if(inputStream == null){
+            throw new IOException(String.format("The file [%s] cannot be found in the class path",contextConf));
+        }
         properties.load(inputStream);
 
         //get context related properties
diff --git a/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/extensions/YangContextBuilderImpl.java b/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/extensions/YangContextBuilderImpl.java
index 67055c757..6307d1365 100644
--- a/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/extensions/YangContextBuilderImpl.java
+++ b/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/extensions/YangContextBuilderImpl.java
@@ -24,74 +24,190 @@
 
 package org.onap.appc.tools.generator.extensions;
 
-import org.onap.appc.tools.generator.api.ContextBuilder;
 import com.google.common.base.Optional;
-
+import org.onap.appc.tools.generator.api.ContextBuilder;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException;
 import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceException;
 import org.opendaylight.yangtools.yang.parser.repo.YangTextSchemaContextResolver;
-import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.ModuleEffectiveStatementImpl;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.InputStream;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Proxy;
 import java.net.URL;
-import java.util.Map;
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 
 public class YangContextBuilderImpl implements ContextBuilder {
 
     @Override
-    public Map<String, Object> buildContext(String sourceFile, String contextConf) throws FileNotFoundException {
-        try ( InputStream source = new FileInputStream(sourceFile) ) {}
-        catch ( IOException ex) {
-            throw new FileNotFoundException("YANG file <" + sourceFile + ">not found");
-        }
+    public Map<String, Object> buildContext(URL sourceYangURL, String contextConf) throws IOException {
+
 
         Optional<SchemaContext> sc = null;
         try ( YangTextSchemaContextResolver yangContextResolver =
               YangTextSchemaContextResolver.create("yang-context-resolver")) {
-            yangContextResolver.registerSource(new URL("file:///" + sourceFile));
+            yangContextResolver.registerSource(sourceYangURL);
             sc = yangContextResolver.getSchemaContext();
         } catch (SchemaSourceException | IOException | YangSyntaxErrorException e) {
-            e.printStackTrace();
+            throw new IOException(String.format("Exception occurred while processing sourceFileName %s ",sourceYangURL),e);
         }
 
         Map<String, Object> map = new HashMap<>();
         if ( null != sc && sc.isPresent()) {
             Set<Module> modules = sc.get().getModules();
-            for (Module module : modules) {
-                ModuleEffectiveStatementImpl impl = (ModuleEffectiveStatementImpl) module;
-                map.put("module", module);
+            for (final Module module : modules) {
+
+                Module proxyModule = (new PackagePrivateReflectBug()).buildProxyObjects(module);
+                map.put("module", proxyModule);
             }
         }
 
         return map;
     }
 
-    // @Override
-    // public Map<String, Object> buildContext(String sourceFile, String
-    // contextConf) throws FileNotFoundException {
-    // InputStream source = new FileInputStream(sourceFile);
-    // if (source == null) {
-    // throw new FileNotFoundException("YANG file <" + sourceFile + ">not found");
-    // }
-    //
-    // SchemaContext mSchema = parse(Collections.singletonList(source));
-    //
-    // Map<String, Object> map = new HashMap<>();
-    // map.put("module", mSchema.getModules().iterator().next());
-    // return map;
-    // }
-    //
-    // private SchemaContext parse(List<InputStream> sources) {
-    // YangParserImpl parser = new YangParserImpl();
-    // Set<Module> modules = parser.parseYangModelsFromStreams(sources);
-    // return parser.resolveSchemaContext(modules);
-    // }
 
+    /**
+     * The Wrap Proxy uses java Proxy to work around bug JDK-8193172.  The Issue is that if a super class is package
+     * private its public methods cause IllegalAccessException when using java reflect to access those methods from a
+     * subclass which is package public.
+     * <p>
+     * Example exception:
+     * Caused by: java.lang.IllegalAccessException: Class freemarker.ext.beans.BeansWrapper cannot access a
+     * member of class org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.AbstractEffectiveModule
+     * with modifiers "public final"
+     */
+    private static class  PackagePrivateReflectBug {
+
+        /**
+         * Recursive method that traverses the yang model and wraps objects that extend package private classes
+         * with java proxy objects.
+         * @param candidateObj
+         * @param <T>
+         * @return
+         */
+        private <T> T buildProxyObjects(Object candidateObj) {
+
+            //can't proxy null so just return
+            if (candidateObj == null) {
+                return null;
+            }
+
+
+            Class<?> candidateClass = candidateObj.getClass();
+
+            //prevent a recursive proxy
+            if (Proxy.isProxyClass(candidateClass)) {
+                return (T) candidateObj;
+            }
+
+            //Can�t create a proxy an Array,  so replace each
+            //element the array with a proxy if needed.
+            if (candidateClass.isArray()) {
+                Object[] sourceArray = (Object[]) candidateObj;
+                for (int i = 0; i < sourceArray.length; i++) {
+                    sourceArray[i] = buildProxyObjects(sourceArray[i]);
+                }
+                return (T) candidateObj;
+            }
+
+            //Evaluate if this class must be wrapped in a proxy or not.
+            if (!isCandidateForProxy(candidateClass)) {
+                return (T) candidateObj;
+            }
+
+            //Collect the interfaces for the proxy.  Proxy only work with classes
+            //that implement interfaces if there are none the obj cannot be wrapped
+            //with a proxy.
+            HashSet<Class<?>> interfaceSet = new HashSet<>();
+            collectInterfaces(candidateClass, interfaceSet);
+            if (interfaceSet.isEmpty()) {
+                return (T) candidateObj;
+            }
+            Class<?>[] interfaces = new Class<?>[interfaceSet.size()];
+            interfaceSet.toArray(interfaces);
+
+            //wrap the Object in a proxy
+            return (T) Proxy.newProxyInstance(
+                    candidateClass.getClassLoader(),
+                    interfaces,
+                    (proxy, method, args) -> {
+                        Object returnObj = method.invoke(candidateObj, args);
+                        returnObj = buildProxyObjects(returnObj);
+                        return returnObj;
+                    }
+            );
+        }
+
+
+        /**
+         * This method determines if the specified class is a candidate for proxy.
+         *
+         * @param fromClass
+         * @return true - if the specifed class is a Candidate.
+         */
+        private boolean isCandidateForProxy(Class<?> fromClass) {
+
+            //a
+            Class<?>[] includeClasses = {
+                    java.util.Collection.class,
+                    java.util.Map.class,
+                    org.opendaylight.yangtools.yang.model.api.Module.class
+
+            };
+
+            for (Class<?> toClass : includeClasses) {
+                if (toClass.isAssignableFrom(fromClass)) {
+                    return true;
+                }
+            }
+
+            if (isExtendsPackagePrivateSuperClass(fromClass)) {
+                return true;
+            }
+
+            return false;
+        }
+
+        /**
+         * Test if any of the super packages are package private.
+         *
+         * @param clazz
+         * @return
+         */
+        private boolean isExtendsPackagePrivateSuperClass(Class<?> clazz) {
+            if (Object.class.equals(clazz)) {
+                return false;
+            }
+
+            int classModifiers = clazz.getModifiers();
+            if (Modifier.isPublic(classModifiers)) {
+                return isExtendsPackagePrivateSuperClass(clazz.getSuperclass());
+            }
+
+            return true;
+        }
+
+        /**
+         * Collect all of the interfaces this class can be cast too.  Tavers the class hierarchy to include interfaces
+         * from the super classes.
+         *
+         * @param clazz
+         * @param classSet
+         */
+        private void collectInterfaces(Class<?> clazz, Set<Class<?>> classSet) {
+            Class<?>[] interfaces = clazz.getInterfaces();
+            classSet.addAll(Arrays.asList(interfaces));
+            Class<?> superClass = clazz.getSuperclass();
+
+    //
+            if (!Object.class.equals(superClass)) {
+                collectInterfaces(superClass, classSet);
+            }
+        }
+    }
 }
diff --git a/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/impl/CodeGenWriter.java b/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/impl/CodeGenWriter.java
index 347c24c06..30ed2cabf 100644
--- a/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/impl/CodeGenWriter.java
+++ b/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/impl/CodeGenWriter.java
@@ -24,7 +24,10 @@
 
 package org.onap.appc.tools.generator.impl;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Writer;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
diff --git a/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/impl/ModelGenerator.java b/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/impl/ModelGenerator.java
index 2275fdac7..e888aa804 100644
--- a/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/impl/ModelGenerator.java
+++ b/appc-client/code-generator/src/main/java/org/onap/appc/tools/generator/impl/ModelGenerator.java
@@ -24,13 +24,14 @@
 
 package org.onap.appc.tools.generator.impl;
 
-import org.onap.appc.tools.generator.api.ContextBuilder;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
+import org.onap.appc.tools.generator.api.ContextBuilder;
 
 import java.io.IOException;
 import java.io.Writer;
+import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -38,10 +39,10 @@ import java.util.Map;
 
 public class ModelGenerator {
 
-    public void execute(String sourceFile, String destinationFile, String templateFile, String builderName, String contextConfName) throws IOException, ReflectiveOperationException {
+    public void execute(URL sourceFileURL, String destinationFile, String templateFile, String builderName, String contextConfName) throws IOException, ReflectiveOperationException {
 
         ContextBuilder contextBuilder = (ContextBuilder) Class.forName(builderName).newInstance();
-        Map<String, Object> context = contextBuilder.buildContext(sourceFile, contextConfName);
+        Map<String, Object> context = contextBuilder.buildContext(sourceFileURL, contextConfName);
 
         Path destinationPath = Paths.get(destinationFile);
         if (!Files.isDirectory(destinationPath))
@@ -68,4 +69,6 @@ public class ModelGenerator {
         }
     }
 
+
 }
+
diff --git a/appc-client/code-generator/src/main/resources/configuration/client-kit.properties b/appc-client/code-generator/src/main/resources/configuration/client-kit.properties
index a0097c9fa..a2f73508a 100644
--- a/appc-client/code-generator/src/main/resources/configuration/client-kit.properties
+++ b/appc-client/code-generator/src/main/resources/configuration/client-kit.properties
@@ -28,7 +28,7 @@
 #--------------------------------------------------------------------------------------------
 ctx.model.package=org.onap.appc.client.lcm.model
 ctx.api.package=org.onap.appc.client.lcm.api
-ctx.utils.package=org.onap.appc.client.lcm.utils
+ctx.utils.package=org.onap.appc
 ctx.exceptions.package=org.onap.appc.client.lcm.exceptions
 ctx.interface.classname=LifeCycleManagerStateful
 
diff --git a/appc-client/code-generator/src/main/resources/templates/open-api/yang-to-open-api.ftl b/appc-client/code-generator/src/main/resources/templates/open-api/yang-to-open-api.ftl
index 685efcb02..e92ee3b05 100644
--- a/appc-client/code-generator/src/main/resources/templates/open-api/yang-to-open-api.ftl
+++ b/appc-client/code-generator/src/main/resources/templates/open-api/yang-to-open-api.ftl
@@ -21,7 +21,7 @@
  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  ============LICENSE_END=========================================================
 -->
-
+<#setting number_format="computer">
 <#global _ = "    ">
 <#global __ = _ + _>
 <#global ___ = __ + _>
@@ -162,11 +162,11 @@ ${indent}]
     statement or locally (in-line withing a leaf node definition).
  -->
 <#macro constraints yangType indent = "">
-<#if yangType.patternConstraints?size != 0>
+<#if yangType.patternConstraints?has_content>
 ${indent},
 ${indent}"pattern" : "${yangType.patternConstraints?first.regularExpression?replace('\\\\', '\\\\\\\\', 'r')}"
 </#if>
-<#if yangType.lengthConstraints?size != 0>
+<#if yangType.lengthConstraints?has_content>
 ${indent},
 ${indent}"minLength" : ${yangType.lengthConstraints?first.min},
 ${indent}"maxLength"  : ${yangType.lengthConstraints?first.max}
@@ -234,9 +234,12 @@ ${_}"swagger": "2.0",
 ${_}"info": {
 ${__}"version": "${module.QNameModule.formattedRevision}"
 <@description obj = module indent = __ />,
+<#if module.contact??>
 ${__}"contact": {
 ${_____}"name" : "${module.contact}"
 ${__}},
+</#if>
+
 ${__}"title": "${moduleName}"
 ${_}},
 ${_}"basePath": "/restconf",
diff --git a/appc-client/pom.xml b/appc-client/pom.xml
index abd27216e..2b3dc1119 100644
--- a/appc-client/pom.xml
+++ b/appc-client/pom.xml
@@ -56,7 +56,6 @@
         <eelf.core.version>1.0.0</eelf.core.version>

         <eelf.version>0.0.4</eelf.version>

         <freemarker.version>2.3.23</freemarker.version>

-        <jackson.version>2.8.5</jackson.version>

         <java.version>1.8</java.version>

         <junit.version>4.12</junit.version>

         <maven.compiler.plugin.version>3.6.0</maven.compiler.plugin.version>