diff --git a/MEC012/SRV/RNIS/RnisSubscriptions_BV.robot b/MEC012/SRV/RNIS/RnisSubscriptions_BV.robot
index 314c2136ad6abc6bc840d9e58621cb16e44b0609..44301fe702412252b15baed3cbcbb5998fd91aa6 100644
--- a/MEC012/SRV/RNIS/RnisSubscriptions_BV.robot
+++ b/MEC012/SRV/RNIS/RnisSubscriptions_BV.robot
@@ -4,7 +4,6 @@
 *** Settings ***
 Library    OperatingSystem
 Resource    environment/variables.txt
-Resource    ../../../pics.txt
 Resource    ../../../GenericKeywords.robot
 Resource    resources/RadioNetworkInformationAPI.robot
 Library     REST    ${MEC-APP_SCHEMA}://${MEC-APP_HOST}:${MEC-APP_PORT}    ssl_verify=false
diff --git a/SRV/RLOCLOOK/PlatRadioNodeLocation.robot b/MEC013/SRV/RLOCLOOK/PlatRadioNodeLocation.robot
similarity index 92%
rename from SRV/RLOCLOOK/PlatRadioNodeLocation.robot
rename to MEC013/SRV/RLOCLOOK/PlatRadioNodeLocation.robot
index 33979d3d86a3a21627073b3be6ffc98a533611d2..11e4ced2ca1235839ea32e06ed1c02503ab6695b 100644
--- a/SRV/RLOCLOOK/PlatRadioNodeLocation.robot
+++ b/MEC013/SRV/RLOCLOOK/PlatRadioNodeLocation.robot
@@ -3,7 +3,8 @@
 Documentation
 ...    A test suite for validating Radio Node Location Lookup (RLOCLOOK) operations.
 
-Resource    ../../GenericKeywords.robot
+Resource    ../../../pics.txt
+Resource    ../../../GenericKeywords.robot
 Resource    environment/variables.txt
 Library     REST    ${SCHEMA}://${HOST}:${PORT}    ssl_verify=false
 Library     OperatingSystem 
@@ -13,7 +14,7 @@ Default Tags    TC_MEC_SRV_RLOCLOOK
 
 *** Test Cases ***
 
-TC_MEC_SRV_RLOCLOOK_001_OK
+TC_MEC_MEC013_SRV_RLOCLOOK_001_OK
     [Documentation]
     ...    Check that the IUT responds with the list of radio nodes currently associated with the MEC host and the location of each radio node
     ...    when queried by a MEC Application
@@ -28,7 +29,7 @@ TC_MEC_SRV_RLOCLOOK_001_OK
     Should Be Equal As Strings    ${response['body']['accessPointList']['zoneId']}    ${ZONE_ID}
 
 
-TC_MEC_SRV_RLOCLOOK_001_NF
+TC_MEC_MEC013_SRV_RLOCLOOK_001_NF
     [Documentation]
     ...    Check that the IUT responds with an error when
     ...    a request for an unknown URI is sent by a MEC Application
diff --git a/SRV/RLOCLOOK/README.md b/MEC013/SRV/RLOCLOOK/README.md
similarity index 100%
rename from SRV/RLOCLOOK/README.md
rename to MEC013/SRV/RLOCLOOK/README.md
diff --git a/SRV/RLOCLOOK/environment/variables.txt b/MEC013/SRV/RLOCLOOK/environment/variables.txt
similarity index 100%
rename from SRV/RLOCLOOK/environment/variables.txt
rename to MEC013/SRV/RLOCLOOK/environment/variables.txt
diff --git a/SRV/RLOCLOOK/schemas/AccessPointInfo.schema.json b/MEC013/SRV/RLOCLOOK/schemas/AccessPointInfo.schema.json
similarity index 100%
rename from SRV/RLOCLOOK/schemas/AccessPointInfo.schema.json
rename to MEC013/SRV/RLOCLOOK/schemas/AccessPointInfo.schema.json
diff --git a/SRV/RLOCLOOK/schemas/AccessPointList.schema.json b/MEC013/SRV/RLOCLOOK/schemas/AccessPointList.schema.json
similarity index 100%
rename from SRV/RLOCLOOK/schemas/AccessPointList.schema.json
rename to MEC013/SRV/RLOCLOOK/schemas/AccessPointList.schema.json
diff --git a/SRV/RLOCLOOK/schemas/AccessPointList.schema.v1.1.1.json b/MEC013/SRV/RLOCLOOK/schemas/AccessPointList.schema.v1.1.1.json
similarity index 100%
rename from SRV/RLOCLOOK/schemas/AccessPointList.schema.v1.1.1.json
rename to MEC013/SRV/RLOCLOOK/schemas/AccessPointList.schema.v1.1.1.json
diff --git a/SRV/UEAREASUB/PlatUeAreaSubscription.robot b/MEC013/SRV/UEAREASUB/PlatUeAreaSubscription.robot
similarity index 93%
rename from SRV/UEAREASUB/PlatUeAreaSubscription.robot
rename to MEC013/SRV/UEAREASUB/PlatUeAreaSubscription.robot
index 1bdc1f9ef5d8d5aed4bb657664427a9d459176d3..35eb1170e9699033bb5d03b61549fdac01096631 100644
--- a/SRV/UEAREASUB/PlatUeAreaSubscription.robot
+++ b/MEC013/SRV/UEAREASUB/PlatUeAreaSubscription.robot
@@ -3,7 +3,8 @@
 Documentation
 ...    A test suite for validating UE Area Subscribe (UEAREASUB) operations.
 
-Resource    ../../GenericKeywords.robot
+Resource    ../../../GenericKeywords.robot
+Resource    ../../../pics.txt
 Resource    environment/variables.txt
 Library     REST    ${SCHEMA}://${HOST}:${PORT}    ssl_verify=false
 Library     OperatingSystem 
@@ -13,7 +14,7 @@ Default Tags    TC_MEC_SRV_UEAREASUB
 
 
 *** Test Cases ***
-TC_MEC_SRV_UEAREASUB_001_OK
+TC_MEC_MEC013_SRV_UEAREASUB_001_OK
     [Documentation]
     ...    Check that the IUT acknowledges the UE area change subscription request when
     ...    commanded by a MEC Application and notifies it when the UE enters the specified circle
@@ -30,7 +31,7 @@ TC_MEC_SRV_UEAREASUB_001_OK
     
 
 
-TC_MEC_SRV_UEAREASUB_001_BR
+TC_MEC_MEC013_SRV_UEAREASUB_001_BR
     [Documentation]
     ...    Check that the IUT responds with an error when
     ...    a request with incorrect parameters is sent by a MEC Application
@@ -42,7 +43,7 @@ TC_MEC_SRV_UEAREASUB_001_BR
     Check HTTP Response Status Code Is    400
 
 
-TC_MEC_SRV_UEAREASUB_002_OK
+TC_MEC_MEC013_SRV_UEAREASUB_002_OK
     [Documentation]
     ...    Check that the IUT acknowledges the cancellation of UE area change notifications
     ...    when commanded by a MEC Application
@@ -54,7 +55,7 @@ TC_MEC_SRV_UEAREASUB_002_OK
     Check HTTP Response Status Code Is    204
 
 
-TC_MEC_SRV_UEAREASUB_002_NF
+TC_MEC_MEC013_SRV_UEAREASUB_002_NF
     [Documentation]
     ...    Check that the IUT responds with an error when
     ...    a request sent by a MEC Application doesn't comply with a required condition
diff --git a/SRV/UEAREASUB/README.md b/MEC013/SRV/UEAREASUB/README.md
similarity index 100%
rename from SRV/UEAREASUB/README.md
rename to MEC013/SRV/UEAREASUB/README.md
diff --git a/SRV/UEAREASUB/environment/variables.txt b/MEC013/SRV/UEAREASUB/environment/variables.txt
similarity index 100%
rename from SRV/UEAREASUB/environment/variables.txt
rename to MEC013/SRV/UEAREASUB/environment/variables.txt
diff --git a/SRV/UEAREASUB/jsons/CircleNotificationSubscription.json b/MEC013/SRV/UEAREASUB/jsons/CircleNotificationSubscription.json
similarity index 100%
rename from SRV/UEAREASUB/jsons/CircleNotificationSubscription.json
rename to MEC013/SRV/UEAREASUB/jsons/CircleNotificationSubscription.json
diff --git a/SRV/UEAREASUB/jsons/CircleNotificationSubscriptionError.json b/MEC013/SRV/UEAREASUB/jsons/CircleNotificationSubscriptionError.json
similarity index 100%
rename from SRV/UEAREASUB/jsons/CircleNotificationSubscriptionError.json
rename to MEC013/SRV/UEAREASUB/jsons/CircleNotificationSubscriptionError.json
diff --git a/SRV/UEAREASUB/schemas/CircleNotificationSubscription.schema.json b/MEC013/SRV/UEAREASUB/schemas/CircleNotificationSubscription.schema.json
similarity index 100%
rename from SRV/UEAREASUB/schemas/CircleNotificationSubscription.schema.json
rename to MEC013/SRV/UEAREASUB/schemas/CircleNotificationSubscription.schema.json
diff --git a/SRV/UEAREASUB/schemas/CircleNotificationSubscription.schema.v1.1.1.json b/MEC013/SRV/UEAREASUB/schemas/CircleNotificationSubscription.schema.v1.1.1.json
similarity index 100%
rename from SRV/UEAREASUB/schemas/CircleNotificationSubscription.schema.v1.1.1.json
rename to MEC013/SRV/UEAREASUB/schemas/CircleNotificationSubscription.schema.v1.1.1.json
diff --git a/SRV/UEAREASUB/schemas/NotificationSubscriptionList.schema.json b/MEC013/SRV/UEAREASUB/schemas/NotificationSubscriptionList.schema.json
similarity index 100%
rename from SRV/UEAREASUB/schemas/NotificationSubscriptionList.schema.json
rename to MEC013/SRV/UEAREASUB/schemas/NotificationSubscriptionList.schema.json
diff --git a/SRV/UEDISTLOOK/PlatUeDistanceLookup.robot b/MEC013/SRV/UEDISTLOOK/PlatUeDistanceLookup.robot
similarity index 92%
rename from SRV/UEDISTLOOK/PlatUeDistanceLookup.robot
rename to MEC013/SRV/UEDISTLOOK/PlatUeDistanceLookup.robot
index 6cc9c8d951ed16f6f4253799e1474d6c2eefe785..74dc0b1d55bebaeda29cfcbdca05caa8369e13b2 100644
--- a/SRV/UEDISTLOOK/PlatUeDistanceLookup.robot
+++ b/MEC013/SRV/UEDISTLOOK/PlatUeDistanceLookup.robot
@@ -3,7 +3,8 @@
 Documentation
 ...    A test suite for validating UE Distance Lookup (UEDISTLOOK) operations.
 
-Resource    ../../GenericKeywords.robot
+Resource    ../../../GenericKeywords.robot
+Resource    ../../../pics.txt
 Resource    environment/variables.txt
 Library     REST    ${SCHEMA}://${HOST}:${PORT}    ssl_verify=false
 Library     OperatingSystem   
@@ -17,7 +18,7 @@ ${response}
 
 *** Test Cases ***
 
-TC_MEC_SRV_UEDISTLOOK_001_OK
+TC_MEC_MEC013_SRV_UEDISTLOOK_001_OK
     [Documentation]
     ...    Check that the IUT responds with the distance to a UE
     ...    when queried by a MEC Application
@@ -35,7 +36,7 @@ TC_MEC_SRV_UEDISTLOOK_001_OK
     Check HTTP Response Body Json Schema Is    TerminalDistance
 
 
-TC_MEC_SRV_UEDISTLOOK_001_BR
+TC_MEC_MEC013_SRV_UEDISTLOOK_001_BR
     [Documentation]
     ...    Check that the IUT responds with an error when
     ...    a request with incorrect parameters is sent by a MEC Application
diff --git a/SRV/UEDISTLOOK/README.md b/MEC013/SRV/UEDISTLOOK/README.md
similarity index 100%
rename from SRV/UEDISTLOOK/README.md
rename to MEC013/SRV/UEDISTLOOK/README.md
diff --git a/SRV/UEDISTLOOK/environment/variables.txt b/MEC013/SRV/UEDISTLOOK/environment/variables.txt
similarity index 100%
rename from SRV/UEDISTLOOK/environment/variables.txt
rename to MEC013/SRV/UEDISTLOOK/environment/variables.txt
diff --git a/SRV/UEDISTLOOK/schemas/TerminalDistance.schema.json b/MEC013/SRV/UEDISTLOOK/schemas/TerminalDistance.schema.json
similarity index 100%
rename from SRV/UEDISTLOOK/schemas/TerminalDistance.schema.json
rename to MEC013/SRV/UEDISTLOOK/schemas/TerminalDistance.schema.json
diff --git a/SRV/UEDISTLOOK/schemas/TerminalDistance.schema.v1.1.1.json b/MEC013/SRV/UEDISTLOOK/schemas/TerminalDistance.schema.v1.1.1.json
similarity index 100%
rename from SRV/UEDISTLOOK/schemas/TerminalDistance.schema.v1.1.1.json
rename to MEC013/SRV/UEDISTLOOK/schemas/TerminalDistance.schema.v1.1.1.json
diff --git a/SRV/UEDISTSUB/PlatUeDistanceSubscription.robot b/MEC013/SRV/UEDISTSUB/PlatUeDistanceSubscription.robot
similarity index 94%
rename from SRV/UEDISTSUB/PlatUeDistanceSubscription.robot
rename to MEC013/SRV/UEDISTSUB/PlatUeDistanceSubscription.robot
index 2db3839f1257485d9a7423b33149ea74b32b8594..fd3e3a51f1ccb4c8bda2d8341febf9c4187d0be5 100644
--- a/SRV/UEDISTSUB/PlatUeDistanceSubscription.robot
+++ b/MEC013/SRV/UEDISTSUB/PlatUeDistanceSubscription.robot
@@ -3,7 +3,8 @@
 Documentation
 ...    A test suite for validating UE Distance Subscribe (UEDISTSUB) operations.
 
-Resource    ../../GenericKeywords.robot
+Resource    ../../../GenericKeywords.robot
+Resource    ../../../pics.txt
 Resource    environment/variables.txt
 Library     REST    ${SCHEMA}://${HOST}:${PORT}    ssl_verify=false
 Library     OperatingSystem   
@@ -13,7 +14,7 @@ Default Tags    TC_MEC_SRV_UEDISTSUB
 
 *** Test Cases ***
 
-TC_MEC_SRV_UEDISTSUB_001_OK
+TC_MEC_MEC013_SRV_UEDISTSUB_001_OK
     [Documentation]
     ...    Check that the IUT acknowledges the UE distance subscription request when commanded by a
     ...    MEC Application and notifies it when (all) the requested UE(s) is (are) within the specified distance
@@ -31,7 +32,7 @@ TC_MEC_SRV_UEDISTSUB_001_OK
     Check Result Contains    ${response['body']['distanceNotificationSubscription']}    referenceAddress    ${UEDISTSUB_IP_ADDRESS}
 
 
-TC_MEC_SRV_UEDISTSUB_001_BR
+TC_MEC_MEC013_SRV_UEDISTSUB_001_BR
     [Documentation]
     ...    Check that the IUT responds with an error when
     ...    a request with incorrect parameters is sent by a MEC Application
@@ -43,7 +44,7 @@ TC_MEC_SRV_UEDISTSUB_001_BR
     Check HTTP Response Status Code Is    400
 
 
-TC_MEC_SRV_UEDISTSUB_002_OK
+TC_MEC_MEC013_SRV_UEDISTSUB_002_OK
     [Documentation]
     ...    Check that the IUT acknowledges the cancellation of UE distance notifications
     ...    when commanded by a MEC Application
@@ -55,7 +56,7 @@ TC_MEC_SRV_UEDISTSUB_002_OK
     Check HTTP Response Status Code Is    204
 
 
-TC_MEC_SRV_UEDISTSUB_002_NF
+TC_MEC_MEC013_SRV_UEDISTSUB_002_NF
     [Documentation]
     ...    Check that the IUT responds with an error when
     ...    a request for an unknown URI is sent by a MEC Application
diff --git a/SRV/UEDISTSUB/README.md b/MEC013/SRV/UEDISTSUB/README.md
similarity index 100%
rename from SRV/UEDISTSUB/README.md
rename to MEC013/SRV/UEDISTSUB/README.md
diff --git a/SRV/UEDISTSUB/environment/variables.txt b/MEC013/SRV/UEDISTSUB/environment/variables.txt
similarity index 100%
rename from SRV/UEDISTSUB/environment/variables.txt
rename to MEC013/SRV/UEDISTSUB/environment/variables.txt
diff --git a/SRV/UEDISTSUB/jsons/DistanceNotificationSubscription.json b/MEC013/SRV/UEDISTSUB/jsons/DistanceNotificationSubscription.json
similarity index 100%
rename from SRV/UEDISTSUB/jsons/DistanceNotificationSubscription.json
rename to MEC013/SRV/UEDISTSUB/jsons/DistanceNotificationSubscription.json
diff --git a/SRV/UEDISTSUB/jsons/DistanceNotificationSubscriptionError.json b/MEC013/SRV/UEDISTSUB/jsons/DistanceNotificationSubscriptionError.json
similarity index 100%
rename from SRV/UEDISTSUB/jsons/DistanceNotificationSubscriptionError.json
rename to MEC013/SRV/UEDISTSUB/jsons/DistanceNotificationSubscriptionError.json
diff --git a/SRV/UEDISTSUB/schemas/DistanceNotificationSubscription.schema.json b/MEC013/SRV/UEDISTSUB/schemas/DistanceNotificationSubscription.schema.json
similarity index 100%
rename from SRV/UEDISTSUB/schemas/DistanceNotificationSubscription.schema.json
rename to MEC013/SRV/UEDISTSUB/schemas/DistanceNotificationSubscription.schema.json
diff --git a/SRV/UEDISTSUB/schemas/DistanceNotificationSubscription.schema.v1.1.1.json b/MEC013/SRV/UEDISTSUB/schemas/DistanceNotificationSubscription.schema.v1.1.1.json
similarity index 100%
rename from SRV/UEDISTSUB/schemas/DistanceNotificationSubscription.schema.v1.1.1.json
rename to MEC013/SRV/UEDISTSUB/schemas/DistanceNotificationSubscription.schema.v1.1.1.json
diff --git a/SRV/UEDISTSUB/schemas/NotificationSubscriptionList.schema.json b/MEC013/SRV/UEDISTSUB/schemas/NotificationSubscriptionList.schema.json
similarity index 100%
rename from SRV/UEDISTSUB/schemas/NotificationSubscriptionList.schema.json
rename to MEC013/SRV/UEDISTSUB/schemas/NotificationSubscriptionList.schema.json
diff --git a/SRV/UEINFOLOOK/PlatUeInformationLookup.robot b/MEC013/SRV/UEINFOLOOK/PlatUeInformationLookup.robot
similarity index 92%
rename from SRV/UEINFOLOOK/PlatUeInformationLookup.robot
rename to MEC013/SRV/UEINFOLOOK/PlatUeInformationLookup.robot
index be0e30ea860c6ba6f24965660da97316d835cdb9..2f12c916f3ccb8a6477f82da4ec13188df9d5fcb 100644
--- a/SRV/UEINFOLOOK/PlatUeInformationLookup.robot
+++ b/MEC013/SRV/UEINFOLOOK/PlatUeInformationLookup.robot
@@ -3,7 +3,8 @@
 Documentation
 ...    A test suite for validating UE Information Lookup (UEINFOLOOK) operations.
 
-Resource    ../../GenericKeywords.robot
+Resource    ../../../GenericKeywords.robot
+Resource    ../../../pics.txt
 Resource    environment/variables.txt
 Library     REST    ${SCHEMA}://${HOST}:${PORT}    ssl_verify=false
 Library     OperatingSystem 
@@ -13,7 +14,7 @@ Default Tags    TC_MEC_SRV_UEINFOLOOK
 
 *** Test Cases ***
 
-TC_MEC_SRV_UEINFOLOOK_001_OK
+TC_MEC_MEC013_SRV_UEINFOLOOK_001_OK
     [Documentation]
     ...    Check that the IUT responds with the information pertaining to one or more UEs in a particular location
     ...    when queried by a MEC Application
@@ -27,7 +28,7 @@ TC_MEC_SRV_UEINFOLOOK_001_OK
     Check HTTP Response Body Json Schema Is    UserList
 
 
-TC_MEC_SRV_UEINFOLOOK_001_BR
+TC_MEC_MEC013_SRV_UEINFOLOOK_001_BR
     [Documentation]
     ...    Check that the IUT responds with an error when
     ...    a request with incorrect parameters is sent by a MEC Application
@@ -39,7 +40,7 @@ TC_MEC_SRV_UEINFOLOOK_001_BR
     Check HTTP Response Status Code Is    400
 
 
-TC_MEC_SRV_UEINFOLOOK_001_NF
+TC_MEC_MEC013_SRV_UEINFOLOOK_001_NF
     [Documentation]
     ...    Check that the IUT responds with an error when
     ...    a request for an unknown URI is sent by a MEC Application
diff --git a/SRV/UEINFOLOOK/README.md b/MEC013/SRV/UEINFOLOOK/README.md
similarity index 100%
rename from SRV/UEINFOLOOK/README.md
rename to MEC013/SRV/UEINFOLOOK/README.md
diff --git a/SRV/UEINFOLOOK/environment/variables.txt b/MEC013/SRV/UEINFOLOOK/environment/variables.txt
similarity index 100%
rename from SRV/UEINFOLOOK/environment/variables.txt
rename to MEC013/SRV/UEINFOLOOK/environment/variables.txt
diff --git a/SRV/UEINFOLOOK/jsons/UserList.json b/MEC013/SRV/UEINFOLOOK/jsons/UserList.json
similarity index 100%
rename from SRV/UEINFOLOOK/jsons/UserList.json
rename to MEC013/SRV/UEINFOLOOK/jsons/UserList.json
diff --git a/SRV/UEINFOLOOK/schemas/UserList.schema.json b/MEC013/SRV/UEINFOLOOK/schemas/UserList.schema.json
similarity index 100%
rename from SRV/UEINFOLOOK/schemas/UserList.schema.json
rename to MEC013/SRV/UEINFOLOOK/schemas/UserList.schema.json
diff --git a/SRV/UEINFOSUB/PlatUeInformationSubscription.robot b/MEC013/SRV/UEINFOSUB/PlatUeInformationSubscription.robot
similarity index 95%
rename from SRV/UEINFOSUB/PlatUeInformationSubscription.robot
rename to MEC013/SRV/UEINFOSUB/PlatUeInformationSubscription.robot
index dff29f71416c6e01874ed7fe4cf947fe66df32fc..2431cb420f2bafa0853c49c2172f3f5ec77d2f6d 100644
--- a/SRV/UEINFOSUB/PlatUeInformationSubscription.robot
+++ b/MEC013/SRV/UEINFOSUB/PlatUeInformationSubscription.robot
@@ -3,7 +3,8 @@
 Documentation
 ...    A test suite for validating UE Information Subscription (UEINFOSUB) operations.
 
-Resource    ../../GenericKeywords.robot
+Resource    ../../../GenericKeywords.robot
+Resource    ../../../pics.txt
 Resource    environment/variables.txt
 Library     REST    ${SCHEMA}://${HOST}:${PORT}    ssl_verify=false
 Library     OperatingSystem  
@@ -13,7 +14,7 @@ Default Tags    TC_MEC_SRV_UEINFOSUB
 
 *** Test Cases ***
 
-TC_MEC_SRV_UEINFOSUB_001_OK
+TC_MEC_MEC013_SRV_UEINFOSUB_001_OK
     [Documentation]
     ...    Check that the IUT acknowledges the UE information change subscription request
     ...    when commanded by a MEC Application and notifies it when the location changes
@@ -30,7 +31,7 @@ TC_MEC_SRV_UEINFOSUB_001_OK
     Should Be Equal As Strings    ${response['body']['zonalTrafficSubscription']['callbackReference']}        ${ZONAL_TRAF_NOTIF_CALLBACK_URI}
 
 
-TC_MEC_SRV_UEINFOSUB_001_BR
+TC_MEC_MEC013_SRV_UEINFOSUB_001_BR
     [Documentation]
     ...    Check that the IUT responds with an error when
     ...    a request with incorrect parameters is sent by a MEC Application
@@ -43,7 +44,7 @@ TC_MEC_SRV_UEINFOSUB_001_BR
     Check HTTP Response Status Code Is    400
 
 
-TC_MEC_SRV_UEINFOSUB_002_OK
+TC_MEC_MEC013_SRV_UEINFOSUB_002_OK
     [Documentation]
     ...    Check that the IUT acknowledges the cancellation of UE information change notifications
     ...    when commanded by a MEC Application
diff --git a/SRV/UEINFOSUB/README.md b/MEC013/SRV/UEINFOSUB/README.md
similarity index 100%
rename from SRV/UEINFOSUB/README.md
rename to MEC013/SRV/UEINFOSUB/README.md
diff --git a/SRV/UEINFOSUB/environment/variables.txt b/MEC013/SRV/UEINFOSUB/environment/variables.txt
similarity index 100%
rename from SRV/UEINFOSUB/environment/variables.txt
rename to MEC013/SRV/UEINFOSUB/environment/variables.txt
diff --git a/SRV/UEINFOSUB/jsons/ZonalTrafficSubscription.json b/MEC013/SRV/UEINFOSUB/jsons/ZonalTrafficSubscription.json
similarity index 100%
rename from SRV/UEINFOSUB/jsons/ZonalTrafficSubscription.json
rename to MEC013/SRV/UEINFOSUB/jsons/ZonalTrafficSubscription.json
diff --git a/SRV/UEINFOSUB/jsons/ZonalTrafficSubscriptionError.json b/MEC013/SRV/UEINFOSUB/jsons/ZonalTrafficSubscriptionError.json
similarity index 100%
rename from SRV/UEINFOSUB/jsons/ZonalTrafficSubscriptionError.json
rename to MEC013/SRV/UEINFOSUB/jsons/ZonalTrafficSubscriptionError.json
diff --git a/SRV/UEINFOSUB/schemas/NotificationSubscriptionList.schema.json b/MEC013/SRV/UEINFOSUB/schemas/NotificationSubscriptionList.schema.json
similarity index 100%
rename from SRV/UEINFOSUB/schemas/NotificationSubscriptionList.schema.json
rename to MEC013/SRV/UEINFOSUB/schemas/NotificationSubscriptionList.schema.json
diff --git a/SRV/UEINFOSUB/schemas/ZonalTrafficSubscription.schema.json b/MEC013/SRV/UEINFOSUB/schemas/ZonalTrafficSubscription.schema.json
similarity index 100%
rename from SRV/UEINFOSUB/schemas/ZonalTrafficSubscription.schema.json
rename to MEC013/SRV/UEINFOSUB/schemas/ZonalTrafficSubscription.schema.json
diff --git a/SRV/UEINFOSUB/schemas/ZonalTrafficSubscription.schema.v1.1.1.json b/MEC013/SRV/UEINFOSUB/schemas/ZonalTrafficSubscription.schema.v1.1.1.json
similarity index 100%
rename from SRV/UEINFOSUB/schemas/ZonalTrafficSubscription.schema.v1.1.1.json
rename to MEC013/SRV/UEINFOSUB/schemas/ZonalTrafficSubscription.schema.v1.1.1.json
diff --git a/SRV/UELOCLOOK/PlatUeLocationLookup.robot b/MEC013/SRV/UELOCLOOK/PlatUeLocationLookup.robot
similarity index 93%
rename from SRV/UELOCLOOK/PlatUeLocationLookup.robot
rename to MEC013/SRV/UELOCLOOK/PlatUeLocationLookup.robot
index d9bcf035ab7ea16d23303510890a6ddd825e12eb..fbe984114a976e7d46efb49a223e6fe7ff6a85d4 100644
--- a/SRV/UELOCLOOK/PlatUeLocationLookup.robot
+++ b/MEC013/SRV/UELOCLOOK/PlatUeLocationLookup.robot
@@ -3,7 +3,8 @@
 Documentation
 ...    A test suite for validating UE Location Lookup (UELOCLOOK) operations.
 
-Resource    ../../GenericKeywords.robot
+Resource    ../../../GenericKeywords.robot
+Resource    ../../../pics.txt
 Resource    environment/variables.txt
 Library     REST    ${SCHEMA}://${HOST}:${PORT}    ssl_verify=false
 Library     OperatingSystem 
@@ -15,7 +16,7 @@ ${response}
 
 *** Test Cases ***
 
-TC_MEC_SRV_UELOCLOOK_001_OK
+TC_MEC_MEC013_SRV_UELOCLOOK_001_OK
     [Documentation]
     ...    Check that the IUT responds with a list for the location of User Equipments
     ...    when queried by a MEC Application
@@ -29,7 +30,7 @@ TC_MEC_SRV_UELOCLOOK_001_OK
     Check HTTP Response Body Json Schema Is    UserList
     Check Result Contains    ${response['body']['userList']['user']}    zoneId    ${ZONE_ID}
 
-TC_MEC_SRV_UELOCLOOK_001_BR
+TC_MEC_MEC013_SRV_UELOCLOOK_001_BR
     [Documentation]
     ...    Check that the IUT responds with an error when
     ...    a request with incorrect parameters is sent by a MEC Application
@@ -40,7 +41,7 @@ TC_MEC_SRV_UELOCLOOK_001_BR
     Get list of user equipments    z0n3    ${ZONE_ID}
     Check HTTP Response Status Code Is    400
 
-TC_MEC_SRV_UELOCLOOK_001_NF
+TC_MEC_MEC013_SRV_UELOCLOOK_001_NF
     [Documentation]
     ...    Check that the IUT responds with an error when
     ...    a request for an unknown URI is sent by a MEC Application
@@ -51,7 +52,7 @@ TC_MEC_SRV_UELOCLOOK_001_NF
     Get list of user equipments    zoneId    ${NON_EXISTENT_ZONE_ID}
     Check HTTP Response Status Code Is    200
 
-TC_MEC_SRV_UELOCLOOK_002_OK
+TC_MEC_MEC013_SRV_UELOCLOOK_002_OK
     [Documentation]
     ...    Check that the IUT responds with a User Equipment information 
     ...    when queried by a MEC Application
@@ -66,7 +67,7 @@ TC_MEC_SRV_UELOCLOOK_002_OK
     # Check HTTP Response Body Json Schema Is    UserInfo
     
 
-TC_MEC_SRV_UELOCLOOK_002_NF
+TC_MEC_MEC013_SRV_UELOCLOOK_002_NF
     [Documentation]
     ...    Check that the IUT responds with an error when
     ...    a request for an unknown URI is sent by a MEC Application
diff --git a/SRV/UELOCLOOK/README.md b/MEC013/SRV/UELOCLOOK/README.md
similarity index 100%
rename from SRV/UELOCLOOK/README.md
rename to MEC013/SRV/UELOCLOOK/README.md
diff --git a/SRV/UELOCLOOK/environment/variables.txt b/MEC013/SRV/UELOCLOOK/environment/variables.txt
similarity index 100%
rename from SRV/UELOCLOOK/environment/variables.txt
rename to MEC013/SRV/UELOCLOOK/environment/variables.txt
diff --git a/SRV/UELOCLOOK/schemas/UserInfo.schema.json b/MEC013/SRV/UELOCLOOK/schemas/UserInfo.schema.json
similarity index 100%
rename from SRV/UELOCLOOK/schemas/UserInfo.schema.json
rename to MEC013/SRV/UELOCLOOK/schemas/UserInfo.schema.json
diff --git a/SRV/UELOCLOOK/schemas/UserList.schema.json b/MEC013/SRV/UELOCLOOK/schemas/UserList.schema.json
similarity index 100%
rename from SRV/UELOCLOOK/schemas/UserList.schema.json
rename to MEC013/SRV/UELOCLOOK/schemas/UserList.schema.json
diff --git a/SRV/UELOCSUB/PlatUeLocationSubscription.robot b/MEC013/SRV/UELOCSUB/PlatUeLocationSubscription.robot
similarity index 94%
rename from SRV/UELOCSUB/PlatUeLocationSubscription.robot
rename to MEC013/SRV/UELOCSUB/PlatUeLocationSubscription.robot
index cc657548c241c0d8d00d558ca152a41b66316534..ec1cbaeec855b0c7064577048ae2e365f0eb2472 100644
--- a/SRV/UELOCSUB/PlatUeLocationSubscription.robot
+++ b/MEC013/SRV/UELOCSUB/PlatUeLocationSubscription.robot
@@ -3,8 +3,8 @@
 Documentation
 ...    A test suite for validating UE Location Subscription (UELOCSUB) operations.
 
-
-Resource    ../../GenericKeywords.robot
+Resource    ../../../GenericKeywords.robot
+Resource    ../../../pics.txt
 Resource    environment/variables.txt
 Library     REST    ${SCHEMA}://${HOST}:${PORT}    ssl_verify=false
 Library     OperatingSystem 
@@ -17,7 +17,7 @@ ${response}
 
 *** Test Cases ***
 
-TC_MEC_SRV_UELOCSUB_001_OK
+TC_MEC_MEC013_SRV_UELOCSUB_001_OK
     [Documentation]
     ...    Check that the IUT acknowledges the UE location change subscription request
     ...    when commanded by a MEC Application and notifies it when the location changes
@@ -47,7 +47,7 @@ TC_MEC_SRV_UELOCSUB_001_OK
     # ;
     # to the MEC_APP entity
 
-TC_MEC_SRV_UELOCSUB_001_BR
+TC_MEC_MEC013_SRV_UELOCSUB_001_BR
     [Documentation]
     ...    Check that the IUT responds with an error when
     ...    a request with incorrect parameters is sent by a MEC Application
@@ -59,7 +59,7 @@ TC_MEC_SRV_UELOCSUB_001_BR
     Check HTTP Response Status Code Is    400
 
 
-TC_MEC_SRV_UELOCSUB_002_OK
+TC_MEC_MEC013_SRV_UELOCSUB_002_OK
     [Documentation]
     ...    Check that the IUT acknowledges the cancellation of UE location change notifications
     ...    when commanded by a MEC Application
@@ -71,7 +71,7 @@ TC_MEC_SRV_UELOCSUB_002_OK
     Check HTTP Response Status Code Is    204
 
 
-TC_MEC_SRV_UELOCSUB_002_NF
+TC_MEC_MEC013_SRV_UELOCSUB_002_NF
     [Documentation]
     ...    Check that the IUT responds with an error when
     ...    a request for an unknown URI is sent by a MEC Application
diff --git a/SRV/UELOCSUB/README.md b/MEC013/SRV/UELOCSUB/README.md
similarity index 100%
rename from SRV/UELOCSUB/README.md
rename to MEC013/SRV/UELOCSUB/README.md
diff --git a/SRV/UELOCSUB/environment/variables.txt b/MEC013/SRV/UELOCSUB/environment/variables.txt
similarity index 100%
rename from SRV/UELOCSUB/environment/variables.txt
rename to MEC013/SRV/UELOCSUB/environment/variables.txt
diff --git a/SRV/UELOCSUB/jsons/UserTrackingSubscription.json b/MEC013/SRV/UELOCSUB/jsons/UserTrackingSubscription.json
similarity index 100%
rename from SRV/UELOCSUB/jsons/UserTrackingSubscription.json
rename to MEC013/SRV/UELOCSUB/jsons/UserTrackingSubscription.json
diff --git a/SRV/UELOCSUB/jsons/UserTrackingSubscriptionError.json b/MEC013/SRV/UELOCSUB/jsons/UserTrackingSubscriptionError.json
similarity index 100%
rename from SRV/UELOCSUB/jsons/UserTrackingSubscriptionError.json
rename to MEC013/SRV/UELOCSUB/jsons/UserTrackingSubscriptionError.json
diff --git a/SRV/UELOCSUB/schemas/NotificationSubscriptionList.schema.json b/MEC013/SRV/UELOCSUB/schemas/NotificationSubscriptionList.schema.json
similarity index 100%
rename from SRV/UELOCSUB/schemas/NotificationSubscriptionList.schema.json
rename to MEC013/SRV/UELOCSUB/schemas/NotificationSubscriptionList.schema.json
diff --git a/SRV/UELOCSUB/schemas/UserTrackingSubscription.schema.json b/MEC013/SRV/UELOCSUB/schemas/UserTrackingSubscription.schema.json
similarity index 100%
rename from SRV/UELOCSUB/schemas/UserTrackingSubscription.schema.json
rename to MEC013/SRV/UELOCSUB/schemas/UserTrackingSubscription.schema.json
diff --git a/SRV/UELOCSUB/schemas/UserTrackingSubscription.schema.v1.1.1.json b/MEC013/SRV/UELOCSUB/schemas/UserTrackingSubscription.schema.v1.1.1.json
similarity index 100%
rename from SRV/UELOCSUB/schemas/UserTrackingSubscription.schema.v1.1.1.json
rename to MEC013/SRV/UELOCSUB/schemas/UserTrackingSubscription.schema.v1.1.1.json
diff --git a/SRV/UETRACKSUB/PlatUeTrackingSubscription.robot b/MEC013/SRV/UETRACKSUB/PlatUeTrackingSubscription.robot
similarity index 94%
rename from SRV/UETRACKSUB/PlatUeTrackingSubscription.robot
rename to MEC013/SRV/UETRACKSUB/PlatUeTrackingSubscription.robot
index 76ff34aff4e9bb0161dd6dbaf1445c18fad6cd50..4d571c1ff84cbddb84e0a594c416d133da13db2c 100644
--- a/SRV/UETRACKSUB/PlatUeTrackingSubscription.robot
+++ b/MEC013/SRV/UETRACKSUB/PlatUeTrackingSubscription.robot
@@ -3,7 +3,8 @@
 Documentation
 ...    A test suite for validating UE Tracking Subscribe (UETRACKSUB) operations.
 
-Resource    ../../GenericKeywords.robot
+Resource    ../../../GenericKeywords.robot
+Resource    ../../../pics.txt
 Resource    environment/variables.txt
 Library     REST    ${SCHEMA}://${HOST}:${PORT}    ssl_verify=false
 Library     OperatingSystem  
@@ -13,7 +14,7 @@ Default Tags    TC_MEC_SRV_UETRACKSUB
 
 *** Test Cases ***
 
-TC_MEC_SRV_UETRACKSUB_001_OK
+TC_MEC_MEC013_SRV_UETRACKSUB_001_OK
     [Documentation]
     ...    Check that the IUT acknowledges the UE location change subscription request
     ...    when commanded by a MEC Application and notifies it when the UE changes location
@@ -43,7 +44,7 @@ TC_MEC_SRV_UETRACKSUB_001_OK
     # ;
 
 
-TC_MEC_SRV_UETRACKSUB_001_BR
+TC_MEC_MEC013_SRV_UETRACKSUB_001_BR
     [Documentation]
     ...    Check that the IUT responds with an error when
     ...    a request with incorrect parameters is sent by a MEC Application
@@ -56,7 +57,7 @@ TC_MEC_SRV_UETRACKSUB_001_BR
     Check HTTP Response Status Code Is    400
 
 
-TC_MEC_SRV_UETRACKSUB_002_OK
+TC_MEC_MEC013_SRV_UETRACKSUB_002_OK
     [Documentation]
     ...    Check that the IUT acknowledges the cancellation of UE tracking notifications
     ...    when commanded by a MEC Application
@@ -68,7 +69,7 @@ TC_MEC_SRV_UETRACKSUB_002_OK
     Check HTTP Response Status Code Is    204
 
 
-TC_MEC_SRV_UETRACKSUB_002_NF
+TC_MEC_MEC013_SRV_UETRACKSUB_002_NF
     [Documentation]
     ...    Check that the IUT responds with an error when
     ...    a request for an unknown URI is sent by a MEC Application
diff --git a/SRV/UETAG/README.md b/MEC013/SRV/UETRACKSUB/README.md
similarity index 100%
rename from SRV/UETAG/README.md
rename to MEC013/SRV/UETRACKSUB/README.md
diff --git a/SRV/UETRACKSUB/environment/variables.txt b/MEC013/SRV/UETRACKSUB/environment/variables.txt
similarity index 100%
rename from SRV/UETRACKSUB/environment/variables.txt
rename to MEC013/SRV/UETRACKSUB/environment/variables.txt
diff --git a/SRV/UETRACKSUB/jsons/PeriodicNotificationSubscription.json b/MEC013/SRV/UETRACKSUB/jsons/PeriodicNotificationSubscription.json
similarity index 100%
rename from SRV/UETRACKSUB/jsons/PeriodicNotificationSubscription.json
rename to MEC013/SRV/UETRACKSUB/jsons/PeriodicNotificationSubscription.json
diff --git a/SRV/UETRACKSUB/jsons/PeriodicNotificationSubscriptionError.json b/MEC013/SRV/UETRACKSUB/jsons/PeriodicNotificationSubscriptionError.json
similarity index 100%
rename from SRV/UETRACKSUB/jsons/PeriodicNotificationSubscriptionError.json
rename to MEC013/SRV/UETRACKSUB/jsons/PeriodicNotificationSubscriptionError.json
diff --git a/SRV/UETRACKSUB/schemas/NotificationSubscriptionList.schema.json b/MEC013/SRV/UETRACKSUB/schemas/NotificationSubscriptionList.schema.json
similarity index 100%
rename from SRV/UETRACKSUB/schemas/NotificationSubscriptionList.schema.json
rename to MEC013/SRV/UETRACKSUB/schemas/NotificationSubscriptionList.schema.json
diff --git a/SRV/UETRACKSUB/schemas/PeriodicNotificationSubscription.schema.json b/MEC013/SRV/UETRACKSUB/schemas/PeriodicNotificationSubscription.schema.json
similarity index 100%
rename from SRV/UETRACKSUB/schemas/PeriodicNotificationSubscription.schema.json
rename to MEC013/SRV/UETRACKSUB/schemas/PeriodicNotificationSubscription.schema.json
diff --git a/SRV/UETRACKSUB/schemas/PeriodicNotificationSubscription.schema.v1.1.1.json b/MEC013/SRV/UETRACKSUB/schemas/PeriodicNotificationSubscription.schema.v1.1.1.json
similarity index 100%
rename from SRV/UETRACKSUB/schemas/PeriodicNotificationSubscription.schema.v1.1.1.json
rename to MEC013/SRV/UETRACKSUB/schemas/PeriodicNotificationSubscription.schema.v1.1.1.json
diff --git a/SRV/ZOINFOLOOK/PlatZoneInfoLocation.robot b/MEC013/SRV/ZOINFOLOOK/PlatZoneInfoLocation.robot
similarity index 90%
rename from SRV/ZOINFOLOOK/PlatZoneInfoLocation.robot
rename to MEC013/SRV/ZOINFOLOOK/PlatZoneInfoLocation.robot
index 13f2080bc4bdff07bfe1fca82d951ed0a33327ea..df20a257c976aa73845b73d845ffb4fa351f978d 100644
--- a/SRV/ZOINFOLOOK/PlatZoneInfoLocation.robot
+++ b/MEC013/SRV/ZOINFOLOOK/PlatZoneInfoLocation.robot
@@ -3,7 +3,8 @@
 Documentation
 ...    A test suite for validating Radio Node Location Lookup (RLOCLOOK) operations.
 
-Resource    ../../GenericKeywords.robot
+Resource    ../../../GenericKeywords.robot
+Resource    ../../../pics.txt
 Resource    environment/variables.txt
 Library     REST    ${SCHEMA}://${HOST}:${PORT}    ssl_verify=false
 Library     OperatingSystem 
@@ -13,7 +14,7 @@ Default Tags    TC_MEC_SRV_RLOCLOOK
 
 *** Test Cases ***
 
-TC_MEC_SRV_ZOINFOLOOK_001_OK
+TC_MEC_MEC013_SRV_ZOINFOLOOK_001_OK
     [Documentation]
     ...    TO BE COMPLETED
 
@@ -23,7 +24,7 @@ TC_MEC_SRV_ZOINFOLOOK_001_OK
     Check HTTP Response Body Json Schema Is    ZoneList
 
 
-TC_MEC_SRV_ZOINFOLOOK_002_OK
+TC_MEC_MEC013_SRV_ZOINFOLOOK_002_OK
     [Documentation]
     ...    TO BE CMPLETED
 
@@ -33,7 +34,7 @@ TC_MEC_SRV_ZOINFOLOOK_002_OK
     Check HTTP Response Body Json Schema Is    ZoneInfo
     Should Be Equal As Strings    ${response['body']['zoneInfo']['zoneId']}    ${ZONE_ID}
     
-TC_MEC_SRV_ZOINFOLOOK_002_NF
+TC_MEC_MEC013_SRV_ZOINFOLOOK_002_NF
     [Documentation]
     ...    TO BE CMPLETED
 
diff --git a/SRV/UETRACKSUB/README.md b/MEC013/SRV/ZOINFOLOOK/README.md
similarity index 100%
rename from SRV/UETRACKSUB/README.md
rename to MEC013/SRV/ZOINFOLOOK/README.md
diff --git a/SRV/ZOINFOLOOK/environment/variables.txt b/MEC013/SRV/ZOINFOLOOK/environment/variables.txt
similarity index 100%
rename from SRV/ZOINFOLOOK/environment/variables.txt
rename to MEC013/SRV/ZOINFOLOOK/environment/variables.txt
diff --git a/SRV/ZOINFOLOOK/schemas/ZoneInfo.schema.json b/MEC013/SRV/ZOINFOLOOK/schemas/ZoneInfo.schema.json
similarity index 100%
rename from SRV/ZOINFOLOOK/schemas/ZoneInfo.schema.json
rename to MEC013/SRV/ZOINFOLOOK/schemas/ZoneInfo.schema.json
diff --git a/SRV/ZOINFOLOOK/schemas/ZoneList.schema.json b/MEC013/SRV/ZOINFOLOOK/schemas/ZoneList.schema.json
similarity index 100%
rename from SRV/ZOINFOLOOK/schemas/ZoneList.schema.json
rename to MEC013/SRV/ZOINFOLOOK/schemas/ZoneList.schema.json
diff --git a/SRV/UETAG/PlatUeIdentity.robot b/MEC014/SRV/UETAG/PlatUeIdentity.robot
similarity index 91%
rename from SRV/UETAG/PlatUeIdentity.robot
rename to MEC014/SRV/UETAG/PlatUeIdentity.robot
index 2a440b451f0b371ba39947f1326ae2a419ae1f15..c9cdc4c4592559be667d13df886b51745a972d25 100644
--- a/SRV/UETAG/PlatUeIdentity.robot
+++ b/MEC014/SRV/UETAG/PlatUeIdentity.robot
@@ -3,16 +3,16 @@
 
 *** Settings ***
 Resource    environment/variables.txt
-Resource    ../../pics.txt
-Resource    ../../GenericKeywords.robot
+Resource    ../../../pics.txt
+Resource    ../../../GenericKeywords.robot
 Resource    resources/UEidentityAPI.robot
 Library     REST    ${MEC-APP_SCHEMA}://${MEC-APP_HOST}:${MEC-APP_PORT}    ssl_verify=false
 
 
 
 *** Test Cases ***
-Request UE Identity Tag information
-    [Documentation]   TC_MEC_SRV_UETAG_001_OK
+TC_MEC_MEC014_SRV_UETAG_001_OK
+    [Documentation]   Request UE Identity Tag information
     ...  Check that the IUT responds with the information on a UE Identity tag when queried by a MEC Application
     ...  Reference ETSI GS MEC 014 V1.1.1, clause 7.3.3.1
     ...  Reference https://forge.etsi.org/gitlab/mec/gs014-ue-identity-api/blob/master/UEidentityAPI.yaml#/definitions/UeIdentityTagInfo
@@ -22,8 +22,8 @@ Request UE Identity Tag information
     Check Result Contains    ${response['body']['ueIdentityTagInfo']['ueIdentityTags']}    ueIdentityTag    ${UE_IDENTITY_TAG}
 
 
-Request UE Identity Tag information using bad parameters
-    [Documentation]   TC_MEC_SRV_UETAG_001_BR
+TC_MEC_MEC014_SRV_UETAG_001_BR
+    [Documentation]   Request UE Identity Tag information using bad parameters
     ...  Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application
     ...  Reference ETSI GS MEC 014 V1.1.1, clause 7.3.3.1
     ...  Reference https://forge.etsi.org/gitlab/mec/gs014-ue-identity-api/blob/master/UEidentityAPI.yaml#/definitions/UeIdentityTagInfo
@@ -33,8 +33,8 @@ Request UE Identity Tag information using bad parameters
 
 
 
-Request UE Identity Tag information using non-existent application instance
-    [Documentation]   TC_MEC_SRV_UETAG_001_NF
+TC_MEC_MEC014_SRV_UETAG_001_NF
+    [Documentation]   Request UE Identity Tag information using non-existent application instance
     ...  Check that the IUT responds with an error when a request for an URI that cannot be mapped to a valid resource URI is sent by a MEC Application
     ...  Reference ETSI GS MEC 014 V1.1.1, clause 7.3.3.1
     ...  Reference https://forge.etsi.org/gitlab/mec/gs014-ue-identity-api/blob/master/UEidentityAPI.yaml#/definitions/UeIdentityTagInfo
@@ -43,8 +43,8 @@ Request UE Identity Tag information using non-existent application instance
     Check ProblemDetails    404
 
 
-Register an UE Identity Tag
-    [Documentation]   TP_MEC_SRV_UETAG_002_OK
+TC_MEC_MEC014_SRV_UETAG_002_OK
+    [Documentation]   Register an UE Identity Tag
     ...  Check that the IUT registers a tag (representing a UE) or a list of tags when commanded by a MEC Application
     ...  Reference ETSI GS MEC 014 V1.1.1, clause 7.3.3.2
     ...  Reference https://forge.etsi.org/gitlab/mec/gs014-ue-identity-api/blob/master/UEidentityAPI.yaml#/definitions/UeIdentityTagInfo
@@ -55,8 +55,8 @@ Register an UE Identity Tag
     Check User Identity Tag state    ${UE_IDENTITY_TAG}    REGISTERED
 
 
-Register an UE Identity Tag using invalid state
-    [Documentation]   TP_MEC_SRV_UETAG_002_BR
+TC_MEC_MEC014_SRV_UETAG_002_BR
+    [Documentation]   Register an UE Identity Tag using invalid state
     ...  Check that the IUT responds with an error when an unauthorised request is sent by a MEC Application
     ...  Reference ETSI GS MEC 014 V1.1.1, clause 7.3.3.2
     ...  Reference https://forge.etsi.org/gitlab/mec/gs014-ue-identity-api/blob/master/UEidentityAPI.yaml#/definitions/UeIdentityTagInfo
@@ -65,8 +65,8 @@ Register an UE Identity Tag using invalid state
     Check ProblemDetails    400
 
 
-Unregister an UE Identity Tag already in unregistered state
-    [Documentation]   TP_MEC_SRV_UETAG_002_PF
+TC_MEC_MEC014_SRV_UETAG_002_PF
+    [Documentation]   Unregister an UE Identity Tag already in unregistered state
     ...  Check that the IUT responds with ProblemDetails on information an invalid URI
     ...  Reference ETSI GS MEC 014 V1.1.1, clause 7.3.3.2
     ...  Reference https://forge.etsi.org/gitlab/mec/gs014-ue-identity-api/blob/master/UEidentityAPI.yaml#/definitions/UeIdentityTagInfo
diff --git a/SRV/ZOINFOLOOK/README.md b/MEC014/SRV/UETAG/README.md
similarity index 100%
rename from SRV/ZOINFOLOOK/README.md
rename to MEC014/SRV/UETAG/README.md
diff --git a/SRV/UETAG/environment/variables.txt b/MEC014/SRV/UETAG/environment/variables.txt
similarity index 100%
rename from SRV/UETAG/environment/variables.txt
rename to MEC014/SRV/UETAG/environment/variables.txt
diff --git a/SRV/UETAG/resources/LocationAPI.robot b/MEC014/SRV/UETAG/resources/LocationAPI.robot
similarity index 100%
rename from SRV/UETAG/resources/LocationAPI.robot
rename to MEC014/SRV/UETAG/resources/LocationAPI.robot
diff --git a/SRV/UETAG/resources/UEidentityAPI.robot b/MEC014/SRV/UETAG/resources/UEidentityAPI.robot
similarity index 94%
rename from SRV/UETAG/resources/UEidentityAPI.robot
rename to MEC014/SRV/UETAG/resources/UEidentityAPI.robot
index 7fa25a1543fd9bd5e230591c1d74974798b9b297..1cb3e49838af816d6e14841a82655d2e534d5be7 100644
--- a/SRV/UETAG/resources/UEidentityAPI.robot
+++ b/MEC014/SRV/UETAG/resources/UEidentityAPI.robot
@@ -1,7 +1,7 @@
 *** Settings ***
 Resource    ../environment/variables.txt
-Resource    ../../../pics.txt
-Resource    ../../../GenericKeywords.robot
+Resource    ../../../../pics.txt
+Resource    ../../../../GenericKeywords.robot
 Library    REST    ${MEC-APP_SCHEMA}://${MEC-APP_HOST}:${MEC-APP_PORT}    ssl_verify=false
 Library    JSONSchemaLibrary    schemas/
 
diff --git a/SRV/UETAG/schemas/UeIdentityTagInfo.schema.json b/MEC014/SRV/UETAG/schemas/UeIdentityTagInfo.schema.json
similarity index 100%
rename from SRV/UETAG/schemas/UeIdentityTagInfo.schema.json
rename to MEC014/SRV/UETAG/schemas/UeIdentityTagInfo.schema.json