diff --git a/script/tests/devices/XMA0310/.config b/script/tests/devices/RPS/XMA0310/.config
similarity index 100%
rename from script/tests/devices/XMA0310/.config
rename to script/tests/devices/RPS/XMA0310/.config
diff --git a/script/tests/devices/XMA0311/.config b/script/tests/devices/RPS/XMA0311/.config
similarity index 100%
rename from script/tests/devices/XMA0311/.config
rename to script/tests/devices/RPS/XMA0311/.config
diff --git a/script/tests/devices/XMA0410/.config b/script/tests/devices/RPS/XMA0410/.config
similarity index 100%
rename from script/tests/devices/XMA0410/.config
rename to script/tests/devices/RPS/XMA0410/.config
diff --git a/script/tests/devices/XMA1115/.config b/script/tests/devices/RPS/XMA1115/.config
similarity index 100%
rename from script/tests/devices/XMA1115/.config
rename to script/tests/devices/RPS/XMA1115/.config
diff --git a/script/tests/devices/XMA1116/.config b/script/tests/devices/RPS/XMA1116/.config
similarity index 100%
rename from script/tests/devices/XMA1116/.config
rename to script/tests/devices/RPS/XMA1116/.config
diff --git a/script/tests/devices/XMA1117/.config b/script/tests/devices/RPS/XMA1117/.config
similarity index 100%
rename from script/tests/devices/XMA1117/.config
rename to script/tests/devices/RPS/XMA1117/.config
diff --git a/script/tests/devices/XMA1118/.config b/script/tests/devices/RPS/XMA1118/.config
similarity index 100%
rename from script/tests/devices/XMA1118/.config
rename to script/tests/devices/RPS/XMA1118/.config
diff --git a/script/tests/devices/XMA1119/.config b/script/tests/devices/RPS/XMA1119/.config
similarity index 100%
rename from script/tests/devices/XMA1119/.config
rename to script/tests/devices/RPS/XMA1119/.config
diff --git a/script/tests/devices/XMB0510/.config b/script/tests/devices/RPS/XMB0510/.config
similarity index 100%
rename from script/tests/devices/XMB0510/.config
rename to script/tests/devices/RPS/XMB0510/.config
diff --git a/script/tests/devices/XMC0610/.config b/script/tests/devices/RPS/XMC0610/.config
similarity index 100%
rename from script/tests/devices/XMC0610/.config
rename to script/tests/devices/RPS/XMC0610/.config
diff --git a/script/tests/devices/XMC2010/.config b/script/tests/devices/RPS/XMC2010/.config
similarity index 100%
rename from script/tests/devices/XMC2010/.config
rename to script/tests/devices/RPS/XMC2010/.config
diff --git a/script/tests/devices/XMC2011/.config b/script/tests/devices/RPS/XMC2011/.config
similarity index 100%
rename from script/tests/devices/XMC2011/.config
rename to script/tests/devices/RPS/XMC2011/.config
diff --git a/script/tests/devices/XMD0710/.config b/script/tests/devices/RPS/XMD0710/.config
similarity index 100%
rename from script/tests/devices/XMD0710/.config
rename to script/tests/devices/RPS/XMD0710/.config
diff --git a/script/tests/devices/XMD0711/.config b/script/tests/devices/RPS/XMD0711/.config
similarity index 100%
rename from script/tests/devices/XMD0711/.config
rename to script/tests/devices/RPS/XMD0711/.config
diff --git a/script/tests/devices/XMD0717/.config b/script/tests/devices/RPS/XMD0717/.config
similarity index 100%
rename from script/tests/devices/XMD0717/.config
rename to script/tests/devices/RPS/XMD0717/.config
diff --git a/script/tests/devices/XME1310/.config b/script/tests/devices/RPS/XME1310/.config
similarity index 100%
rename from script/tests/devices/XME1310/.config
rename to script/tests/devices/RPS/XME1310/.config
diff --git a/script/tests/devices/XME1311/.config b/script/tests/devices/RPS/XME1311/.config
similarity index 100%
rename from script/tests/devices/XME1311/.config
rename to script/tests/devices/RPS/XME1311/.config
diff --git a/script/tests/devices/XME1410/.config b/script/tests/devices/RPS/XME1410/.config
similarity index 100%
rename from script/tests/devices/XME1410/.config
rename to script/tests/devices/RPS/XME1410/.config
diff --git a/script/tests/devices/XME1411/.config b/script/tests/devices/RPS/XME1411/.config
similarity index 100%
rename from script/tests/devices/XME1411/.config
rename to script/tests/devices/RPS/XME1411/.config
diff --git a/script/tests/tests.properties b/script/tests/tests.properties
index e2cf477..b84e4be 100644
--- a/script/tests/tests.properties
+++ b/script/tests/tests.properties
@@ -1,5 +1,5 @@
 #TestingList for pshell: configuration properties
-#Fri Oct 20 15:34:47 CEST 2017
+#Fri Oct 20 15:36:21 CEST 2017
 customPanel=
 showEnabledTestsOnly=true
 listFilter=rps-test