diff --git a/MEC040/SRV/FederationEnablement.robot b/MEC040/SRV/MEF/FederationEnablement.robot
similarity index 100%
rename from MEC040/SRV/FederationEnablement.robot
rename to MEC040/SRV/MEF/FederationEnablement.robot
diff --git a/MEC040/SRV/environment/variables.txt b/MEC040/SRV/MEF/environment/variables.txt
similarity index 100%
rename from MEC040/SRV/environment/variables.txt
rename to MEC040/SRV/MEF/environment/variables.txt
diff --git a/MEC040/SRV/jsons/SystemInfo.json b/MEC040/SRV/MEF/jsons/SystemInfo.json
similarity index 100%
rename from MEC040/SRV/jsons/SystemInfo.json
rename to MEC040/SRV/MEF/jsons/SystemInfo.json
diff --git a/MEC040/SRV/jsons/SystemInfo2.json b/MEC040/SRV/MEF/jsons/SystemInfo2.json
similarity index 100%
rename from MEC040/SRV/jsons/SystemInfo2.json
rename to MEC040/SRV/MEF/jsons/SystemInfo2.json
diff --git a/MEC040/SRV/jsons/SystemInfo3.json b/MEC040/SRV/MEF/jsons/SystemInfo3.json
similarity index 100%
rename from MEC040/SRV/jsons/SystemInfo3.json
rename to MEC040/SRV/MEF/jsons/SystemInfo3.json
diff --git a/MEC040/SRV/jsons/SystemInfoBR.json b/MEC040/SRV/MEF/jsons/SystemInfoBR.json
similarity index 100%
rename from MEC040/SRV/jsons/SystemInfoBR.json
rename to MEC040/SRV/MEF/jsons/SystemInfoBR.json
diff --git a/MEC040/SRV/jsons/SystemInfoEmptySystemProvider.json b/MEC040/SRV/MEF/jsons/SystemInfoEmptySystemProvider.json
similarity index 100%
rename from MEC040/SRV/jsons/SystemInfoEmptySystemProvider.json
rename to MEC040/SRV/MEF/jsons/SystemInfoEmptySystemProvider.json
diff --git a/MEC040/SRV/jsons/SystemInfoUpdate.json b/MEC040/SRV/MEF/jsons/SystemInfoUpdate.json
similarity index 100%
rename from MEC040/SRV/jsons/SystemInfoUpdate.json
rename to MEC040/SRV/MEF/jsons/SystemInfoUpdate.json
diff --git a/MEC040/SRV/jsons/SystemInfoUpdate2.json b/MEC040/SRV/MEF/jsons/SystemInfoUpdate2.json
similarity index 100%
rename from MEC040/SRV/jsons/SystemInfoUpdate2.json
rename to MEC040/SRV/MEF/jsons/SystemInfoUpdate2.json
diff --git a/MEC040/SRV/jsons/SystemInfoUpdate3.json b/MEC040/SRV/MEF/jsons/SystemInfoUpdate3.json
similarity index 100%
rename from MEC040/SRV/jsons/SystemInfoUpdate3.json
rename to MEC040/SRV/MEF/jsons/SystemInfoUpdate3.json
diff --git a/MEC040/SRV/jsons/SystemInfoUpdateBR.json b/MEC040/SRV/MEF/jsons/SystemInfoUpdateBR.json
similarity index 100%
rename from MEC040/SRV/jsons/SystemInfoUpdateBR.json
rename to MEC040/SRV/MEF/jsons/SystemInfoUpdateBR.json
diff --git a/MEC040/SRV/schemas/SystemInfo.schema.json b/MEC040/SRV/MEF/schemas/SystemInfo.schema.json
similarity index 100%
rename from MEC040/SRV/schemas/SystemInfo.schema.json
rename to MEC040/SRV/MEF/schemas/SystemInfo.schema.json
diff --git a/MEC040/SRV/schemas/SystemInfoList.schema.json b/MEC040/SRV/MEF/schemas/SystemInfoList.schema.json
similarity index 100%
rename from MEC040/SRV/schemas/SystemInfoList.schema.json
rename to MEC040/SRV/MEF/schemas/SystemInfoList.schema.json