diff --git a/SOL002/VNFFaultManagement-API_egm/Alarms.robot b/SOL002/VNFFaultManagement-API/Alarms.robot
similarity index 100%
rename from SOL002/VNFFaultManagement-API_egm/Alarms.robot
rename to SOL002/VNFFaultManagement-API/Alarms.robot
diff --git a/SOL002/VNFFaultManagement-API_egm/EscalatePerceivedSeverityTask.robot b/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
similarity index 100%
rename from SOL002/VNFFaultManagement-API_egm/EscalatePerceivedSeverityTask.robot
rename to SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
diff --git a/SOL002/VNFFaultManagement-API_egm/IndividualAlarm.robot b/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
similarity index 100%
rename from SOL002/VNFFaultManagement-API_egm/IndividualAlarm.robot
rename to SOL002/VNFFaultManagement-API/IndividualAlarm.robot
diff --git a/SOL002/VNFFaultManagement-API_egm/IndividualSubscription.robot b/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
similarity index 100%
rename from SOL002/VNFFaultManagement-API_egm/IndividualSubscription.robot
rename to SOL002/VNFFaultManagement-API/IndividualSubscription.robot
diff --git a/SOL002/VNFFaultManagement-API_egm/NotificationEndpoint.robot b/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
similarity index 100%
rename from SOL002/VNFFaultManagement-API_egm/NotificationEndpoint.robot
rename to SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
diff --git a/SOL002/VNFFaultManagement-API_egm/README.md b/SOL002/VNFFaultManagement-API/README.md
similarity index 100%
rename from SOL002/VNFFaultManagement-API_egm/README.md
rename to SOL002/VNFFaultManagement-API/README.md
diff --git a/SOL002/VNFFaultManagement-API_egm/SOL002-VNFFaultManagement-API.json b/SOL002/VNFFaultManagement-API/SOL002-VNFFaultManagement-API.json
similarity index 100%
rename from SOL002/VNFFaultManagement-API_egm/SOL002-VNFFaultManagement-API.json
rename to SOL002/VNFFaultManagement-API/SOL002-VNFFaultManagement-API.json
diff --git a/SOL002/VNFFaultManagement-API_egm/SOL002-VNFFaultManagement-API.yaml b/SOL002/VNFFaultManagement-API/SOL002-VNFFaultManagement-API.yaml
similarity index 100%
rename from SOL002/VNFFaultManagement-API_egm/SOL002-VNFFaultManagement-API.yaml
rename to SOL002/VNFFaultManagement-API/SOL002-VNFFaultManagement-API.yaml
diff --git a/SOL002/VNFFaultManagement-API_egm/Subscriptions.robot b/SOL002/VNFFaultManagement-API/Subscriptions.robot
similarity index 100%
rename from SOL002/VNFFaultManagement-API_egm/Subscriptions.robot
rename to SOL002/VNFFaultManagement-API/Subscriptions.robot
diff --git a/SOL002/VNFFaultManagement-API_egm/jsons/alarmModifications.json b/SOL002/VNFFaultManagement-API/jsons/alarmModifications.json
similarity index 100%
rename from SOL002/VNFFaultManagement-API_egm/jsons/alarmModifications.json
rename to SOL002/VNFFaultManagement-API/jsons/alarmModifications.json
diff --git a/SOL002/VNFFaultManagement-API_egm/jsons/fmSubscriptionRequest.json b/SOL002/VNFFaultManagement-API/jsons/fmSubscriptionRequest.json
similarity index 100%
rename from SOL002/VNFFaultManagement-API_egm/jsons/fmSubscriptionRequest.json
rename to SOL002/VNFFaultManagement-API/jsons/fmSubscriptionRequest.json
diff --git a/SOL002/VNFFaultManagement-API_egm/schemas/alarm.schema.json b/SOL002/VNFFaultManagement-API/schemas/alarm.schema.json
similarity index 100%
rename from SOL002/VNFFaultManagement-API_egm/schemas/alarm.schema.json
rename to SOL002/VNFFaultManagement-API/schemas/alarm.schema.json
diff --git a/SOL002/VNFFaultManagement-API_egm/schemas/alarmClearedNotification.schema.json b/SOL002/VNFFaultManagement-API/schemas/alarmClearedNotification.schema.json
similarity index 100%
rename from SOL002/VNFFaultManagement-API_egm/schemas/alarmClearedNotification.schema.json
rename to SOL002/VNFFaultManagement-API/schemas/alarmClearedNotification.schema.json
diff --git a/SOL002/VNFFaultManagement-API_egm/schemas/alarmListRebuiltNotification.schema.json b/SOL002/VNFFaultManagement-API/schemas/alarmListRebuiltNotification.schema.json
similarity index 100%
rename from SOL002/VNFFaultManagement-API_egm/schemas/alarmListRebuiltNotification.schema.json
rename to SOL002/VNFFaultManagement-API/schemas/alarmListRebuiltNotification.schema.json
diff --git a/SOL002/VNFFaultManagement-API_egm/schemas/alarmModifications.schema.json b/SOL002/VNFFaultManagement-API/schemas/alarmModifications.schema.json
similarity index 100%
rename from SOL002/VNFFaultManagement-API_egm/schemas/alarmModifications.schema.json
rename to SOL002/VNFFaultManagement-API/schemas/alarmModifications.schema.json
diff --git a/SOL002/VNFFaultManagement-API_egm/schemas/alarmNotification.schema.json b/SOL002/VNFFaultManagement-API/schemas/alarmNotification.schema.json
similarity index 100%
rename from SOL002/VNFFaultManagement-API_egm/schemas/alarmNotification.schema.json
rename to SOL002/VNFFaultManagement-API/schemas/alarmNotification.schema.json
diff --git a/SOL002/VNFFaultManagement-API_egm/schemas/perceivedSeverityRequest.schema.json b/SOL002/VNFFaultManagement-API/schemas/perceivedSeverityRequest.schema.json
similarity index 100%
rename from SOL002/VNFFaultManagement-API_egm/schemas/perceivedSeverityRequest.schema.json
rename to SOL002/VNFFaultManagement-API/schemas/perceivedSeverityRequest.schema.json
diff --git a/SOL002/VNFFaultManagement-API_egm/schemas/problemDetails.schema.json b/SOL002/VNFFaultManagement-API/schemas/problemDetails.schema.json
similarity index 100%
rename from SOL002/VNFFaultManagement-API_egm/schemas/problemDetails.schema.json
rename to SOL002/VNFFaultManagement-API/schemas/problemDetails.schema.json
diff --git a/SOL002/VNFFaultManagement-API_egm/schemas/subscriptions.schema.json b/SOL002/VNFFaultManagement-API/schemas/subscriptions.schema.json
similarity index 100%
rename from SOL002/VNFFaultManagement-API_egm/schemas/subscriptions.schema.json
rename to SOL002/VNFFaultManagement-API/schemas/subscriptions.schema.json
diff --git a/SOL002/VNFFaultManagement-API_egm/variables.txt b/SOL002/VNFFaultManagement-API/variables.txt
similarity index 100%
rename from SOL002/VNFFaultManagement-API_egm/variables.txt
rename to SOL002/VNFFaultManagement-API/variables.txt
diff --git a/SOL002/VNFIndicator-API_nxw/IndividualSubscription.robot b/SOL002/VNFIndicator-API/IndividualSubscription.robot
similarity index 100%
rename from SOL002/VNFIndicator-API_nxw/IndividualSubscription.robot
rename to SOL002/VNFIndicator-API/IndividualSubscription.robot
diff --git a/SOL002/VNFIndicator-API_nxw/IndividualVNFindicator.robot b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
similarity index 100%
rename from SOL002/VNFIndicator-API_nxw/IndividualVNFindicator.robot
rename to SOL002/VNFIndicator-API/IndividualVNFindicator.robot
diff --git a/SOL002/VNFIndicator-API_nxw/README.md b/SOL002/VNFIndicator-API/README.md
similarity index 100%
rename from SOL002/VNFIndicator-API_nxw/README.md
rename to SOL002/VNFIndicator-API/README.md
diff --git a/SOL002/VNFIndicator-API_nxw/SOL002-VNFIndicator-API.json b/SOL002/VNFIndicator-API/SOL002-VNFIndicator-API.json
similarity index 100%
rename from SOL002/VNFIndicator-API_nxw/SOL002-VNFIndicator-API.json
rename to SOL002/VNFIndicator-API/SOL002-VNFIndicator-API.json
diff --git a/SOL002/VNFIndicator-API_nxw/Subscriptions.robot b/SOL002/VNFIndicator-API/Subscriptions.robot
similarity index 100%
rename from SOL002/VNFIndicator-API_nxw/Subscriptions.robot
rename to SOL002/VNFIndicator-API/Subscriptions.robot
diff --git a/SOL002/VNFIndicator-API_nxw/VNFIndicators.robot b/SOL002/VNFIndicator-API/VNFIndicators.robot
similarity index 100%
rename from SOL002/VNFIndicator-API_nxw/VNFIndicators.robot
rename to SOL002/VNFIndicator-API/VNFIndicators.robot
diff --git a/SOL002/VNFIndicator-API_nxw/VnfIndicatorsInVnfInstanceId.robot b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
similarity index 100%
rename from SOL002/VNFIndicator-API_nxw/VnfIndicatorsInVnfInstanceId.robot
rename to SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
diff --git a/SOL002/VNFIndicator-API_nxw/environment/generic.txt b/SOL002/VNFIndicator-API/environment/generic.txt
similarity index 100%
rename from SOL002/VNFIndicator-API_nxw/environment/generic.txt
rename to SOL002/VNFIndicator-API/environment/generic.txt
diff --git a/SOL002/VNFIndicator-API_nxw/environment/individualSubscription.txt b/SOL002/VNFIndicator-API/environment/individualSubscription.txt
similarity index 100%
rename from SOL002/VNFIndicator-API_nxw/environment/individualSubscription.txt
rename to SOL002/VNFIndicator-API/environment/individualSubscription.txt
diff --git a/SOL002/VNFIndicator-API_nxw/environment/individualVnfIndicator.txt b/SOL002/VNFIndicator-API/environment/individualVnfIndicator.txt
similarity index 100%
rename from SOL002/VNFIndicator-API_nxw/environment/individualVnfIndicator.txt
rename to SOL002/VNFIndicator-API/environment/individualVnfIndicator.txt
diff --git a/SOL002/VNFIndicator-API_nxw/environment/subscriptions.txt b/SOL002/VNFIndicator-API/environment/subscriptions.txt
similarity index 100%
rename from SOL002/VNFIndicator-API_nxw/environment/subscriptions.txt
rename to SOL002/VNFIndicator-API/environment/subscriptions.txt
diff --git a/SOL002/VNFIndicator-API_nxw/environment/vnfIndicatorinVnfInstance.txt b/SOL002/VNFIndicator-API/environment/vnfIndicatorinVnfInstance.txt
similarity index 100%
rename from SOL002/VNFIndicator-API_nxw/environment/vnfIndicatorinVnfInstance.txt
rename to SOL002/VNFIndicator-API/environment/vnfIndicatorinVnfInstance.txt
diff --git a/SOL002/VNFIndicator-API_nxw/environment/vnfIndicators.txt b/SOL002/VNFIndicator-API/environment/vnfIndicators.txt
similarity index 100%
rename from SOL002/VNFIndicator-API_nxw/environment/vnfIndicators.txt
rename to SOL002/VNFIndicator-API/environment/vnfIndicators.txt
diff --git a/SOL002/VNFIndicator-API_nxw/jsons/subscriptions.json b/SOL002/VNFIndicator-API/jsons/subscriptions.json
similarity index 100%
rename from SOL002/VNFIndicator-API_nxw/jsons/subscriptions.json
rename to SOL002/VNFIndicator-API/jsons/subscriptions.json
diff --git a/SOL002/VNFIndicator-API_nxw/schemas/ProblemDetails.schema.json b/SOL002/VNFIndicator-API/schemas/ProblemDetails.schema.json
similarity index 100%
rename from SOL002/VNFIndicator-API_nxw/schemas/ProblemDetails.schema.json
rename to SOL002/VNFIndicator-API/schemas/ProblemDetails.schema.json
diff --git a/SOL002/VNFIndicator-API_nxw/schemas/VnfIndicatorSubscription.schema.json b/SOL002/VNFIndicator-API/schemas/VnfIndicatorSubscription.schema.json
similarity index 100%
rename from SOL002/VNFIndicator-API_nxw/schemas/VnfIndicatorSubscription.schema.json
rename to SOL002/VNFIndicator-API/schemas/VnfIndicatorSubscription.schema.json
diff --git a/SOL002/VNFIndicator-API_nxw/schemas/vnfIndicators.schema.json b/SOL002/VNFIndicator-API/schemas/vnfIndicators.schema.json
similarity index 100%
rename from SOL002/VNFIndicator-API_nxw/schemas/vnfIndicators.schema.json
rename to SOL002/VNFIndicator-API/schemas/vnfIndicators.schema.json
diff --git a/SOL002/VNFIndicatorNotification-API_nxw/README.md b/SOL002/VNFIndicatorNotification-API/README.md
similarity index 100%
rename from SOL002/VNFIndicatorNotification-API_nxw/README.md
rename to SOL002/VNFIndicatorNotification-API/README.md
diff --git a/SOL002/VNFIndicatorNotification-API_nxw/VnfIndicatorNotification.robot b/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
similarity index 100%
rename from SOL002/VNFIndicatorNotification-API_nxw/VnfIndicatorNotification.robot
rename to SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
diff --git a/SOL002/VNFIndicatorNotification-API_nxw/schemas/VnfIndicatorValueChangeNotification.schema.json b/SOL002/VNFIndicatorNotification-API/schemas/VnfIndicatorValueChangeNotification.schema.json
similarity index 100%
rename from SOL002/VNFIndicatorNotification-API_nxw/schemas/VnfIndicatorValueChangeNotification.schema.json
rename to SOL002/VNFIndicatorNotification-API/schemas/VnfIndicatorValueChangeNotification.schema.json
diff --git a/SOL002/VNFLifecycleManagement-API_egm/CancelOperationTask.robot b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/CancelOperationTask.robot
rename to SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
diff --git a/SOL002/VNFLifecycleManagement-API_egm/ChangeExternalVNFConnectivityTask.robot b/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/ChangeExternalVNFConnectivityTask.robot
rename to SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
diff --git a/SOL002/VNFLifecycleManagement-API_egm/ChangeVNFFlavourTask.robot b/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/ChangeVNFFlavourTask.robot
rename to SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
diff --git a/SOL002/VNFLifecycleManagement-API_egm/FailOperationTask.robot b/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/FailOperationTask.robot
rename to SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
diff --git a/SOL002/VNFLifecycleManagement-API_egm/HealVNFTask.robot b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/HealVNFTask.robot
rename to SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
diff --git a/SOL002/VNFLifecycleManagement-API_egm/IndividualSubscription.robot b/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/IndividualSubscription.robot
rename to SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot
diff --git a/SOL002/VNFLifecycleManagement-API_egm/IndividualVNFInstance.robot b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/IndividualVNFInstance.robot
rename to SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
diff --git a/SOL002/VNFLifecycleManagement-API_egm/IndividualVnfLcmOperationOccurence.robot b/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/IndividualVnfLcmOperationOccurence.robot
rename to SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
diff --git a/SOL002/VNFLifecycleManagement-API_egm/InstantiateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/InstantiateVNFTask.robot
rename to SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
diff --git a/SOL002/VNFLifecycleManagement-API_egm/NotificationEndpoint.robot b/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/NotificationEndpoint.robot
rename to SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
diff --git a/SOL002/VNFLifecycleManagement-API_egm/OperateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/OperateVNFTask.robot
rename to SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
diff --git a/SOL002/VNFLifecycleManagement-API_egm/README.md b/SOL002/VNFLifecycleManagement-API/README.md
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/README.md
rename to SOL002/VNFLifecycleManagement-API/README.md
diff --git a/SOL002/VNFLifecycleManagement-API_egm/RetryOperationTask.robot b/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/RetryOperationTask.robot
rename to SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
diff --git a/SOL002/VNFLifecycleManagement-API_egm/RollbackOperationTask.robot b/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/RollbackOperationTask.robot
rename to SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
diff --git a/SOL002/VNFLifecycleManagement-API_egm/SOL002-VNFLifecycleManagement-API.json b/SOL002/VNFLifecycleManagement-API/SOL002-VNFLifecycleManagement-API.json
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/SOL002-VNFLifecycleManagement-API.json
rename to SOL002/VNFLifecycleManagement-API/SOL002-VNFLifecycleManagement-API.json
diff --git a/SOL002/VNFLifecycleManagement-API_egm/SOL002-VNFLifecycleManagement-API.yaml b/SOL002/VNFLifecycleManagement-API/SOL002-VNFLifecycleManagement-API.yaml
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/SOL002-VNFLifecycleManagement-API.yaml
rename to SOL002/VNFLifecycleManagement-API/SOL002-VNFLifecycleManagement-API.yaml
diff --git a/SOL002/VNFLifecycleManagement-API_egm/ScaleVNFTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/ScaleVNFTask.robot
rename to SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
diff --git a/SOL002/VNFLifecycleManagement-API_egm/ScaleVNFToLevelTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/ScaleVNFToLevelTask.robot
rename to SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
diff --git a/SOL002/VNFLifecycleManagement-API_egm/Subscriptions.robot b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/Subscriptions.robot
rename to SOL002/VNFLifecycleManagement-API/Subscriptions.robot
diff --git a/SOL002/VNFLifecycleManagement-API_egm/TerminateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/TerminateVNFTask.robot
rename to SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
diff --git a/SOL002/VNFLifecycleManagement-API_egm/VNFInstances.robot b/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/VNFInstances.robot
rename to SOL002/VNFLifecycleManagement-API/VNFInstances.robot
diff --git a/SOL002/VNFLifecycleManagement-API_egm/VnfLcmOperationOccurences.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/VnfLcmOperationOccurences.robot
rename to SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
diff --git a/SOL002/VNFLifecycleManagement-API_egm/jsons/changeExtVnfConnectivityRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/changeExtVnfConnectivityRequest.json
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/jsons/changeExtVnfConnectivityRequest.json
rename to SOL002/VNFLifecycleManagement-API/jsons/changeExtVnfConnectivityRequest.json
diff --git a/SOL002/VNFLifecycleManagement-API_egm/jsons/changeVnfFlavourRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/changeVnfFlavourRequest.json
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/jsons/changeVnfFlavourRequest.json
rename to SOL002/VNFLifecycleManagement-API/jsons/changeVnfFlavourRequest.json
diff --git a/SOL002/VNFLifecycleManagement-API_egm/jsons/createVnfRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/createVnfRequest.json
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/jsons/createVnfRequest.json
rename to SOL002/VNFLifecycleManagement-API/jsons/createVnfRequest.json
diff --git a/SOL002/VNFLifecycleManagement-API_egm/jsons/healVnfRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/healVnfRequest.json
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/jsons/healVnfRequest.json
rename to SOL002/VNFLifecycleManagement-API/jsons/healVnfRequest.json
diff --git a/SOL002/VNFLifecycleManagement-API_egm/jsons/instantiateVnfRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/instantiateVnfRequest.json
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/jsons/instantiateVnfRequest.json
rename to SOL002/VNFLifecycleManagement-API/jsons/instantiateVnfRequest.json
diff --git a/SOL002/VNFLifecycleManagement-API_egm/jsons/lccnSubscriptionRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/jsons/lccnSubscriptionRequest.json
rename to SOL002/VNFLifecycleManagement-API/jsons/lccnSubscriptionRequest.json
diff --git a/SOL002/VNFLifecycleManagement-API_egm/jsons/operateVnfRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/operateVnfRequest.json
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/jsons/operateVnfRequest.json
rename to SOL002/VNFLifecycleManagement-API/jsons/operateVnfRequest.json
diff --git a/SOL002/VNFLifecycleManagement-API_egm/jsons/patchBodyRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/patchBodyRequest.json
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/jsons/patchBodyRequest.json
rename to SOL002/VNFLifecycleManagement-API/jsons/patchBodyRequest.json
diff --git a/SOL002/VNFLifecycleManagement-API_egm/jsons/scaleVnfRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/scaleVnfRequest.json
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/jsons/scaleVnfRequest.json
rename to SOL002/VNFLifecycleManagement-API/jsons/scaleVnfRequest.json
diff --git a/SOL002/VNFLifecycleManagement-API_egm/jsons/scaleVnfToLevelRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/scaleVnfToLevelRequest.json
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/jsons/scaleVnfToLevelRequest.json
rename to SOL002/VNFLifecycleManagement-API/jsons/scaleVnfToLevelRequest.json
diff --git a/SOL002/VNFLifecycleManagement-API_egm/jsons/terminateVnfRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/terminateVnfRequest.json
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/jsons/terminateVnfRequest.json
rename to SOL002/VNFLifecycleManagement-API/jsons/terminateVnfRequest.json
diff --git a/SOL002/VNFLifecycleManagement-API_egm/schemas/VnfIdentifierCreationNotification.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/VnfIdentifierCreationNotification.schema.json
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/schemas/VnfIdentifierCreationNotification.schema.json
rename to SOL002/VNFLifecycleManagement-API/schemas/VnfIdentifierCreationNotification.schema.json
diff --git a/SOL002/VNFLifecycleManagement-API_egm/schemas/problemDetails.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/problemDetails.schema.json
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/schemas/problemDetails.schema.json
rename to SOL002/VNFLifecycleManagement-API/schemas/problemDetails.schema.json
diff --git a/SOL002/VNFLifecycleManagement-API_egm/schemas/subscriptions.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/subscriptions.schema.json
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/schemas/subscriptions.schema.json
rename to SOL002/VNFLifecycleManagement-API/schemas/subscriptions.schema.json
diff --git a/SOL002/VNFLifecycleManagement-API_egm/schemas/vnfIdentifierDeletionNotification.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/vnfIdentifierDeletionNotification.schema.json
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/schemas/vnfIdentifierDeletionNotification.schema.json
rename to SOL002/VNFLifecycleManagement-API/schemas/vnfIdentifierDeletionNotification.schema.json
diff --git a/SOL002/VNFLifecycleManagement-API_egm/schemas/vnfInstance.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/vnfInstance.schema.json
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/schemas/vnfInstance.schema.json
rename to SOL002/VNFLifecycleManagement-API/schemas/vnfInstance.schema.json
diff --git a/SOL002/VNFLifecycleManagement-API_egm/schemas/vnfLcmOpOcc.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/vnfLcmOpOcc.schema.json
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/schemas/vnfLcmOpOcc.schema.json
rename to SOL002/VNFLifecycleManagement-API/schemas/vnfLcmOpOcc.schema.json
diff --git a/SOL002/VNFLifecycleManagement-API_egm/schemas/vnfLcmOperationOccurrenceNotification.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/vnfLcmOperationOccurrenceNotification.schema.json
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/schemas/vnfLcmOperationOccurrenceNotification.schema.json
rename to SOL002/VNFLifecycleManagement-API/schemas/vnfLcmOperationOccurrenceNotification.schema.json
diff --git a/SOL002/VNFLifecycleManagement-API_egm/variables.txt b/SOL002/VNFLifecycleManagement-API/variables.txt
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API_egm/variables.txt
rename to SOL002/VNFLifecycleManagement-API/variables.txt
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/IndividualPmJob.robot b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/IndividualPmJob.robot
rename to SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/IndividualReport.robot b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/IndividualReport.robot
rename to SOL002/VNFPerformanceManagement-API/IndividualReport.robot
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/IndividualSubscription.robot b/SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/IndividualSubscription.robot
rename to SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/IndividualThreshold.robot b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/IndividualThreshold.robot
rename to SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/PMJobs.robot b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/PMJobs.robot
rename to SOL002/VNFPerformanceManagement-API/PMJobs.robot
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/README.md b/SOL002/VNFPerformanceManagement-API/README.md
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/README.md
rename to SOL002/VNFPerformanceManagement-API/README.md
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/Subscriptions.robot b/SOL002/VNFPerformanceManagement-API/Subscriptions.robot
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/Subscriptions.robot
rename to SOL002/VNFPerformanceManagement-API/Subscriptions.robot
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/Thresholds.robot b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/Thresholds.robot
rename to SOL002/VNFPerformanceManagement-API/Thresholds.robot
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/environment/IndividualPmJob.txt b/SOL002/VNFPerformanceManagement-API/environment/IndividualPmJob.txt
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/environment/IndividualPmJob.txt
rename to SOL002/VNFPerformanceManagement-API/environment/IndividualPmJob.txt
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/environment/generic.txt b/SOL002/VNFPerformanceManagement-API/environment/generic.txt
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/environment/generic.txt
rename to SOL002/VNFPerformanceManagement-API/environment/generic.txt
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/environment/individualSubscription.txt b/SOL002/VNFPerformanceManagement-API/environment/individualSubscription.txt
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/environment/individualSubscription.txt
rename to SOL002/VNFPerformanceManagement-API/environment/individualSubscription.txt
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/environment/individualThresholds.txt b/SOL002/VNFPerformanceManagement-API/environment/individualThresholds.txt
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/environment/individualThresholds.txt
rename to SOL002/VNFPerformanceManagement-API/environment/individualThresholds.txt
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/environment/pmJobs.txt b/SOL002/VNFPerformanceManagement-API/environment/pmJobs.txt
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/environment/pmJobs.txt
rename to SOL002/VNFPerformanceManagement-API/environment/pmJobs.txt
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/environment/reports.txt b/SOL002/VNFPerformanceManagement-API/environment/reports.txt
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/environment/reports.txt
rename to SOL002/VNFPerformanceManagement-API/environment/reports.txt
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/environment/subscriptions.txt b/SOL002/VNFPerformanceManagement-API/environment/subscriptions.txt
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/environment/subscriptions.txt
rename to SOL002/VNFPerformanceManagement-API/environment/subscriptions.txt
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/environment/thresholds.txt b/SOL002/VNFPerformanceManagement-API/environment/thresholds.txt
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/environment/thresholds.txt
rename to SOL002/VNFPerformanceManagement-API/environment/thresholds.txt
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/jsons/CreatePmJobRequest.json b/SOL002/VNFPerformanceManagement-API/jsons/CreatePmJobRequest.json
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/jsons/CreatePmJobRequest.json
rename to SOL002/VNFPerformanceManagement-API/jsons/CreatePmJobRequest.json
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/jsons/CreateThresholdRequest.json b/SOL002/VNFPerformanceManagement-API/jsons/CreateThresholdRequest.json
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/jsons/CreateThresholdRequest.json
rename to SOL002/VNFPerformanceManagement-API/jsons/CreateThresholdRequest.json
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/jsons/subscriptions.json b/SOL002/VNFPerformanceManagement-API/jsons/subscriptions.json
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/jsons/subscriptions.json
rename to SOL002/VNFPerformanceManagement-API/jsons/subscriptions.json
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/schemas/PerformanceReport.schema.json b/SOL002/VNFPerformanceManagement-API/schemas/PerformanceReport.schema.json
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/schemas/PerformanceReport.schema.json
rename to SOL002/VNFPerformanceManagement-API/schemas/PerformanceReport.schema.json
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/schemas/PmJob.schema.json b/SOL002/VNFPerformanceManagement-API/schemas/PmJob.schema.json
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/schemas/PmJob.schema.json
rename to SOL002/VNFPerformanceManagement-API/schemas/PmJob.schema.json
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/schemas/PmSubscriptions.schema.json b/SOL002/VNFPerformanceManagement-API/schemas/PmSubscriptions.schema.json
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/schemas/PmSubscriptions.schema.json
rename to SOL002/VNFPerformanceManagement-API/schemas/PmSubscriptions.schema.json
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/schemas/ProblemDetails.schema.json b/SOL002/VNFPerformanceManagement-API/schemas/ProblemDetails.schema.json
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/schemas/ProblemDetails.schema.json
rename to SOL002/VNFPerformanceManagement-API/schemas/ProblemDetails.schema.json
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/schemas/Subscriptions.schema.json b/SOL002/VNFPerformanceManagement-API/schemas/Subscriptions.schema.json
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/schemas/Subscriptions.schema.json
rename to SOL002/VNFPerformanceManagement-API/schemas/Subscriptions.schema.json
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/schemas/Threshold.schema.json b/SOL002/VNFPerformanceManagement-API/schemas/Threshold.schema.json
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/schemas/Threshold.schema.json
rename to SOL002/VNFPerformanceManagement-API/schemas/Threshold.schema.json
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/schemas/criteria.schema.json b/SOL002/VNFPerformanceManagement-API/schemas/criteria.schema.json
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/schemas/criteria.schema.json
rename to SOL002/VNFPerformanceManagement-API/schemas/criteria.schema.json
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/schemas/links.schema.json b/SOL002/VNFPerformanceManagement-API/schemas/links.schema.json
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/schemas/links.schema.json
rename to SOL002/VNFPerformanceManagement-API/schemas/links.schema.json
diff --git a/SOL002/VNFPerformanceManagement-API_nxw/schemas/reports.schema.json b/SOL002/VNFPerformanceManagement-API/schemas/reports.schema.json
similarity index 100%
rename from SOL002/VNFPerformanceManagement-API_nxw/schemas/reports.schema.json
rename to SOL002/VNFPerformanceManagement-API/schemas/reports.schema.json
diff --git a/SOL002/VNFPerformanceManagementNotification-API_nxw/PerformanceManagementNotification.robot b/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
similarity index 100%
rename from SOL002/VNFPerformanceManagementNotification-API_nxw/PerformanceManagementNotification.robot
rename to SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
diff --git a/SOL002/VNFPerformanceManagementNotification-API_nxw/README.md b/SOL002/VNFPerformanceManagementNotification-API/README.md
similarity index 100%
rename from SOL002/VNFPerformanceManagementNotification-API_nxw/README.md
rename to SOL002/VNFPerformanceManagementNotification-API/README.md
diff --git a/SOL002/VNFPerformanceManagementNotification-API_nxw/environment/generic.txt b/SOL002/VNFPerformanceManagementNotification-API/environment/generic.txt
similarity index 100%
rename from SOL002/VNFPerformanceManagementNotification-API_nxw/environment/generic.txt
rename to SOL002/VNFPerformanceManagementNotification-API/environment/generic.txt
diff --git a/SOL002/VNFPerformanceManagementNotification-API_nxw/jsons/PerformanceInformationAvailableNotification.json b/SOL002/VNFPerformanceManagementNotification-API/jsons/PerformanceInformationAvailableNotification.json
similarity index 100%
rename from SOL002/VNFPerformanceManagementNotification-API_nxw/jsons/PerformanceInformationAvailableNotification.json
rename to SOL002/VNFPerformanceManagementNotification-API/jsons/PerformanceInformationAvailableNotification.json
diff --git a/SOL002/VNFPerformanceManagementNotification-API_nxw/jsons/ThresholdCrossedNotification.json b/SOL002/VNFPerformanceManagementNotification-API/jsons/ThresholdCrossedNotification.json
similarity index 100%
rename from SOL002/VNFPerformanceManagementNotification-API_nxw/jsons/ThresholdCrossedNotification.json
rename to SOL002/VNFPerformanceManagementNotification-API/jsons/ThresholdCrossedNotification.json
diff --git a/SOL002/VNFPerformanceManagementNotification-API_nxw/schemas/PerformanceInformationAvailableNotification.schema.json b/SOL002/VNFPerformanceManagementNotification-API/schemas/PerformanceInformationAvailableNotification.schema.json
similarity index 100%
rename from SOL002/VNFPerformanceManagementNotification-API_nxw/schemas/PerformanceInformationAvailableNotification.schema.json
rename to SOL002/VNFPerformanceManagementNotification-API/schemas/PerformanceInformationAvailableNotification.schema.json
diff --git a/SOL002/VNFPerformanceManagementNotification-API_nxw/schemas/ProblemDetails.schema.json b/SOL002/VNFPerformanceManagementNotification-API/schemas/ProblemDetails.schema.json
similarity index 100%
rename from SOL002/VNFPerformanceManagementNotification-API_nxw/schemas/ProblemDetails.schema.json
rename to SOL002/VNFPerformanceManagementNotification-API/schemas/ProblemDetails.schema.json
diff --git a/SOL002/VNFPerformanceManagementNotification-API_nxw/schemas/ThresholdCrossedNotification.schema.json b/SOL002/VNFPerformanceManagementNotification-API/schemas/ThresholdCrossedNotification.schema.json
similarity index 100%
rename from SOL002/VNFPerformanceManagementNotification-API_nxw/schemas/ThresholdCrossedNotification.schema.json
rename to SOL002/VNFPerformanceManagementNotification-API/schemas/ThresholdCrossedNotification.schema.json