diff --git a/Test Purposes/Sys/Mx2/UeAppCtx/SysUeAppsContext.tplan2 b/Test Purposes/MEO/Mx2/UeAppCtx/SysUeAppsContext.tplan2
similarity index 100%
rename from Test Purposes/Sys/Mx2/UeAppCtx/SysUeAppsContext.tplan2
rename to Test Purposes/MEO/Mx2/UeAppCtx/SysUeAppsContext.tplan2
diff --git a/Test Purposes/Sys/Mx2/UeApps/SysUeApplications.tplan2 b/Test Purposes/MEO/Mx2/UeApps/SysUeApplications.tplan2
similarity index 100%
rename from Test Purposes/Sys/Mx2/UeApps/SysUeApplications.tplan2
rename to Test Purposes/MEO/Mx2/UeApps/SysUeApplications.tplan2
diff --git a/Test Purposes/Plat/Mp1/Bandwidth/PlatBandwidthManager.tplan2 b/Test Purposes/SRV/Mp1/Bandwidth/PlatBandwidthManager.tplan2
similarity index 100%
rename from Test Purposes/Plat/Mp1/Bandwidth/PlatBandwidthManager.tplan2
rename to Test Purposes/SRV/Mp1/Bandwidth/PlatBandwidthManager.tplan2
diff --git a/Test Purposes/Plat/Mp1/DnsRules/PlatDnsRules.tplan2 b/Test Purposes/SRV/Mp1/DnsRules/PlatDnsRules.tplan2
similarity index 100%
rename from Test Purposes/Plat/Mp1/DnsRules/PlatDnsRules.tplan2
rename to Test Purposes/SRV/Mp1/DnsRules/PlatDnsRules.tplan2
diff --git a/Test Purposes/Plat/Mp1/FAIS/PlatFixedAcessInfo.tplan2 b/Test Purposes/SRV/Mp1/FAIS/PlatFixedAcessInfo.tplan2
similarity index 100%
rename from Test Purposes/Plat/Mp1/FAIS/PlatFixedAcessInfo.tplan2
rename to Test Purposes/SRV/Mp1/FAIS/PlatFixedAcessInfo.tplan2
diff --git a/Test Purposes/Plat/Mp1/Notifications/PlatAppSubscriptions.tplan2 b/Test Purposes/SRV/Mp1/Notifications/PlatAppSubscriptions.tplan2
similarity index 100%
rename from Test Purposes/Plat/Mp1/Notifications/PlatAppSubscriptions.tplan2
rename to Test Purposes/SRV/Mp1/Notifications/PlatAppSubscriptions.tplan2
diff --git a/Test Purposes/Plat/Mp1/Notifications/PlatSrvSubscriptions.tplan2 b/Test Purposes/SRV/Mp1/Notifications/PlatSrvSubscriptions.tplan2
similarity index 100%
rename from Test Purposes/Plat/Mp1/Notifications/PlatSrvSubscriptions.tplan2
rename to Test Purposes/SRV/Mp1/Notifications/PlatSrvSubscriptions.tplan2
diff --git a/Test Purposes/Plat/Mp1/RadioNode/PlatRadioNodeLocation.tplan2 b/Test Purposes/SRV/Mp1/RadioNode/PlatRadioNodeLocation.tplan2
similarity index 100%
rename from Test Purposes/Plat/Mp1/RadioNode/PlatRadioNodeLocation.tplan2
rename to Test Purposes/SRV/Mp1/RadioNode/PlatRadioNodeLocation.tplan2
diff --git a/Test Purposes/Plat/Mp1/SAQ/PlatAppServices.tplan2 b/Test Purposes/SRV/Mp1/SAQ/PlatAppServices.tplan2
similarity index 100%
rename from Test Purposes/Plat/Mp1/SAQ/PlatAppServices.tplan2
rename to Test Purposes/SRV/Mp1/SAQ/PlatAppServices.tplan2
diff --git a/Test Purposes/Plat/Mp1/SAQ/PlatServices.tplan2 b/Test Purposes/SRV/Mp1/SAQ/PlatServices.tplan2
similarity index 100%
rename from Test Purposes/Plat/Mp1/SAQ/PlatServices.tplan2
rename to Test Purposes/SRV/Mp1/SAQ/PlatServices.tplan2
diff --git a/Test Purposes/Plat/Mp1/Timing/PlatTiming.tplan2 b/Test Purposes/SRV/Mp1/Timing/PlatTiming.tplan2
similarity index 100%
rename from Test Purposes/Plat/Mp1/Timing/PlatTiming.tplan2
rename to Test Purposes/SRV/Mp1/Timing/PlatTiming.tplan2
diff --git a/Test Purposes/Plat/Mp1/TrafficRules/PlatTrafficRules.tplan2 b/Test Purposes/SRV/Mp1/TrafficRules/PlatTrafficRules.tplan2
similarity index 100%
rename from Test Purposes/Plat/Mp1/TrafficRules/PlatTrafficRules.tplan2
rename to Test Purposes/SRV/Mp1/TrafficRules/PlatTrafficRules.tplan2
diff --git a/Test Purposes/Plat/Mp1/Transport/PlatTransport.tplan2 b/Test Purposes/SRV/Mp1/Transport/PlatTransport.tplan2
similarity index 100%
rename from Test Purposes/Plat/Mp1/Transport/PlatTransport.tplan2
rename to Test Purposes/SRV/Mp1/Transport/PlatTransport.tplan2
diff --git a/Test Purposes/Plat/Mp1/UeAreaSubscription/PlatUeAreaSubscription.tplan2 b/Test Purposes/SRV/Mp1/UeAreaSubscription/PlatUeAreaSubscription.tplan2
similarity index 100%
rename from Test Purposes/Plat/Mp1/UeAreaSubscription/PlatUeAreaSubscription.tplan2
rename to Test Purposes/SRV/Mp1/UeAreaSubscription/PlatUeAreaSubscription.tplan2
diff --git a/Test Purposes/Plat/Mp1/UeDistanceLookup/PlatUeDistanceLookup.tplan2 b/Test Purposes/SRV/Mp1/UeDistanceLookup/PlatUeDistanceLookup.tplan2
similarity index 100%
rename from Test Purposes/Plat/Mp1/UeDistanceLookup/PlatUeDistanceLookup.tplan2
rename to Test Purposes/SRV/Mp1/UeDistanceLookup/PlatUeDistanceLookup.tplan2
diff --git a/Test Purposes/Plat/Mp1/UeDistanceSubscription/PlatUeDistanceSubscription.tplan2 b/Test Purposes/SRV/Mp1/UeDistanceSubscription/PlatUeDistanceSubscription.tplan2
similarity index 100%
rename from Test Purposes/Plat/Mp1/UeDistanceSubscription/PlatUeDistanceSubscription.tplan2
rename to Test Purposes/SRV/Mp1/UeDistanceSubscription/PlatUeDistanceSubscription.tplan2
diff --git a/Test Purposes/Plat/Mp1/UeIdentity/PlatUeIdentity.tplan2 b/Test Purposes/SRV/Mp1/UeIdentity/PlatUeIdentity.tplan2
similarity index 100%
rename from Test Purposes/Plat/Mp1/UeIdentity/PlatUeIdentity.tplan2
rename to Test Purposes/SRV/Mp1/UeIdentity/PlatUeIdentity.tplan2
diff --git a/Test Purposes/Plat/Mp1/UeInformationLookup/PlatUeInformationLookup.tplan2 b/Test Purposes/SRV/Mp1/UeInformationLookup/PlatUeInformationLookup.tplan2
similarity index 100%
rename from Test Purposes/Plat/Mp1/UeInformationLookup/PlatUeInformationLookup.tplan2
rename to Test Purposes/SRV/Mp1/UeInformationLookup/PlatUeInformationLookup.tplan2
diff --git a/Test Purposes/Plat/Mp1/UeInformationSubscription/PlatUeInformationSubscription.tplan2 b/Test Purposes/SRV/Mp1/UeInformationSubscription/PlatUeInformationSubscription.tplan2
similarity index 100%
rename from Test Purposes/Plat/Mp1/UeInformationSubscription/PlatUeInformationSubscription.tplan2
rename to Test Purposes/SRV/Mp1/UeInformationSubscription/PlatUeInformationSubscription.tplan2
diff --git a/Test Purposes/Plat/Mp1/UeLocationLookup/PlatUeLocationLookup.tplan2 b/Test Purposes/SRV/Mp1/UeLocationLookup/PlatUeLocationLookup.tplan2
similarity index 100%
rename from Test Purposes/Plat/Mp1/UeLocationLookup/PlatUeLocationLookup.tplan2
rename to Test Purposes/SRV/Mp1/UeLocationLookup/PlatUeLocationLookup.tplan2
diff --git a/Test Purposes/Plat/Mp1/UeLocationSubscription/PlatUeLocationSubscription.tplan2 b/Test Purposes/SRV/Mp1/UeLocationSubscription/PlatUeLocationSubscription.tplan2
similarity index 100%
rename from Test Purposes/Plat/Mp1/UeLocationSubscription/PlatUeLocationSubscription.tplan2
rename to Test Purposes/SRV/Mp1/UeLocationSubscription/PlatUeLocationSubscription.tplan2
diff --git a/Test Purposes/Plat/Mp1/UeTrackingSubscription/PlatUeTrackingSubscription.tplan2 b/Test Purposes/SRV/Mp1/UeTrackingSubscription/PlatUeTrackingSubscription.tplan2
similarity index 100%
rename from Test Purposes/Plat/Mp1/UeTrackingSubscription/PlatUeTrackingSubscription.tplan2
rename to Test Purposes/SRV/Mp1/UeTrackingSubscription/PlatUeTrackingSubscription.tplan2