58 files changed, 58 insertions, 58 deletions

diff --git a/firmware/export/config/sansac100.h b/firmware/export/config-c100.h
index 5cc29e32f6..5cc29e32f6 100644
--- a/firmware/export/config/sansac100.h
+++ b/firmware/export/config-c100.h
diff --git a/firmware/export/config/sansac200.h b/firmware/export/config-c200.h
index 654ac7b9cf..654ac7b9cf 100644
--- a/firmware/export/config/sansac200.h
+++ b/firmware/export/config-c200.h
diff --git a/firmware/export/config/sansac200v2.h b/firmware/export/config-c200v2.h
index d6c2159e8c..d6c2159e8c 100644
--- a/firmware/export/config/sansac200v2.h
+++ b/firmware/export/config-c200v2.h
diff --git a/firmware/export/config/sansaclip.h b/firmware/export/config-clip.h
index 3b82a25159..3b82a25159 100644
--- a/firmware/export/config/sansaclip.h
+++ b/firmware/export/config-clip.h
diff --git a/firmware/export/config/cowond2.h b/firmware/export/config-cowond2.h
index 453fa0d4c1..453fa0d4c1 100644
--- a/firmware/export/config/cowond2.h
+++ b/firmware/export/config-cowond2.h
diff --git a/firmware/export/config/zenvision.h b/firmware/export/config-creativezv.h
index 48a9653ee9..48a9653ee9 100644
--- a/firmware/export/config/zenvision.h
+++ b/firmware/export/config-creativezv.h
diff --git a/firmware/export/config/zenvisionm30gb.h b/firmware/export/config-creativezvm.h
index 752ec4eb22..752ec4eb22 100644
--- a/firmware/export/config/zenvisionm30gb.h
+++ b/firmware/export/config-creativezvm.h
diff --git a/firmware/export/config/zenvisionm60gb.h b/firmware/export/config-creativezvm60gb.h
index 6d6228304b..6d6228304b 100644
--- a/firmware/export/config/zenvisionm60gb.h
+++ b/firmware/export/config-creativezvm60gb.h
diff --git a/firmware/export/config/sansae200.h b/firmware/export/config-e200.h
index 8b7e0d68b2..8b7e0d68b2 100644
--- a/firmware/export/config/sansae200.h
+++ b/firmware/export/config-e200.h
diff --git a/firmware/export/config/sansae200v2.h b/firmware/export/config-e200v2.h
index dff99cde16..dff99cde16 100644
--- a/firmware/export/config/sansae200v2.h
+++ b/firmware/export/config-e200v2.h
diff --git a/firmware/export/config/archosfmrecorder.h b/firmware/export/config-fmrecorder.h
index acc1c74dcf..acc1c74dcf 100644
--- a/firmware/export/config/archosfmrecorder.h
+++ b/firmware/export/config-fmrecorder.h
diff --git a/firmware/export/config/sansafuze.h b/firmware/export/config-fuze.h
index 4ca583ca60..4ca583ca60 100644
--- a/firmware/export/config/sansafuze.h
+++ b/firmware/export/config-fuze.h
diff --git a/firmware/export/config/gigabeats.h b/firmware/export/config-gigabeat-s.h
index 3f001af737..3f001af737 100644
--- a/firmware/export/config/gigabeats.h
+++ b/firmware/export/config-gigabeat-s.h
diff --git a/firmware/export/config/gigabeatfx.h b/firmware/export/config-gigabeat.h
index 4c06a4d134..4c06a4d134 100644
--- a/firmware/export/config/gigabeatfx.h
+++ b/firmware/export/config-gigabeat.h
diff --git a/firmware/export/config/iriverh10.h b/firmware/export/config-h10.h
index 0dc845c23b..0dc845c23b 100644
--- a/firmware/export/config/iriverh10.h
+++ b/firmware/export/config-h10.h
diff --git a/firmware/export/config/iriverh100.h b/firmware/export/config-h100.h
index f06aaf8335..f06aaf8335 100644
--- a/firmware/export/config/iriverh100.h
+++ b/firmware/export/config-h100.h
diff --git a/firmware/export/config/iriverh10_5gb.h b/firmware/export/config-h10_5gb.h
index 8275e50dc6..8275e50dc6 100644
--- a/firmware/export/config/iriverh10_5gb.h
+++ b/firmware/export/config-h10_5gb.h
diff --git a/firmware/export/config/iriverh120.h b/firmware/export/config-h120.h
index da75c60ecf..da75c60ecf 100644
--- a/firmware/export/config/iriverh120.h
+++ b/firmware/export/config-h120.h
diff --git a/firmware/export/config/iriverh300.h b/firmware/export/config-h300.h
index 9fad6cc503..9fad6cc503 100644
--- a/firmware/export/config/iriverh300.h
+++ b/firmware/export/config-h300.h
diff --git a/firmware/export/config/gogearhdd1630.h b/firmware/export/config-hdd1630.h
index 05450e01c2..05450e01c2 100644..100755
--- a/firmware/export/config/gogearhdd1630.h
+++ b/firmware/export/config-hdd1630.h
diff --git a/firmware/export/config/iaudio7.h b/firmware/export/config-iaudio7.h
index 68393f1293..68393f1293 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 b3d7fb83b3..b3d7fb83b3 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 b10ac9ad09..b10ac9ad09 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 0cf39325a4..0cf39325a4 100644
--- a/firmware/export/config/iaudiox5.h
+++ b/firmware/export/config-iaudiox5.h
diff --git a/firmware/export/config/iriverifp7xx.h b/firmware/export/config-ifp7xx.h
index 901f78f0ea..901f78f0ea 100644
--- a/firmware/export/config/iriverifp7xx.h
+++ b/firmware/export/config-ifp7xx.h
diff --git a/firmware/export/config/ipod1g2g.h b/firmware/export/config-ipod1g2g.h
index 549af02fdc..549af02fdc 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 197f80fe72..197f80fe72 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 7db9836462..7db9836462 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 0dc691934f..0dc691934f 100644
--- a/firmware/export/config/ipodcolor.h
+++ b/firmware/export/config-ipodcolor.h
diff --git a/firmware/export/config/ipodmini1g.h b/firmware/export/config-ipodmini.h
index ca82d5a560..ca82d5a560 100644
--- a/firmware/export/config/ipodmini1g.h
+++ b/firmware/export/config-ipodmini.h
diff --git a/firmware/export/config/ipodmini2g.h b/firmware/export/config-ipodmini2g.h
index 37dd3ef559..37dd3ef559 100644
--- a/firmware/export/config/ipodmini2g.h
+++ b/firmware/export/config-ipodmini2g.h
diff --git a/firmware/export/config/ipodnano1g.h b/firmware/export/config-ipodnano.h
index 8483f56613..8483f56613 100644
--- a/firmware/export/config/ipodnano1g.h
+++ b/firmware/export/config-ipodnano.h
diff --git a/firmware/export/config/ipodnano2g.h b/firmware/export/config-ipodnano2g.h
index 31830fd2c1..31830fd2c1 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 7dca65706c..7dca65706c 100644
--- a/firmware/export/config/ipodvideo.h
+++ b/firmware/export/config-ipodvideo.h
diff --git a/firmware/export/config/logikdax.h b/firmware/export/config-logikdax.h
index 8cfbbd8bd8..8cfbbd8bd8 100644
--- a/firmware/export/config/logikdax.h
+++ b/firmware/export/config-logikdax.h
diff --git a/firmware/export/config/lyreproto1.h b/firmware/export/config-lyre_proto1.h
index d157f5be2d..d157f5be2d 100644
--- a/firmware/export/config/lyreproto1.h
+++ b/firmware/export/config-lyre_proto1.h
diff --git a/firmware/export/config/sansam200.h b/firmware/export/config-m200.h
index 3ec721cc7c..3ec721cc7c 100644
--- a/firmware/export/config/sansam200.h
+++ b/firmware/export/config-m200.h
diff --git a/firmware/export/config/sansam200v4.h b/firmware/export/config-m200v4.h
index 21038349fd..21038349fd 100644
--- a/firmware/export/config/sansam200v4.h
+++ b/firmware/export/config-m200v4.h
diff --git a/firmware/export/config/meizum3.h b/firmware/export/config-meizu-m3.h
index 7da1759a61..7da1759a61 100644
--- a/firmware/export/config/meizum3.h
+++ b/firmware/export/config-meizu-m3.h
diff --git a/firmware/export/config/meizum6sl.h b/firmware/export/config-meizu-m6sl.h
index 033dc619a0..033dc619a0 100644
--- a/firmware/export/config/meizum6sl.h
+++ b/firmware/export/config-meizu-m6sl.h
diff --git a/firmware/export/config/meizum6sp.h b/firmware/export/config-meizu-m6sp.h
index b5aad58667..b5aad58667 100644
--- a/firmware/export/config/meizum6sp.h
+++ b/firmware/export/config-meizu-m6sp.h
diff --git a/firmware/export/config/mrobe100.h b/firmware/export/config-mrobe100.h
index 4fdea149ae..4fdea149ae 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 45733a644f..45733a644f 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 dee18663d1..dee18663d1 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 5aa755bfa4..5aa755bfa4 100644
--- a/firmware/export/config/ondavx767.h
+++ b/firmware/export/config-ondavx767.h
diff --git a/firmware/export/config/archosondiofm.h b/firmware/export/config-ondiofm.h
index 7a2b30dbf1..7a2b30dbf1 100644
--- a/firmware/export/config/archosondiofm.h
+++ b/firmware/export/config-ondiofm.h
diff --git a/firmware/export/config/archosondiosp.h b/firmware/export/config-ondiosp.h
index 134f7e3cfa..134f7e3cfa 100644
--- a/firmware/export/config/archosondiosp.h
+++ b/firmware/export/config-ondiosp.h
diff --git a/firmware/export/config/archosplayer.h b/firmware/export/config-player.h
index 5f6cf17fbe..5f6cf17fbe 100644
--- a/firmware/export/config/archosplayer.h
+++ b/firmware/export/config-player.h
diff --git a/firmware/export/config/archosrecorder.h b/firmware/export/config-recorder.h
index 37c2222985..37c2222985 100644
--- a/firmware/export/config/archosrecorder.h
+++ b/firmware/export/config-recorder.h
diff --git a/firmware/export/config/archosrecorderv2.h b/firmware/export/config-recorderv2.h
index 5ca9459750..5ca9459750 100644
--- a/firmware/export/config/archosrecorderv2.h
+++ b/firmware/export/config-recorderv2.h
diff --git a/firmware/export/config/gogearsa9200.h b/firmware/export/config-sa9200.h
index 7af50b5145..7af50b5145 100644..100755
--- a/firmware/export/config/gogearsa9200.h
+++ b/firmware/export/config-sa9200.h
diff --git a/firmware/export/config/tatungtpj1022.h b/firmware/export/config-tpj1022.h
index cdb1eb93ac..cdb1eb93ac 100644
--- a/firmware/export/config/tatungtpj1022.h
+++ b/firmware/export/config-tpj1022.h
diff --git a/firmware/export/config/sansaview.h b/firmware/export/config-view.h
index 4ba5d916ba..4ba5d916ba 100644
--- a/firmware/export/config/sansaview.h
+++ b/firmware/export/config-view.h
diff --git a/firmware/export/config/samsungyh820.h b/firmware/export/config-yh820.h
index 4005ec0267..4005ec0267 100644
--- a/firmware/export/config/samsungyh820.h
+++ b/firmware/export/config-yh820.h
diff --git a/firmware/export/config/samsungyh920.h b/firmware/export/config-yh920.h
index e5a0fc8f71..e5a0fc8f71 100644
--- a/firmware/export/config/samsungyh920.h
+++ b/firmware/export/config-yh920.h
diff --git a/firmware/export/config/samsungyh925.h b/firmware/export/config-yh925.h
index 4119118678..4119118678 100644
--- a/firmware/export/config/samsungyh925.h
+++ b/firmware/export/config-yh925.h
diff --git a/firmware/export/config/samsungyps3.h b/firmware/export/config-yps3.h
index cd7cf5050a..cd7cf5050a 100644
--- a/firmware/export/config/samsungyps3.h
+++ b/firmware/export/config-yps3.h
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 387652bb77..a1a8a9df2a 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -279,121 +279,121 @@ Lyre prototype 1*/
 
 /* now go and pick yours */
 #if defined(ARCHOS_PLAYER)
-#include "config/archosplayer.h"
+#include "config-player.h"
 #elif defined(ARCHOS_RECORDER)
-#include "config/archosrecorder.h"
+#include "config-recorder.h"
 #elif defined(ARCHOS_FMRECORDER)
-#include "config/archosfmrecorder.h"
+#include "config-fmrecorder.h"
 #elif defined(ARCHOS_RECORDERV2)
-#include "config/archosrecorderv2.h"
+#include "config-recorderv2.h"
 #elif defined(ARCHOS_ONDIOSP)
-#include "config/archosondiosp.h"
+#include "config-ondiosp.h"
 #elif defined(ARCHOS_ONDIOFM)
-#include "config/archosondiofm.h"
+#include "config-ondiofm.h"
 #elif defined(ARCHOS_AV300)
-#include "config/archosav300.h"
+#include "config-av300.h"
 #elif defined(IRIVER_H100)
-#include "config/iriverh100.h"
+#include "config-h100.h"
 #elif defined(IRIVER_H120)
-#include "config/iriverh120.h"
+#include "config-h120.h"
 #elif defined(IRIVER_H300)
-#include "config/iriverh300.h"
+#include "config-h300.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/ipodnano1g.h"
+#include "config-ipodnano.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/iriverifp7xx.h"
+#include "config-ifp7xx.h"
 #elif defined(GIGABEAT_F)
-#include "config/gigabeatfx.h"
+#include "config-gigabeat.h"
 #elif defined(GIGABEAT_S)
-#include "config/gigabeats.h"
+#include "config-gigabeat-s.h"
 #elif defined(IPOD_MINI)
-#include "config/ipodmini1g.h"
+#include "config-ipodmini.h"
 #elif defined(IPOD_MINI2G)
-#include "config/ipodmini2g.h"
+#include "config-ipodmini2g.h"
 #elif defined(IRIVER_H10)
-#include "config/iriverh10.h"
+#include "config-h10.h"
 #elif defined(IRIVER_H10_5GB)
-#include "config/iriverh10_5gb.h"
+#include "config-h10_5gb.h"
 #elif defined(SANSA_E200)
-#include "config/sansae200.h"
+#include "config-e200.h"
 #elif defined(SANSA_C200)
-#include "config/sansac200.h"
+#include "config-c200.h"
 #elif defined(SANSA_M200)
-#include "config/sansam200.h"
+#include "config-m200.h"
 #elif defined(ELIO_TPJ1022)
-#include "config/tatungtpj1022.h"
+#include "config-tpj1022.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/zenvisionm30gb.h"
+#include "config-creativezvm.h"
 #elif defined(CREATIVE_ZVM60GB)
-#include "config/zenvisionm60gb.h"
+#include "config-creativezvm60gb.h"
 #elif defined(CREATIVE_ZV)
-#include "config/zenvision.h"
+#include "config-creativezv.h"
 #elif defined(PHILIPS_SA9200)
-#include "config/gogearsa9200.h"
+#include "config-sa9200.h"
 #elif defined(PHILIPS_HDD1630)
-#include "config/gogearhdd1630.h"
+#include "config-hdd1630.h"
 #elif defined(SANSA_C100)
-#include "config/sansac100.h"
+#include "config-c100.h"
 #elif defined(MEIZU_M6SL)
-#include "config/meizum6sl.h"
+#include "config-meizu-m6sl.h"
 #elif defined(MEIZU_M6SP)
-#include "config/meizum6sp.h"
+#include "config-meizu-m6sp.h"
 #elif defined(MEIZU_M3)
-#include "config/meizum3.h"
+#include "config-meizu-m3.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/sansaclip.h"
+#include "config-clip.h"
 #elif defined(SANSA_E200V2)
-#include "config/sansae200v2.h"
+#include "config-e200v2.h"
 #elif defined(SANSA_M200V4)
-#include "config/sansam200v4.h"
+#include "config-m200v4.h"
 #elif defined(SANSA_FUZE)
-#include "config/sansafuze.h"
+#include "config-fuze.h"
 #elif defined(SANSA_C200V2)
-#include "config/sansac200v2.h"
+#include "config-c200v2.h"
 #elif defined(SANSA_VIEW)
-#include "config/view.h"
+#include "config-view.h"
 #elif defined(LYRE_PROTO1)
-#include "config/lyre_proto1.h"
+#include "config-lyre_proto1.h"
 #elif defined(SAMSUNG_YH820)
-#include "config/samsungyh820.h"
+#include "config-yh820.h"
 #elif defined(SAMSUNG_YH920)
-#include "config/samsungyh920.h"
+#include "config-yh920.h"
 #elif defined(SAMSUNG_YH925)
-#include "config/samsungyh925.h"
+#include "config-yh925.h"
 #elif defined(SAMSUNG_YPS3)
-#include "config/samsungyps3.h"
+#include "config-yps3.h"
 #else
 /* no known platform */
 #endif