diff --git a/SOL002/VNFConfiguration-API/Configuration.robot b/SOL002/VNFConfiguration-API/Configuration.robot
index c0bb4e90de3aa90ef7f70cde8bd65a7fa42e9156..8d466ad963e11f4616d654f40004b237bfc1732c 100644
--- a/SOL002/VNFConfiguration-API/Configuration.robot
+++ b/SOL002/VNFConfiguration-API/Configuration.robot
@@ -1,5 +1,5 @@
 *** Settings ***
-Resource    environments/variables.txt 
+Resource    environment/variables.txt 
 Library    REST    ${VNF_SCHEMA}://${VNF_HOST}:${VNF_PORT} 
 ...        spec=SOL002-VNFConfiguration-API.yaml
 Library    JSONLibrary
diff --git a/SOL003/VNFPackageManagementNotification-API_nxw/PackageManagementNotification.robot b/SOL003/VNFPackageManagementNotification-API/PackageManagementNotification.robot
similarity index 100%
rename from SOL003/VNFPackageManagementNotification-API_nxw/PackageManagementNotification.robot
rename to SOL003/VNFPackageManagementNotification-API/PackageManagementNotification.robot
diff --git a/SOL003/VNFPackageManagementNotification-API_nxw/environment/variables.txt b/SOL003/VNFPackageManagementNotification-API/environment/variables.txt
similarity index 100%
rename from SOL003/VNFPackageManagementNotification-API_nxw/environment/variables.txt
rename to SOL003/VNFPackageManagementNotification-API/environment/variables.txt
diff --git a/SOL003/VNFPackageManagementNotification-API_nxw/schemas/PackageChangeNotification.schema.json b/SOL003/VNFPackageManagementNotification-API/schemas/PackageChangeNotification.schema.json
similarity index 100%
rename from SOL003/VNFPackageManagementNotification-API_nxw/schemas/PackageChangeNotification.schema.json
rename to SOL003/VNFPackageManagementNotification-API/schemas/PackageChangeNotification.schema.json
diff --git a/SOL003/VNFPackageManagementNotification-API_nxw/schemas/PackageOnboardingNotification.schema.json b/SOL003/VNFPackageManagementNotification-API/schemas/PackageOnboardingNotification.schema.json
similarity index 100%
rename from SOL003/VNFPackageManagementNotification-API_nxw/schemas/PackageOnboardingNotification.schema.json
rename to SOL003/VNFPackageManagementNotification-API/schemas/PackageOnboardingNotification.schema.json
diff --git a/SOL003/VNFPackageManagementNotification-API_nxw/schemas/ProblemDetails.schema.json b/SOL003/VNFPackageManagementNotification-API/schemas/ProblemDetails.schema.json
similarity index 100%
rename from SOL003/VNFPackageManagementNotification-API_nxw/schemas/ProblemDetails.schema.json
rename to SOL003/VNFPackageManagementNotification-API/schemas/ProblemDetails.schema.json