60 files changed, 60 insertions, 60 deletions

diff --git a/firmware/export/config.h b/firmware/export/config.h
index 088cab7212..438d98116f 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -278,130 +278,130 @@ Lyre prototype 1 */
 
 /* now go and pick yours */
 #if defined(ARCHOS_PLAYER)
-#include "config-player.h"
+#include "config/archosplayer.h"
 #elif defined(ARCHOS_RECORDER)
-#include "config-recorder.h"
+#include "config/archosrecorder.h"
 #elif defined(ARCHOS_FMRECORDER)
-#include "config-fmrecorder.h"
+#include "config/archosfmrecorder.h"
 #elif defined(ARCHOS_RECORDERV2)
-#include "config-recorderv2.h"
+#include "config/archosrecorderv2.h"
 #elif defined(ARCHOS_ONDIOSP)
-#include "config-ondiosp.h"
+#include "config/archosondiosp.h"
 #elif defined(ARCHOS_ONDIOFM)
-#include "config-ondiofm.h"
+#include "config/archosondiofm.h"
 #elif defined(ARCHOS_AV300)
-#include "config-av300.h"
+#include "config/archosav300.h"
 #elif defined(IRIVER_H100)
-#include "config-h100.h"
+#include "config/iriverh100.h"
 #elif defined(IRIVER_H120)
-#include "config-h120.h"
+#include "config/iriverh120.h"
 #elif defined(IRIVER_H300)
-#include "config-h300.h"
+#include "config/iriverh300.h"
 #elif defined(IAUDIO_X5)
-#include "config-iaudiox5.h"
+#include "config/iaudiox5.h"
 #elif defined(IAUDIO_M5)
-#include "config-iaudiom5.h"
+#include "config/iaudiom5.h"
 #elif defined(IAUDIO_M3)
-#include "config-iaudiom3.h"
+#include "config/iaudiom3.h"
 #elif defined(IPOD_COLOR)
-#include "config-ipodcolor.h"
+#include "config/ipodcolor.h"
 #elif defined(IPOD_NANO)
-#include "config-ipodnano.h"
+#include "config/ipodnano1g.h"
 #elif defined(IPOD_VIDEO)
-#include "config-ipodvideo.h"
+#include "config/ipodvideo.h"
 #elif defined(IPOD_1G2G)
-#include "config-ipod1g2g.h"
+#include "config/ipod1g2g.h"
 #elif defined(IPOD_3G)
-#include "config-ipod3g.h"
+#include "config/ipod3g.h"
 #elif defined(IPOD_4G)
-#include "config-ipod4g.h"
+#include "config/ipod4g.h"
 #elif defined(IPOD_NANO2G)
-#include "config-ipodnano2g.h"
+#include "config/ipodnano2g.h"
 #elif defined(IRIVER_IFP7XX)
-#include "config-ifp7xx.h"
+#include "config/iriverifp7xx.h"
 #elif defined(GIGABEAT_F)
-#include "config-gigabeat.h"
+#include "config/gigabeatfx.h"
 #elif defined(GIGABEAT_S)
-#include "config-gigabeat-s.h"
+#include "config/gigabeats.h"
 #elif defined(IPOD_MINI)
-#include "config-ipodmini.h"
+#include "config/ipodmini1g.h"
 #elif defined(IPOD_MINI2G)
-#include "config-ipodmini2g.h"
+#include "config/ipodmini2g.h"
 #elif defined(IRIVER_H10)
-#include "config-h10.h"
+#include "config/iriverh10.h"
 #elif defined(IRIVER_H10_5GB)
-#include "config-h10_5gb.h"
+#include "config/iriverh10_5gb.h"
 #elif defined(SANSA_E200)
-#include "config-e200.h"
+#include "config/sansae200.h"
 #elif defined(SANSA_C200)
-#include "config-c200.h"
+#include "config/sansac200.h"
 #elif defined(SANSA_M200)
-#include "config-m200.h"
+#include "config/sansam200.h"
 #elif defined(ELIO_TPJ1022)
-#include "config-tpj1022.h"
+#include "config/tatungtpj1022.h"
 #elif defined(MROBE_100)
-#include "config-mrobe100.h"
+#include "config/mrobe100.h"
 #elif defined(MROBE_500)
-#include "config-mrobe500.h"
+#include "config/mrobe500.h"
 #elif defined(LOGIK_DAX)
-#include "config-logikdax.h"
+#include "config/logikdax.h"
 #elif defined(IAUDIO_7)
-#include "config-iaudio7.h"
+#include "config/iaudio7.h"
 #elif defined(COWON_D2)
-#include "config-cowond2.h"
+#include "config/cowond2.h"
 #elif defined(CREATIVE_ZVM)
-#include "config-creativezvm.h"
+#include "config/zenvisionm.h"
 #elif defined(CREATIVE_ZVM60GB)
-#include "config-creativezvm60gb.h"
+#include "config/zenvisionm60gb.h"
 #elif defined(CREATIVE_ZV)
-#include "config-creativezv.h"
+#include "config/zenvisionm.h"
 #elif defined(PHILIPS_SA9200)
-#include "config-sa9200.h"
+#include "config/gogearsa9200.h"
 #elif defined(PHILIPS_HDD1630)
-#include "config-hdd1630.h"
+#include "config/gogearhdd1630.h"
 #elif defined(SANSA_C100)
-#include "config-c100.h"
+#include "config/sansac100.h"
 #elif defined(MEIZU_M6SL)
-#include "config-meizu-m6sl.h"
+#include "config/meizum6sl.h"
 #elif defined(MEIZU_M6SP)
-#include "config-meizu-m6sp.h"
+#include "config/meizum6sp.h"
 #elif defined(MEIZU_M3)
-#include "config-meizu-m3.h"
+#include "config/meizum3.h"
 #elif defined(ONDA_VX747) || defined(ONDA_VX747P) || defined(ONDA_VX777)
-#include "config-ondavx747.h"
+#include "config/ondavx747.h"
 #elif defined(ONDA_VX767)
-#include "config-ondavx767.h"
+#include "config/ondavx767.h"
 #elif defined(SANSA_CLIP)
-#include "config-clip.h"
+#include "config/sansaclip.h"
 #elif defined(SANSA_E200V2)
-#include "config-e200v2.h"
+#include "config/sansae200v2.h"
 #elif defined(SANSA_M200V4)
-#include "config-m200v4.h"
+#include "config/sansam200v4.h"
 #elif defined(SANSA_FUZE)
-#include "config-fuze.h"
+#include "config/sansafuze.h"
 #elif defined(SANSA_C200V2)
-#include "config-c200v2.h"
+#include "config/sansac200v2.h"
 #elif defined(SANSA_VIEW)
-#include "config-view.h"
+#include "config/sansaview.h"
 #elif defined(LYRE_PROTO1)
-#include "config-lyre_proto1.h"
+#include "config/lyreproto1.h"
 #elif defined(MINI2440)
-#include "config-mini2440.h"
+#include "config/mini2440.h"
 #elif defined(SAMSUNG_YH820)
-#include "config-yh820.h"
+#include "config/samsungyh820.h"
 #elif defined(SAMSUNG_YH920)
-#include "config-yh920.h"
+#include "config/samsungyh920.h"
 #elif defined(SAMSUNG_YH925)
-#include "config-yh925.h"
+#include "config/samsungyh925.h"
 #elif defined(SAMSUNG_YPS3)
-#include "config-yps3.h"
+#include "config/samsungyps3.h"
 #else
 /* no known platform */
 #endif
 
 /* keep this include after the target configs */
 #ifdef SIMULATOR
-#include "config-sim.h"
+#include "config/sim.h"
 #endif
 
 /* setup basic macros from capability masks */
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config/archosfmrecorder.h
index d9f3a95f3e..d9f3a95f3e 100644
--- a/firmware/export/config-fmrecorder.h
+++ b/firmware/export/config/archosfmrecorder.h
diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config/archosondiofm.h
index b14f113244..b14f113244 100644
--- a/firmware/export/config-ondiofm.h
+++ b/firmware/export/config/archosondiofm.h
diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config/archosondiosp.h
index 452b47b78e..452b47b78e 100644
--- a/firmware/export/config-ondiosp.h
+++ b/firmware/export/config/archosondiosp.h
diff --git a/firmware/export/config-player.h b/firmware/export/config/archosplayer.h
index c60ee6a071..c60ee6a071 100644
--- a/firmware/export/config-player.h
+++ b/firmware/export/config/archosplayer.h
diff --git a/firmware/export/config-recorder.h b/firmware/export/config/archosrecorder.h
index ef9f523c49..ef9f523c49 100644
--- a/firmware/export/config-recorder.h
+++ b/firmware/export/config/archosrecorder.h
diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config/archosrecorderv2.h
index c530fa5815..c530fa5815 100644
--- a/firmware/export/config-recorderv2.h
+++ b/firmware/export/config/archosrecorderv2.h
diff --git a/firmware/export/config-cowond2.h b/firmware/export/config/cowond2.h
index 88c7ce5b8f..88c7ce5b8f 100644
--- a/firmware/export/config-cowond2.h
+++ b/firmware/export/config/cowond2.h
diff --git a/firmware/export/config-creativezv.h b/firmware/export/config/creativezv.h
index eff5a506c0..eff5a506c0 100644
--- a/firmware/export/config-creativezv.h
+++ b/firmware/export/config/creativezv.h
diff --git a/firmware/export/config-gigabeat.h b/firmware/export/config/gigabeatfx.h
index 363312a415..363312a415 100644
--- a/firmware/export/config-gigabeat.h
+++ b/firmware/export/config/gigabeatfx.h
diff --git a/firmware/export/config-gigabeat-s.h b/firmware/export/config/gigabeats.h
index 7f55797a07..7f55797a07 100644
--- a/firmware/export/config-gigabeat-s.h
+++ b/firmware/export/config/gigabeats.h
diff --git a/firmware/export/config-hdd1630.h b/firmware/export/config/gogearhdd1630.h
index c9a3b035ca..c9a3b035ca 100644
--- a/firmware/export/config-hdd1630.h
+++ b/firmware/export/config/gogearhdd1630.h
diff --git a/firmware/export/config-sa9200.h b/firmware/export/config/gogearsa9200.h
index d9b9462880..d9b9462880 100644
--- a/firmware/export/config-sa9200.h
+++ b/firmware/export/config/gogearsa9200.h
diff --git a/firmware/export/config-iaudio7.h b/firmware/export/config/iaudio7.h
index 44a6f84b0a..44a6f84b0a 100644
--- a/firmware/export/config-iaudio7.h
+++ b/firmware/export/config/iaudio7.h
diff --git a/firmware/export/config-iaudiom3.h b/firmware/export/config/iaudiom3.h
index 99c4605be0..99c4605be0 100644
--- a/firmware/export/config-iaudiom3.h
+++ b/firmware/export/config/iaudiom3.h
diff --git a/firmware/export/config-iaudiom5.h b/firmware/export/config/iaudiom5.h
index 03add43dbf..03add43dbf 100644
--- a/firmware/export/config-iaudiom5.h
+++ b/firmware/export/config/iaudiom5.h
diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config/iaudiox5.h
index bafe51f12d..bafe51f12d 100644
--- a/firmware/export/config-iaudiox5.h
+++ b/firmware/export/config/iaudiox5.h
diff --git a/firmware/export/config-ipod1g2g.h b/firmware/export/config/ipod1g2g.h
index cde745e874..cde745e874 100644
--- a/firmware/export/config-ipod1g2g.h
+++ b/firmware/export/config/ipod1g2g.h
diff --git a/firmware/export/config-ipod3g.h b/firmware/export/config/ipod3g.h
index e82cc92f56..e82cc92f56 100644
--- a/firmware/export/config-ipod3g.h
+++ b/firmware/export/config/ipod3g.h
diff --git a/firmware/export/config-ipod4g.h b/firmware/export/config/ipod4g.h
index e6bdc35bd8..e6bdc35bd8 100644
--- a/firmware/export/config-ipod4g.h
+++ b/firmware/export/config/ipod4g.h
diff --git a/firmware/export/config-ipodcolor.h b/firmware/export/config/ipodcolor.h
index 0f1de4fdba..0f1de4fdba 100644
--- a/firmware/export/config-ipodcolor.h
+++ b/firmware/export/config/ipodcolor.h
diff --git a/firmware/export/config-ipodmini.h b/firmware/export/config/ipodmini1g.h
index 129829ffbb..129829ffbb 100644
--- a/firmware/export/config-ipodmini.h
+++ b/firmware/export/config/ipodmini1g.h
diff --git a/firmware/export/config-ipodmini2g.h b/firmware/export/config/ipodmini2g.h
index 8087269485..8087269485 100644
--- a/firmware/export/config-ipodmini2g.h
+++ b/firmware/export/config/ipodmini2g.h
diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config/ipodnano1g.h
index e1ec1afa86..e1ec1afa86 100644
--- a/firmware/export/config-ipodnano.h
+++ b/firmware/export/config/ipodnano1g.h
diff --git a/firmware/export/config-ipodnano2g.h b/firmware/export/config/ipodnano2g.h
index be7129b690..be7129b690 100644
--- a/firmware/export/config-ipodnano2g.h
+++ b/firmware/export/config/ipodnano2g.h
diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config/ipodvideo.h
index 59ac6466e5..59ac6466e5 100644
--- a/firmware/export/config-ipodvideo.h
+++ b/firmware/export/config/ipodvideo.h
diff --git a/firmware/export/config-h10.h b/firmware/export/config/iriverh10.h
index cde1b6075e..cde1b6075e 100644
--- a/firmware/export/config-h10.h
+++ b/firmware/export/config/iriverh10.h
diff --git a/firmware/export/config-h100.h b/firmware/export/config/iriverh100.h
index d01ee1f3f9..d01ee1f3f9 100644
--- a/firmware/export/config-h100.h
+++ b/firmware/export/config/iriverh100.h
diff --git a/firmware/export/config-h10_5gb.h b/firmware/export/config/iriverh10_5gb.h
index e69f6c2b20..e69f6c2b20 100644
--- a/firmware/export/config-h10_5gb.h
+++ b/firmware/export/config/iriverh10_5gb.h
diff --git a/firmware/export/config-h120.h b/firmware/export/config/iriverh120.h
index 8751c121cc..8751c121cc 100644
--- a/firmware/export/config-h120.h
+++ b/firmware/export/config/iriverh120.h
diff --git a/firmware/export/config-h300.h b/firmware/export/config/iriverh300.h
index d2348397d2..d2348397d2 100644
--- a/firmware/export/config-h300.h
+++ b/firmware/export/config/iriverh300.h
diff --git a/firmware/export/config-ifp7xx.h b/firmware/export/config/iriverifp7xx.h
index 48a53f8c9d..48a53f8c9d 100644
--- a/firmware/export/config-ifp7xx.h
+++ b/firmware/export/config/iriverifp7xx.h
diff --git a/firmware/export/config-logikdax.h b/firmware/export/config/logikdax.h
index 8fbd064306..8fbd064306 100644
--- a/firmware/export/config-logikdax.h
+++ b/firmware/export/config/logikdax.h
diff --git a/firmware/export/config-lyre_proto1.h b/firmware/export/config/lyreproto1.h
index 250b8e2c00..250b8e2c00 100644
--- a/firmware/export/config-lyre_proto1.h
+++ b/firmware/export/config/lyreproto1.h
diff --git a/firmware/export/config-meizu-m3.h b/firmware/export/config/meizuiaudiom3.h
index 06720695eb..06720695eb 100644
--- a/firmware/export/config-meizu-m3.h
+++ b/firmware/export/config/meizuiaudiom3.h
diff --git a/firmware/export/config-meizu-m6sl.h b/firmware/export/config/meizum6sl.h
index ffa8903526..ffa8903526 100644
--- a/firmware/export/config-meizu-m6sl.h
+++ b/firmware/export/config/meizum6sl.h
diff --git a/firmware/export/config-meizu-m6sp.h b/firmware/export/config/meizum6sp.h
index 0fc7264192..0fc7264192 100644
--- a/firmware/export/config-meizu-m6sp.h
+++ b/firmware/export/config/meizum6sp.h
diff --git a/firmware/export/config-mini2440.h b/firmware/export/config/mini2440.h
index 5dad250930..5dad250930 100644
--- a/firmware/export/config-mini2440.h
+++ b/firmware/export/config/mini2440.h
diff --git a/firmware/export/config-mrobe100.h b/firmware/export/config/mrobe100.h
index 90419914b2..90419914b2 100644
--- a/firmware/export/config-mrobe100.h
+++ b/firmware/export/config/mrobe100.h
diff --git a/firmware/export/config-mrobe500.h b/firmware/export/config/mrobe500.h
index 96e25c9247..96e25c9247 100644
--- a/firmware/export/config-mrobe500.h
+++ b/firmware/export/config/mrobe500.h
diff --git a/firmware/export/config-ondavx747.h b/firmware/export/config/ondavx747.h
index ac2032587a..ac2032587a 100644
--- a/firmware/export/config-ondavx747.h
+++ b/firmware/export/config/ondavx747.h
diff --git a/firmware/export/config-ondavx767.h b/firmware/export/config/ondavx767.h
index 661d3e9e5e..661d3e9e5e 100644
--- a/firmware/export/config-ondavx767.h
+++ b/firmware/export/config/ondavx767.h
diff --git a/firmware/export/config-yh820.h b/firmware/export/config/samsungyh820.h
index 4968960803..4968960803 100644
--- a/firmware/export/config-yh820.h
+++ b/firmware/export/config/samsungyh820.h
diff --git a/firmware/export/config-yh920.h b/firmware/export/config/samsungyh920.h
index 310fa1374c..310fa1374c 100644
--- a/firmware/export/config-yh920.h
+++ b/firmware/export/config/samsungyh920.h
diff --git a/firmware/export/config-yh925.h b/firmware/export/config/samsungyh925.h
index 55d46ae1e1..55d46ae1e1 100644
--- a/firmware/export/config-yh925.h
+++ b/firmware/export/config/samsungyh925.h
diff --git a/firmware/export/config-yps3.h b/firmware/export/config/samsungyps3.h
index fd8fde6f6c..fd8fde6f6c 100644
--- a/firmware/export/config-yps3.h
+++ b/firmware/export/config/samsungyps3.h
diff --git a/firmware/export/config-c100.h b/firmware/export/config/sansac100.h
index a332bf5670..a332bf5670 100644
--- a/firmware/export/config-c100.h
+++ b/firmware/export/config/sansac100.h
diff --git a/firmware/export/config-c200.h b/firmware/export/config/sansac200.h
index 45cfb8aee9..45cfb8aee9 100644
--- a/firmware/export/config-c200.h
+++ b/firmware/export/config/sansac200.h
diff --git a/firmware/export/config-c200v2.h b/firmware/export/config/sansac200v2.h
index 65aebf245b..65aebf245b 100644
--- a/firmware/export/config-c200v2.h
+++ b/firmware/export/config/sansac200v2.h
diff --git a/firmware/export/config-clip.h b/firmware/export/config/sansaclip.h
index 4fa5f94598..4fa5f94598 100644
--- a/firmware/export/config-clip.h
+++ b/firmware/export/config/sansaclip.h
diff --git a/firmware/export/config-e200.h b/firmware/export/config/sansae200.h
index 687878ce06..687878ce06 100644
--- a/firmware/export/config-e200.h
+++ b/firmware/export/config/sansae200.h
diff --git a/firmware/export/config-e200v2.h b/firmware/export/config/sansae200v2.h
index 110555aec5..110555aec5 100644
--- a/firmware/export/config-e200v2.h
+++ b/firmware/export/config/sansae200v2.h
diff --git a/firmware/export/config-fuze.h b/firmware/export/config/sansafuze.h
index 4370aef42e..4370aef42e 100644
--- a/firmware/export/config-fuze.h
+++ b/firmware/export/config/sansafuze.h
diff --git a/firmware/export/config-m200.h b/firmware/export/config/sansam200.h
index 0f071e18ab..0f071e18ab 100644
--- a/firmware/export/config-m200.h
+++ b/firmware/export/config/sansam200.h
diff --git a/firmware/export/config-m200v4.h b/firmware/export/config/sansam200v4.h
index af9f1aedc6..af9f1aedc6 100644
--- a/firmware/export/config-m200v4.h
+++ b/firmware/export/config/sansam200v4.h
diff --git a/firmware/export/config-view.h b/firmware/export/config/sansaview.h
index 4111b8380a..4111b8380a 100644
--- a/firmware/export/config-view.h
+++ b/firmware/export/config/sansaview.h
diff --git a/firmware/export/config-sim.h b/firmware/export/config/sim.h
index ec398c8b2d..ec398c8b2d 100644
--- a/firmware/export/config-sim.h
+++ b/firmware/export/config/sim.h
diff --git a/firmware/export/config-tpj1022.h b/firmware/export/config/tatungtpj1022.h
index 89e3d6dff1..89e3d6dff1 100644
--- a/firmware/export/config-tpj1022.h
+++ b/firmware/export/config/tatungtpj1022.h
diff --git a/firmware/export/config-creativezvm.h b/firmware/export/config/zenvisionm.h
index d8005bb83d..d8005bb83d 100644
--- a/firmware/export/config-creativezvm.h
+++ b/firmware/export/config/zenvisionm.h
diff --git a/firmware/export/config-creativezvm60gb.h b/firmware/export/config/zenvisionm60gb.h
index 3e95ae7be7..3e95ae7be7 100644
--- a/firmware/export/config-creativezvm60gb.h
+++ b/firmware/export/config/zenvisionm60gb.h