diff --git a/src/devices.h b/src/devices.h
index eba426d2..594820db 100644
--- a/src/devices.h
+++ b/src/devices.h
@@ -1,31 +1,31 @@
-#include "HHCCJCY01HHCC_json.h"
-#include "VEGTRUG_json.h"
-#include "LYWSD02_json.h"
-#include "LYWSDCGQ_json.h"
-#include "CGP1W_json.h"
-#include "CGG1_json.h"
-#include "CGD1_json.h"
-#include "CGDK2_json.h"
-#include "CGH1_json.h"
-#include "JQJCY01YM_json.h"
-#include "IBS_TH1_json.h"
-#include "IBS_TH2_json.h"
-#include "IBS_X4S_json.h"
-#include "Miband_json.h"
-#include "XMTZC04HM_json.h"
-#include "XMTZC05HM_json.h"
-#include "TPMS_json.h"
-#include "LYWSD03MMC_ATC_json.h"
-#include "CGPR1_json.h"
-#include "iBeacon_json.h"
-#include "WS02_json.h"
-#include "H5075_json.h"
-#include "H5072_json.h"
-#include "LYWSD03MMC_PVVX_json.h"
-#include "MUE4094RT_json.h"
-#include "Mokobeacon_json.h"
-#include "MBXPRO_json.h"
-#include "iNode_json.h"
+#include "devices/HHCCJCY01HHCC_json.h"
+#include "devices/VEGTRUG_json.h"
+#include "devices/LYWSD02_json.h"
+#include "devices/LYWSDCGQ_json.h"
+#include "devices/CGP1W_json.h"
+#include "devices/CGG1_json.h"
+#include "devices/CGD1_json.h"
+#include "devices/CGDK2_json.h"
+#include "devices/CGH1_json.h"
+#include "devices/JQJCY01YM_json.h"
+#include "devices/IBS_TH1_json.h"
+#include "devices/IBS_TH2_json.h"
+#include "devices/IBS_X4S_json.h"
+#include "devices/Miband_json.h"
+#include "devices/XMTZC04HM_json.h"
+#include "devices/XMTZC05HM_json.h"
+#include "devices/TPMS_json.h"
+#include "devices/LYWSD03MMC_ATC_json.h"
+#include "devices/CGPR1_json.h"
+#include "devices/iBeacon_json.h"
+#include "devices/WS02_json.h"
+#include "devices/H5075_json.h"
+#include "devices/H5072_json.h"
+#include "devices/LYWSD03MMC_PVVX_json.h"
+#include "devices/MUE4094RT_json.h"
+#include "devices/Mokobeacon_json.h"
+#include "devices/MBXPRO_json.h"
+#include "devices/iNode_json.h"
 
 const char* _devices[] = {
 _HHCCJCY01HHCC_json,
diff --git a/src/CGD1_json.h b/src/devices/CGD1_json.h
similarity index 100%
rename from src/CGD1_json.h
rename to src/devices/CGD1_json.h
diff --git a/src/CGDK2_json.h b/src/devices/CGDK2_json.h
similarity index 100%
rename from src/CGDK2_json.h
rename to src/devices/CGDK2_json.h
diff --git a/src/CGG1_json.h b/src/devices/CGG1_json.h
similarity index 100%
rename from src/CGG1_json.h
rename to src/devices/CGG1_json.h
diff --git a/src/CGH1_json.h b/src/devices/CGH1_json.h
similarity index 100%
rename from src/CGH1_json.h
rename to src/devices/CGH1_json.h
diff --git a/src/CGP1W_json.h b/src/devices/CGP1W_json.h
similarity index 100%
rename from src/CGP1W_json.h
rename to src/devices/CGP1W_json.h
diff --git a/src/CGPR1_json.h b/src/devices/CGPR1_json.h
similarity index 100%
rename from src/CGPR1_json.h
rename to src/devices/CGPR1_json.h
diff --git a/src/H5072_json.h b/src/devices/H5072_json.h
similarity index 100%
rename from src/H5072_json.h
rename to src/devices/H5072_json.h
diff --git a/src/H5075_json.h b/src/devices/H5075_json.h
similarity index 100%
rename from src/H5075_json.h
rename to src/devices/H5075_json.h
diff --git a/src/HHCCJCY01HHCC_json.h b/src/devices/HHCCJCY01HHCC_json.h
similarity index 100%
rename from src/HHCCJCY01HHCC_json.h
rename to src/devices/HHCCJCY01HHCC_json.h
diff --git a/src/IBS_TH1_json.h b/src/devices/IBS_TH1_json.h
similarity index 100%
rename from src/IBS_TH1_json.h
rename to src/devices/IBS_TH1_json.h
diff --git a/src/IBS_TH2_json.h b/src/devices/IBS_TH2_json.h
similarity index 100%
rename from src/IBS_TH2_json.h
rename to src/devices/IBS_TH2_json.h
diff --git a/src/IBS_X4S_json.h b/src/devices/IBS_X4S_json.h
similarity index 100%
rename from src/IBS_X4S_json.h
rename to src/devices/IBS_X4S_json.h
diff --git a/src/JQJCY01YM_json.h b/src/devices/JQJCY01YM_json.h
similarity index 100%
rename from src/JQJCY01YM_json.h
rename to src/devices/JQJCY01YM_json.h
diff --git a/src/LYWSD02_json.h b/src/devices/LYWSD02_json.h
similarity index 100%
rename from src/LYWSD02_json.h
rename to src/devices/LYWSD02_json.h
diff --git a/src/LYWSD03MMC_ATC_json.h b/src/devices/LYWSD03MMC_ATC_json.h
similarity index 100%
rename from src/LYWSD03MMC_ATC_json.h
rename to src/devices/LYWSD03MMC_ATC_json.h
diff --git a/src/LYWSD03MMC_PVVX_json.h b/src/devices/LYWSD03MMC_PVVX_json.h
similarity index 100%
rename from src/LYWSD03MMC_PVVX_json.h
rename to src/devices/LYWSD03MMC_PVVX_json.h
diff --git a/src/LYWSDCGQ_json.h b/src/devices/LYWSDCGQ_json.h
similarity index 100%
rename from src/LYWSDCGQ_json.h
rename to src/devices/LYWSDCGQ_json.h
diff --git a/src/MBXPRO_json.h b/src/devices/MBXPRO_json.h
similarity index 100%
rename from src/MBXPRO_json.h
rename to src/devices/MBXPRO_json.h
diff --git a/src/MUE4094RT_json.h b/src/devices/MUE4094RT_json.h
similarity index 100%
rename from src/MUE4094RT_json.h
rename to src/devices/MUE4094RT_json.h
diff --git a/src/Miband_json.h b/src/devices/Miband_json.h
similarity index 100%
rename from src/Miband_json.h
rename to src/devices/Miband_json.h
diff --git a/src/Mokobeacon_json.h b/src/devices/Mokobeacon_json.h
similarity index 100%
rename from src/Mokobeacon_json.h
rename to src/devices/Mokobeacon_json.h
diff --git a/src/TPMS_json.h b/src/devices/TPMS_json.h
similarity index 100%
rename from src/TPMS_json.h
rename to src/devices/TPMS_json.h
diff --git a/src/VEGTRUG_json.h b/src/devices/VEGTRUG_json.h
similarity index 100%
rename from src/VEGTRUG_json.h
rename to src/devices/VEGTRUG_json.h
diff --git a/src/WS02_json.h b/src/devices/WS02_json.h
similarity index 100%
rename from src/WS02_json.h
rename to src/devices/WS02_json.h
diff --git a/src/XMTZC04HM_json.h b/src/devices/XMTZC04HM_json.h
similarity index 100%
rename from src/XMTZC04HM_json.h
rename to src/devices/XMTZC04HM_json.h
diff --git a/src/XMTZC05HM_json.h b/src/devices/XMTZC05HM_json.h
similarity index 100%
rename from src/XMTZC05HM_json.h
rename to src/devices/XMTZC05HM_json.h
diff --git a/src/iBeacon_json.h b/src/devices/iBeacon_json.h
similarity index 100%
rename from src/iBeacon_json.h
rename to src/devices/iBeacon_json.h
diff --git a/src/iNode_json.h b/src/devices/iNode_json.h
similarity index 100%
rename from src/iNode_json.h
rename to src/devices/iNode_json.h