diff --git a/config_allfeatures.cmake b/configs/config_allfeatures.cmake
similarity index 100%
rename from config_allfeatures.cmake
rename to configs/config_allfeatures.cmake
diff --git a/config_aveexy.cmake b/configs/config_aveexy.cmake
similarity index 100%
rename from config_aveexy.cmake
rename to configs/config_aveexy.cmake
diff --git a/config_comred.cmake b/configs/config_comred.cmake
similarity index 100%
rename from config_comred.cmake
rename to configs/config_comred.cmake
diff --git a/config_comred_new.cmake b/configs/config_comred_new.cmake
similarity index 100%
rename from config_comred_new.cmake
rename to configs/config_comred_new.cmake
diff --git a/config_feedc0de.cmake b/configs/config_feedc0de.cmake
similarity index 100%
rename from config_feedc0de.cmake
rename to configs/config_feedc0de.cmake
diff --git a/config_gernot.cmake b/configs/config_gernot.cmake
similarity index 100%
rename from config_gernot.cmake
rename to configs/config_gernot.cmake
diff --git a/config_greyhash.cmake b/configs/config_greyhash.cmake
similarity index 100%
rename from config_greyhash.cmake
rename to configs/config_greyhash.cmake
diff --git a/config_mick.cmake b/configs/config_mick.cmake
similarity index 100%
rename from config_mick.cmake
rename to configs/config_mick.cmake
diff --git a/config_nofeatures.cmake b/configs/config_nofeatures.cmake
similarity index 100%
rename from config_nofeatures.cmake
rename to configs/config_nofeatures.cmake
diff --git a/config_peter.cmake b/configs/config_peter.cmake
similarity index 100%
rename from config_peter.cmake
rename to configs/config_peter.cmake
diff --git a/config_seatbot.cmake b/configs/config_seatbot.cmake
similarity index 100%
rename from config_seatbot.cmake
rename to configs/config_seatbot.cmake
diff --git a/config_testdevice.cmake b/configs/config_testdevice.cmake
similarity index 100%
rename from config_testdevice.cmake
rename to configs/config_testdevice.cmake
diff --git a/sdkconfig_allfeatures b/configs/sdkconfig_allfeatures
similarity index 100%
rename from sdkconfig_allfeatures
rename to configs/sdkconfig_allfeatures
diff --git a/sdkconfig_aveexy b/configs/sdkconfig_aveexy
similarity index 100%
rename from sdkconfig_aveexy
rename to configs/sdkconfig_aveexy
diff --git a/sdkconfig_comred b/configs/sdkconfig_comred
similarity index 100%
rename from sdkconfig_comred
rename to configs/sdkconfig_comred
diff --git a/sdkconfig_comred_new b/configs/sdkconfig_comred_new
similarity index 100%
rename from sdkconfig_comred_new
rename to configs/sdkconfig_comred_new
diff --git a/sdkconfig_feedc0de b/configs/sdkconfig_feedc0de
similarity index 100%
rename from sdkconfig_feedc0de
rename to configs/sdkconfig_feedc0de
diff --git a/sdkconfig_gernot b/configs/sdkconfig_gernot
similarity index 100%
rename from sdkconfig_gernot
rename to configs/sdkconfig_gernot
diff --git a/sdkconfig_greyhash b/configs/sdkconfig_greyhash
similarity index 100%
rename from sdkconfig_greyhash
rename to configs/sdkconfig_greyhash
diff --git a/sdkconfig_mick b/configs/sdkconfig_mick
similarity index 100%
rename from sdkconfig_mick
rename to configs/sdkconfig_mick
diff --git a/sdkconfig_nofeatures b/configs/sdkconfig_nofeatures
similarity index 100%
rename from sdkconfig_nofeatures
rename to configs/sdkconfig_nofeatures
diff --git a/sdkconfig_peter b/configs/sdkconfig_peter
similarity index 100%
rename from sdkconfig_peter
rename to configs/sdkconfig_peter
diff --git a/sdkconfig_seatbot b/configs/sdkconfig_seatbot
similarity index 100%
rename from sdkconfig_seatbot
rename to configs/sdkconfig_seatbot
diff --git a/sdkconfig_testdevice b/configs/sdkconfig_testdevice
similarity index 100%
rename from sdkconfig_testdevice
rename to configs/sdkconfig_testdevice
diff --git a/switchconf.sh b/switchconf.sh
index 869e9b3..b014540 100755
--- a/switchconf.sh
+++ b/switchconf.sh
@@ -1,19 +1,6 @@
 #!/bin/bash
 
-VALID_CONFIGS=(
-    "comred"
-    "peter"
-    "feedc0de"
-    "mick"
-    "greyhash"
-    "nofeatures"
-    "allfeatures"
-    "seatbot"
-    "gernot"
-    "comred_new"
-    "aveexy"
-    "testdevice"
-)
+VALID_CONFIGS=($(ls configs/ | grep ".cmake" | sed 's/config_//;s/.cmake//'))
 
 print_usage() {
     echo "usage: ./switchconf.sh ${VALID_CONFIGS[@]}"
@@ -86,7 +73,7 @@ else
 fi
 
 ln -vs "build_$1" "build"
-ln -vs "sdkconfig_$1" "sdkconfig"
-ln -vs "config_$1.cmake" "config.cmake"
+ln -vs "configs/sdkconfig_$1" "sdkconfig"
+ln -vs "configs/config_$1.cmake" "config.cmake"
 
 echo all ok