diff --git a/CHANGED b/fhem/CHANGED
similarity index 100%
rename from CHANGED
rename to fhem/CHANGED
diff --git a/COPYING b/fhem/COPYING
similarity index 100%
rename from COPYING
rename to fhem/COPYING
diff --git a/FHEM/00_CM11.pm b/fhem/FHEM/00_CM11.pm
similarity index 100%
rename from FHEM/00_CM11.pm
rename to fhem/FHEM/00_CM11.pm
diff --git a/FHEM/00_CUL.pm b/fhem/FHEM/00_CUL.pm
similarity index 100%
rename from FHEM/00_CUL.pm
rename to fhem/FHEM/00_CUL.pm
diff --git a/FHEM/00_FHZ.pm b/fhem/FHEM/00_FHZ.pm
similarity index 100%
rename from FHEM/00_FHZ.pm
rename to fhem/FHEM/00_FHZ.pm
diff --git a/FHEM/00_HMLAN.pm b/fhem/FHEM/00_HMLAN.pm
similarity index 100%
rename from FHEM/00_HMLAN.pm
rename to fhem/FHEM/00_HMLAN.pm
diff --git a/FHEM/00_KM271.pm b/fhem/FHEM/00_KM271.pm
similarity index 100%
rename from FHEM/00_KM271.pm
rename to fhem/FHEM/00_KM271.pm
diff --git a/FHEM/00_LIRC.pm b/fhem/FHEM/00_LIRC.pm
similarity index 100%
rename from FHEM/00_LIRC.pm
rename to fhem/FHEM/00_LIRC.pm
diff --git a/FHEM/00_MAXLAN.pm b/fhem/FHEM/00_MAXLAN.pm
similarity index 100%
rename from FHEM/00_MAXLAN.pm
rename to fhem/FHEM/00_MAXLAN.pm
diff --git a/FHEM/00_OWX.pm b/fhem/FHEM/00_OWX.pm
similarity index 100%
rename from FHEM/00_OWX.pm
rename to fhem/FHEM/00_OWX.pm
diff --git a/FHEM/00_TCM.pm b/fhem/FHEM/00_TCM.pm
similarity index 100%
rename from FHEM/00_TCM.pm
rename to fhem/FHEM/00_TCM.pm
diff --git a/FHEM/00_TUL.pm b/fhem/FHEM/00_TUL.pm
similarity index 100%
rename from FHEM/00_TUL.pm
rename to fhem/FHEM/00_TUL.pm
diff --git a/FHEM/00_ZWDongle.pm b/fhem/FHEM/00_ZWDongle.pm
similarity index 100%
rename from FHEM/00_ZWDongle.pm
rename to fhem/FHEM/00_ZWDongle.pm
diff --git a/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
similarity index 100%
rename from FHEM/01_FHEMWEB.pm
rename to fhem/FHEM/01_FHEMWEB.pm
diff --git a/FHEM/02_HTTPSRV.pm b/fhem/FHEM/02_HTTPSRV.pm
similarity index 100%
rename from FHEM/02_HTTPSRV.pm
rename to fhem/FHEM/02_HTTPSRV.pm
diff --git a/FHEM/02_RSS.pm b/fhem/FHEM/02_RSS.pm
similarity index 100%
rename from FHEM/02_RSS.pm
rename to fhem/FHEM/02_RSS.pm
diff --git a/FHEM/09_BS.pm b/fhem/FHEM/09_BS.pm
similarity index 100%
rename from FHEM/09_BS.pm
rename to fhem/FHEM/09_BS.pm
diff --git a/FHEM/09_CUL_FHTTK.pm b/fhem/FHEM/09_CUL_FHTTK.pm
similarity index 100%
rename from FHEM/09_CUL_FHTTK.pm
rename to fhem/FHEM/09_CUL_FHTTK.pm
diff --git a/FHEM/09_USF1000.pm b/fhem/FHEM/09_USF1000.pm
similarity index 100%
rename from FHEM/09_USF1000.pm
rename to fhem/FHEM/09_USF1000.pm
diff --git a/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm
similarity index 100%
rename from FHEM/10_CUL_HM.pm
rename to fhem/FHEM/10_CUL_HM.pm
diff --git a/FHEM/10_CUL_IR.pm b/fhem/FHEM/10_CUL_IR.pm
similarity index 100%
rename from FHEM/10_CUL_IR.pm
rename to fhem/FHEM/10_CUL_IR.pm
diff --git a/FHEM/10_EIB.pm b/fhem/FHEM/10_EIB.pm
similarity index 100%
rename from FHEM/10_EIB.pm
rename to fhem/FHEM/10_EIB.pm
diff --git a/FHEM/10_EnOcean.pm b/fhem/FHEM/10_EnOcean.pm
similarity index 100%
rename from FHEM/10_EnOcean.pm
rename to fhem/FHEM/10_EnOcean.pm
diff --git a/FHEM/10_FS20.pm b/fhem/FHEM/10_FS20.pm
similarity index 100%
rename from FHEM/10_FS20.pm
rename to fhem/FHEM/10_FS20.pm
diff --git a/FHEM/10_IT.pm b/fhem/FHEM/10_IT.pm
similarity index 100%
rename from FHEM/10_IT.pm
rename to fhem/FHEM/10_IT.pm
diff --git a/FHEM/10_MAX.pm b/fhem/FHEM/10_MAX.pm
similarity index 100%
rename from FHEM/10_MAX.pm
rename to fhem/FHEM/10_MAX.pm
diff --git a/FHEM/10_ZWave.pm b/fhem/FHEM/10_ZWave.pm
similarity index 100%
rename from FHEM/10_ZWave.pm
rename to fhem/FHEM/10_ZWave.pm
diff --git a/FHEM/11_FHT.pm b/fhem/FHEM/11_FHT.pm
similarity index 100%
rename from FHEM/11_FHT.pm
rename to fhem/FHEM/11_FHT.pm
diff --git a/FHEM/11_FHT8V.pm b/fhem/FHEM/11_FHT8V.pm
similarity index 100%
rename from FHEM/11_FHT8V.pm
rename to fhem/FHEM/11_FHT8V.pm
diff --git a/FHEM/12_HMS.pm b/fhem/FHEM/12_HMS.pm
similarity index 100%
rename from FHEM/12_HMS.pm
rename to fhem/FHEM/12_HMS.pm
diff --git a/FHEM/13_KS300.pm b/fhem/FHEM/13_KS300.pm
similarity index 100%
rename from FHEM/13_KS300.pm
rename to fhem/FHEM/13_KS300.pm
diff --git a/FHEM/14_CUL_MAX.pm b/fhem/FHEM/14_CUL_MAX.pm
similarity index 100%
rename from FHEM/14_CUL_MAX.pm
rename to fhem/FHEM/14_CUL_MAX.pm
diff --git a/FHEM/14_CUL_TX.pm b/fhem/FHEM/14_CUL_TX.pm
similarity index 100%
rename from FHEM/14_CUL_TX.pm
rename to fhem/FHEM/14_CUL_TX.pm
diff --git a/FHEM/14_CUL_WS.pm b/fhem/FHEM/14_CUL_WS.pm
similarity index 100%
rename from FHEM/14_CUL_WS.pm
rename to fhem/FHEM/14_CUL_WS.pm
diff --git a/FHEM/15_CUL_EM.pm b/fhem/FHEM/15_CUL_EM.pm
similarity index 100%
rename from FHEM/15_CUL_EM.pm
rename to fhem/FHEM/15_CUL_EM.pm
diff --git a/FHEM/16_CUL_RFR.pm b/fhem/FHEM/16_CUL_RFR.pm
similarity index 100%
rename from FHEM/16_CUL_RFR.pm
rename to fhem/FHEM/16_CUL_RFR.pm
diff --git a/FHEM/17_SIS_PMS.pm b/fhem/FHEM/17_SIS_PMS.pm
similarity index 100%
rename from FHEM/17_SIS_PMS.pm
rename to fhem/FHEM/17_SIS_PMS.pm
diff --git a/FHEM/18_CUL_HOERMANN.pm b/fhem/FHEM/18_CUL_HOERMANN.pm
similarity index 100%
rename from FHEM/18_CUL_HOERMANN.pm
rename to fhem/FHEM/18_CUL_HOERMANN.pm
diff --git a/FHEM/20_OWFS.pm b/fhem/FHEM/20_OWFS.pm
similarity index 100%
rename from FHEM/20_OWFS.pm
rename to fhem/FHEM/20_OWFS.pm
diff --git a/FHEM/20_X10.pm b/fhem/FHEM/20_X10.pm
similarity index 100%
rename from FHEM/20_X10.pm
rename to fhem/FHEM/20_X10.pm
diff --git a/FHEM/21_OWAD.pm b/fhem/FHEM/21_OWAD.pm
similarity index 100%
rename from FHEM/21_OWAD.pm
rename to fhem/FHEM/21_OWAD.pm
diff --git a/FHEM/21_OWCOUNT.pm b/fhem/FHEM/21_OWCOUNT.pm
similarity index 100%
rename from FHEM/21_OWCOUNT.pm
rename to fhem/FHEM/21_OWCOUNT.pm
diff --git a/FHEM/21_OWID.pm b/fhem/FHEM/21_OWID.pm
similarity index 100%
rename from FHEM/21_OWID.pm
rename to fhem/FHEM/21_OWID.pm
diff --git a/FHEM/21_OWLCD.pm b/fhem/FHEM/21_OWLCD.pm
similarity index 100%
rename from FHEM/21_OWLCD.pm
rename to fhem/FHEM/21_OWLCD.pm
diff --git a/FHEM/21_OWMULTI.pm b/fhem/FHEM/21_OWMULTI.pm
similarity index 100%
rename from FHEM/21_OWMULTI.pm
rename to fhem/FHEM/21_OWMULTI.pm
diff --git a/FHEM/21_OWSWITCH.pm b/fhem/FHEM/21_OWSWITCH.pm
similarity index 100%
rename from FHEM/21_OWSWITCH.pm
rename to fhem/FHEM/21_OWSWITCH.pm
diff --git a/FHEM/21_OWTEMP.pm b/fhem/FHEM/21_OWTEMP.pm
similarity index 100%
rename from FHEM/21_OWTEMP.pm
rename to fhem/FHEM/21_OWTEMP.pm
diff --git a/FHEM/21_OWTHERM.pm b/fhem/FHEM/21_OWTHERM.pm
similarity index 100%
rename from FHEM/21_OWTHERM.pm
rename to fhem/FHEM/21_OWTHERM.pm
diff --git a/FHEM/22_ALL3076.pm b/fhem/FHEM/22_ALL3076.pm
similarity index 100%
rename from FHEM/22_ALL3076.pm
rename to fhem/FHEM/22_ALL3076.pm
diff --git a/FHEM/23_ALL4027.pm b/fhem/FHEM/23_ALL4027.pm
similarity index 100%
rename from FHEM/23_ALL4027.pm
rename to fhem/FHEM/23_ALL4027.pm
diff --git a/FHEM/23_WEBIO.pm b/fhem/FHEM/23_WEBIO.pm
similarity index 100%
rename from FHEM/23_WEBIO.pm
rename to fhem/FHEM/23_WEBIO.pm
diff --git a/FHEM/23_WEBIO_12DIGITAL.pm b/fhem/FHEM/23_WEBIO_12DIGITAL.pm
similarity index 100%
rename from FHEM/23_WEBIO_12DIGITAL.pm
rename to fhem/FHEM/23_WEBIO_12DIGITAL.pm
diff --git a/FHEM/23_WEBTHERM.pm b/fhem/FHEM/23_WEBTHERM.pm
similarity index 100%
rename from FHEM/23_WEBTHERM.pm
rename to fhem/FHEM/23_WEBTHERM.pm
diff --git a/FHEM/24_NetIO230B.pm b/fhem/FHEM/24_NetIO230B.pm
similarity index 100%
rename from FHEM/24_NetIO230B.pm
rename to fhem/FHEM/24_NetIO230B.pm
diff --git a/FHEM/40_RFXCOM.pm b/fhem/FHEM/40_RFXCOM.pm
similarity index 100%
rename from FHEM/40_RFXCOM.pm
rename to fhem/FHEM/40_RFXCOM.pm
diff --git a/FHEM/41_OREGON.pm b/fhem/FHEM/41_OREGON.pm
similarity index 100%
rename from FHEM/41_OREGON.pm
rename to fhem/FHEM/41_OREGON.pm
diff --git a/FHEM/42_RFXMETER.pm b/fhem/FHEM/42_RFXMETER.pm
similarity index 100%
rename from FHEM/42_RFXMETER.pm
rename to fhem/FHEM/42_RFXMETER.pm
diff --git a/FHEM/43_RFXX10REC.pm b/fhem/FHEM/43_RFXX10REC.pm
similarity index 100%
rename from FHEM/43_RFXX10REC.pm
rename to fhem/FHEM/43_RFXX10REC.pm
diff --git a/FHEM/45_TRX.pm b/fhem/FHEM/45_TRX.pm
similarity index 100%
rename from FHEM/45_TRX.pm
rename to fhem/FHEM/45_TRX.pm
diff --git a/FHEM/46_TRX_ELSE.pm b/fhem/FHEM/46_TRX_ELSE.pm
similarity index 100%
rename from FHEM/46_TRX_ELSE.pm
rename to fhem/FHEM/46_TRX_ELSE.pm
diff --git a/FHEM/46_TRX_LIGHT.pm b/fhem/FHEM/46_TRX_LIGHT.pm
similarity index 100%
rename from FHEM/46_TRX_LIGHT.pm
rename to fhem/FHEM/46_TRX_LIGHT.pm
diff --git a/FHEM/46_TRX_SECURITY.pm b/fhem/FHEM/46_TRX_SECURITY.pm
similarity index 100%
rename from FHEM/46_TRX_SECURITY.pm
rename to fhem/FHEM/46_TRX_SECURITY.pm
diff --git a/FHEM/46_TRX_WEATHER.pm b/fhem/FHEM/46_TRX_WEATHER.pm
similarity index 100%
rename from FHEM/46_TRX_WEATHER.pm
rename to fhem/FHEM/46_TRX_WEATHER.pm
diff --git a/FHEM/49_IPCAM.pm b/fhem/FHEM/49_IPCAM.pm
similarity index 100%
rename from FHEM/49_IPCAM.pm
rename to fhem/FHEM/49_IPCAM.pm
diff --git a/FHEM/50_WS300.pm b/fhem/FHEM/50_WS300.pm
similarity index 100%
rename from FHEM/50_WS300.pm
rename to fhem/FHEM/50_WS300.pm
diff --git a/FHEM/56_POKEYS.pm b/fhem/FHEM/56_POKEYS.pm
similarity index 100%
rename from FHEM/56_POKEYS.pm
rename to fhem/FHEM/56_POKEYS.pm
diff --git a/FHEM/57_Calendar.pm b/fhem/FHEM/57_Calendar.pm
similarity index 100%
rename from FHEM/57_Calendar.pm
rename to fhem/FHEM/57_Calendar.pm
diff --git a/FHEM/59_HCS.pm b/fhem/FHEM/59_HCS.pm
similarity index 100%
rename from FHEM/59_HCS.pm
rename to fhem/FHEM/59_HCS.pm
diff --git a/FHEM/59_Twilight.pm b/fhem/FHEM/59_Twilight.pm
similarity index 100%
rename from FHEM/59_Twilight.pm
rename to fhem/FHEM/59_Twilight.pm
diff --git a/FHEM/59_Weather.pm b/fhem/FHEM/59_Weather.pm
similarity index 100%
rename from FHEM/59_Weather.pm
rename to fhem/FHEM/59_Weather.pm
diff --git a/FHEM/60_EM.pm b/fhem/FHEM/60_EM.pm
similarity index 100%
rename from FHEM/60_EM.pm
rename to fhem/FHEM/60_EM.pm
diff --git a/FHEM/61_EMWZ.pm b/fhem/FHEM/61_EMWZ.pm
similarity index 100%
rename from FHEM/61_EMWZ.pm
rename to fhem/FHEM/61_EMWZ.pm
diff --git a/FHEM/62_EMEM.pm b/fhem/FHEM/62_EMEM.pm
similarity index 100%
rename from FHEM/62_EMEM.pm
rename to fhem/FHEM/62_EMEM.pm
diff --git a/FHEM/63_EMGZ.pm b/fhem/FHEM/63_EMGZ.pm
similarity index 100%
rename from FHEM/63_EMGZ.pm
rename to fhem/FHEM/63_EMGZ.pm
diff --git a/FHEM/64_ESA2000.pm b/fhem/FHEM/64_ESA2000.pm
similarity index 100%
rename from FHEM/64_ESA2000.pm
rename to fhem/FHEM/64_ESA2000.pm
diff --git a/FHEM/66_ECMD.pm b/fhem/FHEM/66_ECMD.pm
similarity index 100%
rename from FHEM/66_ECMD.pm
rename to fhem/FHEM/66_ECMD.pm
diff --git a/FHEM/67_ECMDDevice.pm b/fhem/FHEM/67_ECMDDevice.pm
similarity index 100%
rename from FHEM/67_ECMDDevice.pm
rename to fhem/FHEM/67_ECMDDevice.pm
diff --git a/FHEM/70_SCIVT.pm b/fhem/FHEM/70_SCIVT.pm
similarity index 100%
rename from FHEM/70_SCIVT.pm
rename to fhem/FHEM/70_SCIVT.pm
diff --git a/FHEM/70_SISPM.pm b/fhem/FHEM/70_SISPM.pm
similarity index 100%
rename from FHEM/70_SISPM.pm
rename to fhem/FHEM/70_SISPM.pm
diff --git a/FHEM/70_SML.pm b/fhem/FHEM/70_SML.pm
similarity index 100%
rename from FHEM/70_SML.pm
rename to fhem/FHEM/70_SML.pm
diff --git a/FHEM/70_STV.pm b/fhem/FHEM/70_STV.pm
similarity index 100%
rename from FHEM/70_STV.pm
rename to fhem/FHEM/70_STV.pm
diff --git a/FHEM/70_TellStick.pm b/fhem/FHEM/70_TellStick.pm
similarity index 100%
rename from FHEM/70_TellStick.pm
rename to fhem/FHEM/70_TellStick.pm
diff --git a/FHEM/70_USBWX.pm b/fhem/FHEM/70_USBWX.pm
similarity index 100%
rename from FHEM/70_USBWX.pm
rename to fhem/FHEM/70_USBWX.pm
diff --git a/FHEM/70_WS3600.pm b/fhem/FHEM/70_WS3600.pm
similarity index 100%
rename from FHEM/70_WS3600.pm
rename to fhem/FHEM/70_WS3600.pm
diff --git a/FHEM/71_YAMAHA_AVR.pm b/fhem/FHEM/71_YAMAHA_AVR.pm
similarity index 100%
rename from FHEM/71_YAMAHA_AVR.pm
rename to fhem/FHEM/71_YAMAHA_AVR.pm
diff --git a/FHEM/72_FB_CALLMONITOR.pm b/fhem/FHEM/72_FB_CALLMONITOR.pm
similarity index 100%
rename from FHEM/72_FB_CALLMONITOR.pm
rename to fhem/FHEM/72_FB_CALLMONITOR.pm
diff --git a/FHEM/75_MSG.pm b/fhem/FHEM/75_MSG.pm
similarity index 100%
rename from FHEM/75_MSG.pm
rename to fhem/FHEM/75_MSG.pm
diff --git a/FHEM/76_MSGFile.pm b/fhem/FHEM/76_MSGFile.pm
similarity index 100%
rename from FHEM/76_MSGFile.pm
rename to fhem/FHEM/76_MSGFile.pm
diff --git a/FHEM/76_MSGMail.pm b/fhem/FHEM/76_MSGMail.pm
similarity index 100%
rename from FHEM/76_MSGMail.pm
rename to fhem/FHEM/76_MSGMail.pm
diff --git a/FHEM/80_M232.pm b/fhem/FHEM/80_M232.pm
similarity index 100%
rename from FHEM/80_M232.pm
rename to fhem/FHEM/80_M232.pm
diff --git a/FHEM/80_xxLG7000.pm b/fhem/FHEM/80_xxLG7000.pm
similarity index 100%
rename from FHEM/80_xxLG7000.pm
rename to fhem/FHEM/80_xxLG7000.pm
diff --git a/FHEM/81_M232Counter.pm b/fhem/FHEM/81_M232Counter.pm
similarity index 100%
rename from FHEM/81_M232Counter.pm
rename to fhem/FHEM/81_M232Counter.pm
diff --git a/FHEM/82_LGTV.pm b/fhem/FHEM/82_LGTV.pm
similarity index 100%
rename from FHEM/82_LGTV.pm
rename to fhem/FHEM/82_LGTV.pm
diff --git a/FHEM/82_M232Voltage.pm b/fhem/FHEM/82_M232Voltage.pm
similarity index 100%
rename from FHEM/82_M232Voltage.pm
rename to fhem/FHEM/82_M232Voltage.pm
diff --git a/FHEM/87_WS2000.pm b/fhem/FHEM/87_WS2000.pm
similarity index 100%
rename from FHEM/87_WS2000.pm
rename to fhem/FHEM/87_WS2000.pm
diff --git a/FHEM/88_ALL4000T.pm b/fhem/FHEM/88_ALL4000T.pm
similarity index 100%
rename from FHEM/88_ALL4000T.pm
rename to fhem/FHEM/88_ALL4000T.pm
diff --git a/FHEM/88_IPWE.pm b/fhem/FHEM/88_IPWE.pm
similarity index 100%
rename from FHEM/88_IPWE.pm
rename to fhem/FHEM/88_IPWE.pm
diff --git a/FHEM/88_Itach_Relay.pm b/fhem/FHEM/88_Itach_Relay.pm
similarity index 100%
rename from FHEM/88_Itach_Relay.pm
rename to fhem/FHEM/88_Itach_Relay.pm
diff --git a/FHEM/88_VantagePro2.pm b/fhem/FHEM/88_VantagePro2.pm
similarity index 100%
rename from FHEM/88_VantagePro2.pm
rename to fhem/FHEM/88_VantagePro2.pm
diff --git a/FHEM/88_WEBCOUNT.pm b/fhem/FHEM/88_WEBCOUNT.pm
similarity index 100%
rename from FHEM/88_WEBCOUNT.pm
rename to fhem/FHEM/88_WEBCOUNT.pm
diff --git a/FHEM/90_at.pm b/fhem/FHEM/90_at.pm
similarity index 100%
rename from FHEM/90_at.pm
rename to fhem/FHEM/90_at.pm
diff --git a/FHEM/91_notify.pm b/fhem/FHEM/91_notify.pm
similarity index 100%
rename from FHEM/91_notify.pm
rename to fhem/FHEM/91_notify.pm
diff --git a/FHEM/91_sequence.pm b/fhem/FHEM/91_sequence.pm
similarity index 100%
rename from FHEM/91_sequence.pm
rename to fhem/FHEM/91_sequence.pm
diff --git a/FHEM/91_watchdog.pm b/fhem/FHEM/91_watchdog.pm
similarity index 100%
rename from FHEM/91_watchdog.pm
rename to fhem/FHEM/91_watchdog.pm
diff --git a/FHEM/92_FileLog.pm b/fhem/FHEM/92_FileLog.pm
similarity index 100%
rename from FHEM/92_FileLog.pm
rename to fhem/FHEM/92_FileLog.pm
diff --git a/FHEM/93_DbLog.pm b/fhem/FHEM/93_DbLog.pm
similarity index 100%
rename from FHEM/93_DbLog.pm
rename to fhem/FHEM/93_DbLog.pm
diff --git a/FHEM/93_FHEM2FHEM.pm b/fhem/FHEM/93_FHEM2FHEM.pm
similarity index 100%
rename from FHEM/93_FHEM2FHEM.pm
rename to fhem/FHEM/93_FHEM2FHEM.pm
diff --git a/FHEM/95_FLOORPLAN.pm b/fhem/FHEM/95_FLOORPLAN.pm
similarity index 100%
rename from FHEM/95_FLOORPLAN.pm
rename to fhem/FHEM/95_FLOORPLAN.pm
diff --git a/FHEM/95_PachLog.pm b/fhem/FHEM/95_PachLog.pm
similarity index 100%
rename from FHEM/95_PachLog.pm
rename to fhem/FHEM/95_PachLog.pm
diff --git a/FHEM/95_holiday.pm b/fhem/FHEM/95_holiday.pm
similarity index 100%
rename from FHEM/95_holiday.pm
rename to fhem/FHEM/95_holiday.pm
diff --git a/FHEM/98_CULflash.pm b/fhem/FHEM/98_CULflash.pm
similarity index 100%
rename from FHEM/98_CULflash.pm
rename to fhem/FHEM/98_CULflash.pm
diff --git a/FHEM/98_JsonList.pm b/fhem/FHEM/98_JsonList.pm
similarity index 100%
rename from FHEM/98_JsonList.pm
rename to fhem/FHEM/98_JsonList.pm
diff --git a/FHEM/98_PID.pm b/fhem/FHEM/98_PID.pm
similarity index 100%
rename from FHEM/98_PID.pm
rename to fhem/FHEM/98_PID.pm
diff --git a/FHEM/98_SVG.pm b/fhem/FHEM/98_SVG.pm
similarity index 100%
rename from FHEM/98_SVG.pm
rename to fhem/FHEM/98_SVG.pm
diff --git a/FHEM/98_WOL.pm b/fhem/FHEM/98_WOL.pm
similarity index 100%
rename from FHEM/98_WOL.pm
rename to fhem/FHEM/98_WOL.pm
diff --git a/FHEM/98_XmlList.pm b/fhem/FHEM/98_XmlList.pm
similarity index 100%
rename from FHEM/98_XmlList.pm
rename to fhem/FHEM/98_XmlList.pm
diff --git a/FHEM/98_autocreate.pm b/fhem/FHEM/98_autocreate.pm
similarity index 100%
rename from FHEM/98_autocreate.pm
rename to fhem/FHEM/98_autocreate.pm
diff --git a/FHEM/98_average.pm b/fhem/FHEM/98_average.pm
similarity index 100%
rename from FHEM/98_average.pm
rename to fhem/FHEM/98_average.pm
diff --git a/FHEM/98_backup.pm b/fhem/FHEM/98_backup.pm
similarity index 100%
rename from FHEM/98_backup.pm
rename to fhem/FHEM/98_backup.pm
diff --git a/FHEM/98_dewpoint.pm b/fhem/FHEM/98_dewpoint.pm
similarity index 100%
rename from FHEM/98_dewpoint.pm
rename to fhem/FHEM/98_dewpoint.pm
diff --git a/FHEM/98_dummy.pm b/fhem/FHEM/98_dummy.pm
similarity index 100%
rename from FHEM/98_dummy.pm
rename to fhem/FHEM/98_dummy.pm
diff --git a/FHEM/98_fheminfo.pm b/fhem/FHEM/98_fheminfo.pm
similarity index 100%
rename from FHEM/98_fheminfo.pm
rename to fhem/FHEM/98_fheminfo.pm
diff --git a/FHEM/98_structure.pm b/fhem/FHEM/98_structure.pm
similarity index 100%
rename from FHEM/98_structure.pm
rename to fhem/FHEM/98_structure.pm
diff --git a/FHEM/98_telnet.pm b/fhem/FHEM/98_telnet.pm
similarity index 100%
rename from FHEM/98_telnet.pm
rename to fhem/FHEM/98_telnet.pm
diff --git a/FHEM/98_update.pm b/fhem/FHEM/98_update.pm
similarity index 100%
rename from FHEM/98_update.pm
rename to fhem/FHEM/98_update.pm
diff --git a/FHEM/98_weblink.pm b/fhem/FHEM/98_weblink.pm
similarity index 100%
rename from FHEM/98_weblink.pm
rename to fhem/FHEM/98_weblink.pm
diff --git a/FHEM/99_SUNRISE_EL.pm b/fhem/FHEM/99_SUNRISE_EL.pm
similarity index 100%
rename from FHEM/99_SUNRISE_EL.pm
rename to fhem/FHEM/99_SUNRISE_EL.pm
diff --git a/FHEM/99_Utils.pm b/fhem/FHEM/99_Utils.pm
similarity index 100%
rename from FHEM/99_Utils.pm
rename to fhem/FHEM/99_Utils.pm
diff --git a/FHEM/DevIo.pm b/fhem/FHEM/DevIo.pm
similarity index 100%
rename from FHEM/DevIo.pm
rename to fhem/FHEM/DevIo.pm
diff --git a/FHEM/FhemUtils/release.pm b/fhem/FHEM/FhemUtils/release.pm
similarity index 100%
rename from FHEM/FhemUtils/release.pm
rename to fhem/FHEM/FhemUtils/release.pm
diff --git a/FHEM/FritzBoxUtils.pm b/fhem/FHEM/FritzBoxUtils.pm
similarity index 100%
rename from FHEM/FritzBoxUtils.pm
rename to fhem/FHEM/FritzBoxUtils.pm
diff --git a/FHEM/HttpUtils.pm b/fhem/FHEM/HttpUtils.pm
similarity index 100%
rename from FHEM/HttpUtils.pm
rename to fhem/FHEM/HttpUtils.pm
diff --git a/FHEM/TcpServerUtils.pm b/fhem/FHEM/TcpServerUtils.pm
similarity index 100%
rename from FHEM/TcpServerUtils.pm
rename to fhem/FHEM/TcpServerUtils.pm
diff --git a/HISTORY b/fhem/HISTORY
similarity index 100%
rename from HISTORY
rename to fhem/HISTORY
diff --git a/Makefile b/fhem/Makefile
similarity index 100%
rename from Makefile
rename to fhem/Makefile
diff --git a/README.SVN b/fhem/README.SVN
similarity index 100%
rename from README.SVN
rename to fhem/README.SVN
diff --git a/contrib/00_TAHR.pm b/fhem/contrib/00_TAHR.pm
similarity index 100%
rename from contrib/00_TAHR.pm
rename to fhem/contrib/00_TAHR.pm
diff --git a/contrib/10_UNIRoll.pm b/fhem/contrib/10_UNIRoll.pm
similarity index 100%
rename from contrib/10_UNIRoll.pm
rename to fhem/contrib/10_UNIRoll.pm
diff --git a/contrib/11_FHT8V.pm b/fhem/contrib/11_FHT8V.pm
similarity index 100%
rename from contrib/11_FHT8V.pm
rename to fhem/contrib/11_FHT8V.pm
diff --git a/contrib/21_OWTEMP.pm.fork b/fhem/contrib/21_OWTEMP.pm.fork
similarity index 100%
rename from contrib/21_OWTEMP.pm.fork
rename to fhem/contrib/21_OWTEMP.pm.fork
diff --git a/contrib/23_LUXTRONIK2.pm b/fhem/contrib/23_LUXTRONIK2.pm
similarity index 100%
rename from contrib/23_LUXTRONIK2.pm
rename to fhem/contrib/23_LUXTRONIK2.pm
diff --git a/contrib/58_GPIO4.pm b/fhem/contrib/58_GPIO4.pm
similarity index 100%
rename from contrib/58_GPIO4.pm
rename to fhem/contrib/58_GPIO4.pm
diff --git a/contrib/58_SecvestIP.pm b/fhem/contrib/58_SecvestIP.pm
similarity index 100%
rename from contrib/58_SecvestIP.pm
rename to fhem/contrib/58_SecvestIP.pm
diff --git a/contrib/64_ESA.pm b/fhem/contrib/64_ESA.pm
similarity index 100%
rename from contrib/64_ESA.pm
rename to fhem/contrib/64_ESA.pm
diff --git a/contrib/70_NT5000.pm b/fhem/contrib/70_NT5000.pm
similarity index 100%
rename from contrib/70_NT5000.pm
rename to fhem/contrib/70_NT5000.pm
diff --git a/contrib/70_SolarView.pm b/fhem/contrib/70_SolarView.pm
similarity index 100%
rename from contrib/70_SolarView.pm
rename to fhem/contrib/70_SolarView.pm
diff --git a/contrib/86_FS10.pm b/fhem/contrib/86_FS10.pm
similarity index 100%
rename from contrib/86_FS10.pm
rename to fhem/contrib/86_FS10.pm
diff --git a/contrib/90_EIBUPDOWN.pm b/fhem/contrib/90_EIBUPDOWN.pm
similarity index 100%
rename from contrib/90_EIBUPDOWN.pm
rename to fhem/contrib/90_EIBUPDOWN.pm
diff --git a/contrib/91_DbLog.pm b/fhem/contrib/91_DbLog.pm
similarity index 100%
rename from contrib/91_DbLog.pm
rename to fhem/contrib/91_DbLog.pm
diff --git a/contrib/95_FLOORPLAN/99_myFloorplanList.pm b/fhem/contrib/95_FLOORPLAN/99_myFloorplanList.pm
similarity index 100%
rename from contrib/95_FLOORPLAN/99_myFloorplanList.pm
rename to fhem/contrib/95_FLOORPLAN/99_myFloorplanList.pm
diff --git a/contrib/95_FLOORPLAN/fhem-floorplan-installation-guide_de.pdf b/fhem/contrib/95_FLOORPLAN/fhem-floorplan-installation-guide_de.pdf
similarity index 100%
rename from contrib/95_FLOORPLAN/fhem-floorplan-installation-guide_de.pdf
rename to fhem/contrib/95_FLOORPLAN/fhem-floorplan-installation-guide_de.pdf
diff --git a/contrib/95_VIEW.pm b/fhem/contrib/95_VIEW.pm
similarity index 100%
rename from contrib/95_VIEW.pm
rename to fhem/contrib/95_VIEW.pm
diff --git a/contrib/97_GROUP.pm b/fhem/contrib/97_GROUP.pm
similarity index 100%
rename from contrib/97_GROUP.pm
rename to fhem/contrib/97_GROUP.pm
diff --git a/contrib/98_FHTCONF.pm b/fhem/contrib/98_FHTCONF.pm
similarity index 100%
rename from contrib/98_FHTCONF.pm
rename to fhem/contrib/98_FHTCONF.pm
diff --git a/contrib/98_HOL.pm b/fhem/contrib/98_HOL.pm
similarity index 100%
rename from contrib/98_HOL.pm
rename to fhem/contrib/98_HOL.pm
diff --git a/contrib/99_ALARM.pm b/fhem/contrib/99_ALARM.pm
similarity index 100%
rename from contrib/99_ALARM.pm
rename to fhem/contrib/99_ALARM.pm
diff --git a/contrib/99_PID.pm b/fhem/contrib/99_PID.pm
similarity index 100%
rename from contrib/99_PID.pm
rename to fhem/contrib/99_PID.pm
diff --git a/contrib/99_PRIV.pm b/fhem/contrib/99_PRIV.pm
similarity index 100%
rename from contrib/99_PRIV.pm
rename to fhem/contrib/99_PRIV.pm
diff --git a/contrib/99_SUNRISE.pm b/fhem/contrib/99_SUNRISE.pm
similarity index 100%
rename from contrib/99_SUNRISE.pm
rename to fhem/contrib/99_SUNRISE.pm
diff --git a/contrib/99_TXT.pm b/fhem/contrib/99_TXT.pm
similarity index 100%
rename from contrib/99_TXT.pm
rename to fhem/contrib/99_TXT.pm
diff --git a/contrib/99_Taupunkt.pm b/fhem/contrib/99_Taupunkt.pm
similarity index 100%
rename from contrib/99_Taupunkt.pm
rename to fhem/contrib/99_Taupunkt.pm
diff --git a/contrib/99_dumpdef.pm b/fhem/contrib/99_dumpdef.pm
similarity index 100%
rename from contrib/99_dumpdef.pm
rename to fhem/contrib/99_dumpdef.pm
diff --git a/contrib/99_priv_cgi.pm b/fhem/contrib/99_priv_cgi.pm
similarity index 100%
rename from contrib/99_priv_cgi.pm
rename to fhem/contrib/99_priv_cgi.pm
diff --git a/contrib/99_twitter.pm b/fhem/contrib/99_twitter.pm
similarity index 100%
rename from contrib/99_twitter.pm
rename to fhem/contrib/99_twitter.pm
diff --git a/contrib/DEBIAN/conffiles b/fhem/contrib/DEBIAN/conffiles
similarity index 100%
rename from contrib/DEBIAN/conffiles
rename to fhem/contrib/DEBIAN/conffiles
diff --git a/contrib/DEBIAN/control b/fhem/contrib/DEBIAN/control
similarity index 100%
rename from contrib/DEBIAN/control
rename to fhem/contrib/DEBIAN/control
diff --git a/contrib/DEBIAN/postinst b/fhem/contrib/DEBIAN/postinst
similarity index 100%
rename from contrib/DEBIAN/postinst
rename to fhem/contrib/DEBIAN/postinst
diff --git a/contrib/DEBIAN/postrm b/fhem/contrib/DEBIAN/postrm
similarity index 100%
rename from contrib/DEBIAN/postrm
rename to fhem/contrib/DEBIAN/postrm
diff --git a/contrib/DEBIAN/prerm b/fhem/contrib/DEBIAN/prerm
similarity index 100%
rename from contrib/DEBIAN/prerm
rename to fhem/contrib/DEBIAN/prerm
diff --git a/contrib/DeviceMonitor/98_DeviceMonitor.pm b/fhem/contrib/DeviceMonitor/98_DeviceMonitor.pm
similarity index 100%
rename from contrib/DeviceMonitor/98_DeviceMonitor.pm
rename to fhem/contrib/DeviceMonitor/98_DeviceMonitor.pm
diff --git a/contrib/FB7270/fhemcmd.sh b/fhem/contrib/FB7270/fhemcmd.sh
similarity index 100%
rename from contrib/FB7270/fhemcmd.sh
rename to fhem/contrib/FB7270/fhemcmd.sh
diff --git a/contrib/FB7270/makeimage b/fhem/contrib/FB7270/makeimage
similarity index 100%
rename from contrib/FB7270/makeimage
rename to fhem/contrib/FB7270/makeimage
diff --git a/contrib/FB7270/startfhem b/fhem/contrib/FB7270/startfhem
similarity index 100%
rename from contrib/FB7270/startfhem
rename to fhem/contrib/FB7270/startfhem
diff --git a/contrib/FB7390/cleanAVMperl b/fhem/contrib/FB7390/cleanAVMperl
similarity index 100%
rename from contrib/FB7390/cleanAVMperl
rename to fhem/contrib/FB7390/cleanAVMperl
diff --git a/contrib/FB7390/fhemcmd.sh b/fhem/contrib/FB7390/fhemcmd.sh
similarity index 100%
rename from contrib/FB7390/fhemcmd.sh
rename to fhem/contrib/FB7390/fhemcmd.sh
diff --git a/contrib/FB7390/install b/fhem/contrib/FB7390/install
similarity index 100%
rename from contrib/FB7390/install
rename to fhem/contrib/FB7390/install
diff --git a/contrib/FB7390/makeimage b/fhem/contrib/FB7390/makeimage
similarity index 100%
rename from contrib/FB7390/makeimage
rename to fhem/contrib/FB7390/makeimage
diff --git a/contrib/FB7390/startfhem b/fhem/contrib/FB7390/startfhem
similarity index 100%
rename from contrib/FB7390/startfhem
rename to fhem/contrib/FB7390/startfhem
diff --git a/contrib/HM-USB-CFG/00_HMLAN.pm b/fhem/contrib/HM-USB-CFG/00_HMLAN.pm
similarity index 100%
rename from contrib/HM-USB-CFG/00_HMLAN.pm
rename to fhem/contrib/HM-USB-CFG/00_HMLAN.pm
diff --git a/contrib/HM-USB-CFG/DevIo.pm b/fhem/contrib/HM-USB-CFG/DevIo.pm
similarity index 100%
rename from contrib/HM-USB-CFG/DevIo.pm
rename to fhem/contrib/HM-USB-CFG/DevIo.pm
diff --git a/contrib/HM-USB-CFG/README.txt b/fhem/contrib/HM-USB-CFG/README.txt
similarity index 100%
rename from contrib/HM-USB-CFG/README.txt
rename to fhem/contrib/HM-USB-CFG/README.txt
diff --git a/contrib/HMRPC/00_HMRPC.pm b/fhem/contrib/HMRPC/00_HMRPC.pm
similarity index 100%
rename from contrib/HMRPC/00_HMRPC.pm
rename to fhem/contrib/HMRPC/00_HMRPC.pm
diff --git a/contrib/HMRPC/01_HMDEV.pm b/fhem/contrib/HMRPC/01_HMDEV.pm
similarity index 100%
rename from contrib/HMRPC/01_HMDEV.pm
rename to fhem/contrib/HMRPC/01_HMDEV.pm
diff --git a/contrib/HMRPC/HMRPC.txt b/fhem/contrib/HMRPC/HMRPC.txt
similarity index 100%
rename from contrib/HMRPC/HMRPC.txt
rename to fhem/contrib/HMRPC/HMRPC.txt
diff --git a/contrib/HMRPC/import_from_webui.bsh b/fhem/contrib/HMRPC/import_from_webui.bsh
similarity index 100%
rename from contrib/HMRPC/import_from_webui.bsh
rename to fhem/contrib/HMRPC/import_from_webui.bsh
diff --git a/contrib/JeeStuff/00_JeeLink.pm b/fhem/contrib/JeeStuff/00_JeeLink.pm
similarity index 100%
rename from contrib/JeeStuff/00_JeeLink.pm
rename to fhem/contrib/JeeStuff/00_JeeLink.pm
diff --git a/contrib/JeeStuff/18_JME.pm b/fhem/contrib/JeeStuff/18_JME.pm
similarity index 100%
rename from contrib/JeeStuff/18_JME.pm
rename to fhem/contrib/JeeStuff/18_JME.pm
diff --git a/contrib/JeeStuff/18_JSN.pm b/fhem/contrib/JeeStuff/18_JSN.pm
similarity index 100%
rename from contrib/JeeStuff/18_JSN.pm
rename to fhem/contrib/JeeStuff/18_JSN.pm
diff --git a/contrib/JeeStuff/FHEM_JSN_BMP85.pde b/fhem/contrib/JeeStuff/FHEM_JSN_BMP85.pde
similarity index 100%
rename from contrib/JeeStuff/FHEM_JSN_BMP85.pde
rename to fhem/contrib/JeeStuff/FHEM_JSN_BMP85.pde
diff --git a/contrib/JeeStuff/FHEM_JSN_LUX.pde b/fhem/contrib/JeeStuff/FHEM_JSN_LUX.pde
similarity index 100%
rename from contrib/JeeStuff/FHEM_JSN_LUX.pde
rename to fhem/contrib/JeeStuff/FHEM_JSN_LUX.pde
diff --git a/contrib/JeeStuff/FHEM_JSN_RoomNode.pde b/fhem/contrib/JeeStuff/FHEM_JSN_RoomNode.pde
similarity index 100%
rename from contrib/JeeStuff/FHEM_JSN_RoomNode.pde
rename to fhem/contrib/JeeStuff/FHEM_JSN_RoomNode.pde
diff --git a/contrib/LUX2.gplot b/fhem/contrib/LUX2.gplot
similarity index 100%
rename from contrib/LUX2.gplot
rename to fhem/contrib/LUX2.gplot
diff --git a/contrib/README b/fhem/contrib/README
similarity index 100%
rename from contrib/README
rename to fhem/contrib/README
diff --git a/contrib/README.FS10 b/fhem/contrib/README.FS10
similarity index 100%
rename from contrib/README.FS10
rename to fhem/contrib/README.FS10
diff --git a/contrib/RSSImonitor.pl b/fhem/contrib/RSSImonitor.pl
similarity index 100%
rename from contrib/RSSImonitor.pl
rename to fhem/contrib/RSSImonitor.pl
diff --git a/contrib/RaspberryPi/99_RpiUtils.pm b/fhem/contrib/RaspberryPi/99_RpiUtils.pm
similarity index 100%
rename from contrib/RaspberryPi/99_RpiUtils.pm
rename to fhem/contrib/RaspberryPi/99_RpiUtils.pm
diff --git a/contrib/WBS/18_WBS.pm b/fhem/contrib/WBS/18_WBS.pm
similarity index 100%
rename from contrib/WBS/18_WBS.pm
rename to fhem/contrib/WBS/18_WBS.pm
diff --git a/contrib/WBS/99_CGI_RAWMSG.pm b/fhem/contrib/WBS/99_CGI_RAWMSG.pm
similarity index 100%
rename from contrib/WBS/99_CGI_RAWMSG.pm
rename to fhem/contrib/WBS/99_CGI_RAWMSG.pm
diff --git a/contrib/aut.holiday b/fhem/contrib/aut.holiday
similarity index 100%
rename from contrib/aut.holiday
rename to fhem/contrib/aut.holiday
diff --git a/contrib/by.holiday b/fhem/contrib/by.holiday
similarity index 100%
rename from contrib/by.holiday
rename to fhem/contrib/by.holiday
diff --git a/contrib/checkmsg.pl b/fhem/contrib/checkmsg.pl
similarity index 100%
rename from contrib/checkmsg.pl
rename to fhem/contrib/checkmsg.pl
diff --git a/contrib/commandref_join.pl b/fhem/contrib/commandref_join.pl
similarity index 100%
rename from contrib/commandref_join.pl
rename to fhem/contrib/commandref_join.pl
diff --git a/contrib/commandref_split.pl b/fhem/contrib/commandref_split.pl
similarity index 100%
rename from contrib/commandref_split.pl
rename to fhem/contrib/commandref_split.pl
diff --git a/contrib/crc.pl b/fhem/contrib/crc.pl
similarity index 100%
rename from contrib/crc.pl
rename to fhem/contrib/crc.pl
diff --git a/contrib/dblog/93_DbLog.pm b/fhem/contrib/dblog/93_DbLog.pm
similarity index 100%
rename from contrib/dblog/93_DbLog.pm
rename to fhem/contrib/dblog/93_DbLog.pm
diff --git a/contrib/dblog/README b/fhem/contrib/dblog/README
similarity index 100%
rename from contrib/dblog/README
rename to fhem/contrib/dblog/README
diff --git a/contrib/dblog/db.conf b/fhem/contrib/dblog/db.conf
similarity index 100%
rename from contrib/dblog/db.conf
rename to fhem/contrib/dblog/db.conf
diff --git a/contrib/dblog/db_create_mysql.sql b/fhem/contrib/dblog/db_create_mysql.sql
similarity index 100%
rename from contrib/dblog/db_create_mysql.sql
rename to fhem/contrib/dblog/db_create_mysql.sql
diff --git a/contrib/dblog/db_create_postgresql.sql b/fhem/contrib/dblog/db_create_postgresql.sql
similarity index 100%
rename from contrib/dblog/db_create_postgresql.sql
rename to fhem/contrib/dblog/db_create_postgresql.sql
diff --git a/contrib/dblog/fhemdb_get.pl b/fhem/contrib/dblog/fhemdb_get.pl
similarity index 100%
rename from contrib/dblog/fhemdb_get.pl
rename to fhem/contrib/dblog/fhemdb_get.pl
diff --git a/contrib/em1010.pl b/fhem/contrib/em1010.pl
similarity index 100%
rename from contrib/em1010.pl
rename to fhem/contrib/em1010.pl
diff --git a/contrib/executables b/fhem/contrib/executables
similarity index 100%
rename from contrib/executables
rename to fhem/contrib/executables
diff --git a/contrib/fhem2fht-bulkupdate.sh b/fhem/contrib/fhem2fht-bulkupdate.sh
similarity index 100%
rename from contrib/fhem2fht-bulkupdate.sh
rename to fhem/contrib/fhem2fht-bulkupdate.sh
diff --git a/contrib/fhem2speech/ChangeLog b/fhem/contrib/fhem2speech/ChangeLog
similarity index 100%
rename from contrib/fhem2speech/ChangeLog
rename to fhem/contrib/fhem2speech/ChangeLog
diff --git a/contrib/fhem2speech/JSON-XS-2.231.tar.gz b/fhem/contrib/fhem2speech/JSON-XS-2.231.tar.gz
similarity index 100%
rename from contrib/fhem2speech/JSON-XS-2.231.tar.gz
rename to fhem/contrib/fhem2speech/JSON-XS-2.231.tar.gz
diff --git a/contrib/fhem2speech/README.fhem-speech b/fhem/contrib/fhem2speech/README.fhem-speech
similarity index 100%
rename from contrib/fhem2speech/README.fhem-speech
rename to fhem/contrib/fhem2speech/README.fhem-speech
diff --git a/contrib/fhem2speech/extensions.conf b/fhem/contrib/fhem2speech/extensions.conf
similarity index 100%
rename from contrib/fhem2speech/extensions.conf
rename to fhem/contrib/fhem2speech/extensions.conf
diff --git a/contrib/fhem2speech/fhem-speech b/fhem/contrib/fhem2speech/fhem-speech
similarity index 100%
rename from contrib/fhem2speech/fhem-speech
rename to fhem/contrib/fhem2speech/fhem-speech
diff --git a/contrib/fhem2speech/fhem-speech.agi b/fhem/contrib/fhem2speech/fhem-speech.agi
similarity index 100%
rename from contrib/fhem2speech/fhem-speech.agi
rename to fhem/contrib/fhem2speech/fhem-speech.agi
diff --git a/contrib/fhemupdate.control.fhem b/fhem/contrib/fhemupdate.control.fhem
similarity index 100%
rename from contrib/fhemupdate.control.fhem
rename to fhem/contrib/fhemupdate.control.fhem
diff --git a/contrib/fhemupdate.pl b/fhem/contrib/fhemupdate.pl
similarity index 100%
rename from contrib/fhemupdate.pl
rename to fhem/contrib/fhemupdate.pl
diff --git a/contrib/fht.gnuplot b/fhem/contrib/fht.gnuplot
similarity index 100%
rename from contrib/fht.gnuplot
rename to fhem/contrib/fht.gnuplot
diff --git a/contrib/four2hex/Makefile b/fhem/contrib/four2hex/Makefile
similarity index 100%
rename from contrib/four2hex/Makefile
rename to fhem/contrib/four2hex/Makefile
diff --git a/contrib/four2hex/README b/fhem/contrib/four2hex/README
similarity index 100%
rename from contrib/four2hex/README
rename to fhem/contrib/four2hex/README
diff --git a/contrib/four2hex/four2hex.c b/fhem/contrib/four2hex/four2hex.c
similarity index 100%
rename from contrib/four2hex/four2hex.c
rename to fhem/contrib/four2hex/four2hex.c
diff --git a/contrib/fs20_holidays.sh b/fhem/contrib/fs20_holidays.sh
similarity index 100%
rename from contrib/fs20_holidays.sh
rename to fhem/contrib/fs20_holidays.sh
diff --git a/contrib/garden.pl b/fhem/contrib/garden.pl
similarity index 100%
rename from contrib/garden.pl
rename to fhem/contrib/garden.pl
diff --git a/contrib/getstate/99_getstate.pm b/fhem/contrib/getstate/99_getstate.pm
similarity index 100%
rename from contrib/getstate/99_getstate.pm
rename to fhem/contrib/getstate/99_getstate.pm
diff --git a/contrib/getstate/README.getstate b/fhem/contrib/getstate/README.getstate
similarity index 100%
rename from contrib/getstate/README.getstate
rename to fhem/contrib/getstate/README.getstate
diff --git a/contrib/getstate/fhem-getstate b/fhem/contrib/getstate/fhem-getstate
similarity index 100%
rename from contrib/getstate/fhem-getstate
rename to fhem/contrib/getstate/fhem-getstate
diff --git a/contrib/gplotmapping.txt b/fhem/contrib/gplotmapping.txt
similarity index 100%
rename from contrib/gplotmapping.txt
rename to fhem/contrib/gplotmapping.txt
diff --git a/contrib/he.holiday b/fhem/contrib/he.holiday
similarity index 100%
rename from contrib/he.holiday
rename to fhem/contrib/he.holiday
diff --git a/contrib/init-scripts/fhem.1 b/fhem/contrib/init-scripts/fhem.1
similarity index 100%
rename from contrib/init-scripts/fhem.1
rename to fhem/contrib/init-scripts/fhem.1
diff --git a/contrib/init-scripts/fhem.2 b/fhem/contrib/init-scripts/fhem.2
similarity index 100%
rename from contrib/init-scripts/fhem.2
rename to fhem/contrib/init-scripts/fhem.2
diff --git a/contrib/init-scripts/fhem.3 b/fhem/contrib/init-scripts/fhem.3
similarity index 100%
rename from contrib/init-scripts/fhem.3
rename to fhem/contrib/init-scripts/fhem.3
diff --git a/contrib/init-scripts/fhem.upstart b/fhem/contrib/init-scripts/fhem.upstart
similarity index 100%
rename from contrib/init-scripts/fhem.upstart
rename to fhem/contrib/init-scripts/fhem.upstart
diff --git a/contrib/inputevent/89_inputevent.pm b/fhem/contrib/inputevent/89_inputevent.pm
similarity index 100%
rename from contrib/inputevent/89_inputevent.pm
rename to fhem/contrib/inputevent/89_inputevent.pm
diff --git a/contrib/inputevent/inputevent.txt b/fhem/contrib/inputevent/inputevent.txt
similarity index 100%
rename from contrib/inputevent/inputevent.txt
rename to fhem/contrib/inputevent/inputevent.txt
diff --git a/contrib/inputevent/sample.conf b/fhem/contrib/inputevent/sample.conf
similarity index 100%
rename from contrib/inputevent/sample.conf
rename to fhem/contrib/inputevent/sample.conf
diff --git a/contrib/inputevent/vdr-plugin-remote.diff b/fhem/contrib/inputevent/vdr-plugin-remote.diff
similarity index 100%
rename from contrib/inputevent/vdr-plugin-remote.diff
rename to fhem/contrib/inputevent/vdr-plugin-remote.diff
diff --git a/contrib/km271.pl b/fhem/contrib/km271.pl
similarity index 100%
rename from contrib/km271.pl
rename to fhem/contrib/km271.pl
diff --git a/contrib/ks300avg.pl b/fhem/contrib/ks300avg.pl
similarity index 100%
rename from contrib/ks300avg.pl
rename to fhem/contrib/ks300avg.pl
diff --git a/contrib/munin/fhem_fht80b_ b/fhem/contrib/munin/fhem_fht80b_
similarity index 100%
rename from contrib/munin/fhem_fht80b_
rename to fhem/contrib/munin/fhem_fht80b_
diff --git a/contrib/munin/fhem_hms100_ b/fhem/contrib/munin/fhem_hms100_
similarity index 100%
rename from contrib/munin/fhem_hms100_
rename to fhem/contrib/munin/fhem_hms100_
diff --git a/contrib/nagios/check_fhem_sensor_battery.sh b/fhem/contrib/nagios/check_fhem_sensor_battery.sh
similarity index 100%
rename from contrib/nagios/check_fhem_sensor_battery.sh
rename to fhem/contrib/nagios/check_fhem_sensor_battery.sh
diff --git a/contrib/remove_serialport_for_cul.patch b/fhem/contrib/remove_serialport_for_cul.patch
similarity index 100%
rename from contrib/remove_serialport_for_cul.patch
rename to fhem/contrib/remove_serialport_for_cul.patch
diff --git a/contrib/rolwzo_not_off.sh b/fhem/contrib/rolwzo_not_off.sh
similarity index 100%
rename from contrib/rolwzo_not_off.sh
rename to fhem/contrib/rolwzo_not_off.sh
diff --git a/contrib/rotateShiftWork/README.rotateShiftWork b/fhem/contrib/rotateShiftWork/README.rotateShiftWork
similarity index 100%
rename from contrib/rotateShiftWork/README.rotateShiftWork
rename to fhem/contrib/rotateShiftWork/README.rotateShiftWork
diff --git a/contrib/rotateShiftWork/rotateShiftWork.sh b/fhem/contrib/rotateShiftWork/rotateShiftWork.sh
similarity index 100%
rename from contrib/rotateShiftWork/rotateShiftWork.sh
rename to fhem/contrib/rotateShiftWork/rotateShiftWork.sh
diff --git a/contrib/rrd/95_RRD_Log.pm b/fhem/contrib/rrd/95_RRD_Log.pm
similarity index 100%
rename from contrib/rrd/95_RRD_Log.pm
rename to fhem/contrib/rrd/95_RRD_Log.pm
diff --git a/contrib/rrd/98_RRD.pm b/fhem/contrib/rrd/98_RRD.pm
similarity index 100%
rename from contrib/rrd/98_RRD.pm
rename to fhem/contrib/rrd/98_RRD.pm
diff --git a/contrib/rrd/fhz1000-rrd-howto.txt b/fhem/contrib/rrd/fhz1000-rrd-howto.txt
similarity index 100%
rename from contrib/rrd/fhz1000-rrd-howto.txt
rename to fhem/contrib/rrd/fhz1000-rrd-howto.txt
diff --git a/contrib/serial.pl b/fhem/contrib/serial.pl
similarity index 100%
rename from contrib/serial.pl
rename to fhem/contrib/serial.pl
diff --git a/contrib/statistics/data/README_GeoLiteCity.dat b/fhem/contrib/statistics/data/README_GeoLiteCity.dat
similarity index 100%
rename from contrib/statistics/data/README_GeoLiteCity.dat
rename to fhem/contrib/statistics/data/README_GeoLiteCity.dat
diff --git a/contrib/statistics/data/README_fhem_statistics_db.sqlite b/fhem/contrib/statistics/data/README_fhem_statistics_db.sqlite
similarity index 100%
rename from contrib/statistics/data/README_fhem_statistics_db.sqlite
rename to fhem/contrib/statistics/data/README_fhem_statistics_db.sqlite
diff --git a/contrib/statistics/lib/Geo/IP.pm b/fhem/contrib/statistics/lib/Geo/IP.pm
similarity index 100%
rename from contrib/statistics/lib/Geo/IP.pm
rename to fhem/contrib/statistics/lib/Geo/IP.pm
diff --git a/contrib/statistics/lib/Geo/IP/Record.pm b/fhem/contrib/statistics/lib/Geo/IP/Record.pm
similarity index 100%
rename from contrib/statistics/lib/Geo/IP/Record.pm
rename to fhem/contrib/statistics/lib/Geo/IP/Record.pm
diff --git a/contrib/statistics/lib/Geo/IP/Record.pod b/fhem/contrib/statistics/lib/Geo/IP/Record.pod
similarity index 100%
rename from contrib/statistics/lib/Geo/IP/Record.pod
rename to fhem/contrib/statistics/lib/Geo/IP/Record.pod
diff --git a/contrib/statistics/lib/Geo/Mirror.pm b/fhem/contrib/statistics/lib/Geo/Mirror.pm
similarity index 100%
rename from contrib/statistics/lib/Geo/Mirror.pm
rename to fhem/contrib/statistics/lib/Geo/Mirror.pm
diff --git a/contrib/statistics/statistics.cgi b/fhem/contrib/statistics/statistics.cgi
similarity index 100%
rename from contrib/statistics/statistics.cgi
rename to fhem/contrib/statistics/statistics.cgi
diff --git a/contrib/survey.pl b/fhem/contrib/survey.pl
similarity index 100%
rename from contrib/survey.pl
rename to fhem/contrib/survey.pl
diff --git a/contrib/tcptee.pl b/fhem/contrib/tcptee.pl
similarity index 100%
rename from contrib/tcptee.pl
rename to fhem/contrib/tcptee.pl
diff --git a/contrib/voip2fhem/CHANGED b/fhem/contrib/voip2fhem/CHANGED
similarity index 100%
rename from contrib/voip2fhem/CHANGED
rename to fhem/contrib/voip2fhem/CHANGED
diff --git a/contrib/voip2fhem/HISTORY b/fhem/contrib/voip2fhem/HISTORY
similarity index 100%
rename from contrib/voip2fhem/HISTORY
rename to fhem/contrib/voip2fhem/HISTORY
diff --git a/contrib/voip2fhem/README b/fhem/contrib/voip2fhem/README
similarity index 100%
rename from contrib/voip2fhem/README
rename to fhem/contrib/voip2fhem/README
diff --git a/contrib/voip2fhem/README.html b/fhem/contrib/voip2fhem/README.html
similarity index 100%
rename from contrib/voip2fhem/README.html
rename to fhem/contrib/voip2fhem/README.html
diff --git a/contrib/voip2fhem/extensions.conf b/fhem/contrib/voip2fhem/extensions.conf
similarity index 100%
rename from contrib/voip2fhem/extensions.conf
rename to fhem/contrib/voip2fhem/extensions.conf
diff --git a/contrib/voip2fhem/sip.conf b/fhem/contrib/voip2fhem/sip.conf
similarity index 100%
rename from contrib/voip2fhem/sip.conf
rename to fhem/contrib/voip2fhem/sip.conf
diff --git a/contrib/voip2fhem/voip2fhem b/fhem/contrib/voip2fhem/voip2fhem
similarity index 100%
rename from contrib/voip2fhem/voip2fhem
rename to fhem/contrib/voip2fhem/voip2fhem
diff --git a/contrib/voip2fhem/voip2fhem_create_telefonlist b/fhem/contrib/voip2fhem/voip2fhem_create_telefonlist
similarity index 100%
rename from contrib/voip2fhem/voip2fhem_create_telefonlist
rename to fhem/contrib/voip2fhem/voip2fhem_create_telefonlist
diff --git a/contrib/voip2fhem/voip2fhem_create_txt2gsm b/fhem/contrib/voip2fhem/voip2fhem_create_txt2gsm
similarity index 100%
rename from contrib/voip2fhem/voip2fhem_create_txt2gsm
rename to fhem/contrib/voip2fhem/voip2fhem_create_txt2gsm
diff --git a/contrib/ws2000_reader.pl b/fhem/contrib/ws2000_reader.pl
similarity index 100%
rename from contrib/ws2000_reader.pl
rename to fhem/contrib/ws2000_reader.pl
diff --git a/docs/BS.txt b/fhem/docs/BS.txt
similarity index 100%
rename from docs/BS.txt
rename to fhem/docs/BS.txt
diff --git a/docs/Benji.png b/fhem/docs/Benji.png
similarity index 100%
rename from docs/Benji.png
rename to fhem/docs/Benji.png
diff --git a/docs/EM1000EM.txt b/fhem/docs/EM1000EM.txt
similarity index 100%
rename from docs/EM1000EM.txt
rename to fhem/docs/EM1000EM.txt
diff --git a/docs/HOWTO.html b/fhem/docs/HOWTO.html
similarity index 100%
rename from docs/HOWTO.html
rename to fhem/docs/HOWTO.html
diff --git a/docs/HOWTO_DE.html b/fhem/docs/HOWTO_DE.html
similarity index 100%
rename from docs/HOWTO_DE.html
rename to fhem/docs/HOWTO_DE.html
diff --git a/docs/README b/fhem/docs/README
similarity index 100%
rename from docs/README
rename to fhem/docs/README
diff --git a/docs/README.FS10 b/fhem/docs/README.FS10
similarity index 100%
rename from docs/README.FS10
rename to fhem/docs/README.FS10
diff --git a/docs/USB.html b/fhem/docs/USB.html
similarity index 100%
rename from docs/USB.html
rename to fhem/docs/USB.html
diff --git a/docs/USF1000.txt b/fhem/docs/USF1000.txt
similarity index 100%
rename from docs/USF1000.txt
rename to fhem/docs/USF1000.txt
diff --git a/docs/X10/README b/fhem/docs/X10/README
similarity index 100%
rename from docs/X10/README
rename to fhem/docs/X10/README
diff --git a/docs/X10/protocol.txt b/fhem/docs/X10/protocol.txt
similarity index 100%
rename from docs/X10/protocol.txt
rename to fhem/docs/X10/protocol.txt
diff --git a/docs/ccc.jpg b/fhem/docs/ccc.jpg
similarity index 100%
rename from docs/ccc.jpg
rename to fhem/docs/ccc.jpg
diff --git a/docs/changelog b/fhem/docs/changelog
similarity index 100%
rename from docs/changelog
rename to fhem/docs/changelog
diff --git a/docs/commandref_frame.html b/fhem/docs/commandref_frame.html
similarity index 100%
rename from docs/commandref_frame.html
rename to fhem/docs/commandref_frame.html
diff --git a/docs/commandref_frame_DE.html b/fhem/docs/commandref_frame_DE.html
similarity index 100%
rename from docs/commandref_frame_DE.html
rename to fhem/docs/commandref_frame_DE.html
diff --git a/docs/copyright b/fhem/docs/copyright
similarity index 100%
rename from docs/copyright
rename to fhem/docs/copyright
diff --git a/docs/cul_rfr.jpg b/fhem/docs/cul_rfr.jpg
similarity index 100%
rename from docs/cul_rfr.jpg
rename to fhem/docs/cul_rfr.jpg
diff --git a/docs/dotconfig b/fhem/docs/dotconfig
similarity index 100%
rename from docs/dotconfig
rename to fhem/docs/dotconfig
diff --git a/docs/faq.html b/fhem/docs/faq.html
similarity index 100%
rename from docs/faq.html
rename to fhem/docs/faq.html
diff --git a/docs/fhem-floorplan-installation-guide.pdf b/fhem/docs/fhem-floorplan-installation-guide.pdf
similarity index 100%
rename from docs/fhem-floorplan-installation-guide.pdf
rename to fhem/docs/fhem-floorplan-installation-guide.pdf
diff --git a/docs/fhem-floorplan-installation-guide_de.pdf b/fhem/docs/fhem-floorplan-installation-guide_de.pdf
similarity index 100%
rename from docs/fhem-floorplan-installation-guide_de.pdf
rename to fhem/docs/fhem-floorplan-installation-guide_de.pdf
diff --git a/docs/fhem.html b/fhem/docs/fhem.html
similarity index 100%
rename from docs/fhem.html
rename to fhem/docs/fhem.html
diff --git a/docs/fhem.man b/fhem/docs/fhem.man
similarity index 100%
rename from docs/fhem.man
rename to fhem/docs/fhem.man
diff --git a/docs/fhem.odg b/fhem/docs/fhem.odg
similarity index 100%
rename from docs/fhem.odg
rename to fhem/docs/fhem.odg
diff --git a/docs/fhemicon_old.odg b/fhem/docs/fhemicon_old.odg
similarity index 100%
rename from docs/fhemicon_old.odg
rename to fhem/docs/fhemicon_old.odg
diff --git a/docs/fhemicon_sticker.eps b/fhem/docs/fhemicon_sticker.eps
similarity index 100%
rename from docs/fhemicon_sticker.eps
rename to fhem/docs/fhemicon_sticker.eps
diff --git a/docs/fritzbox.html b/fhem/docs/fritzbox.html
similarity index 100%
rename from docs/fritzbox.html
rename to fhem/docs/fritzbox.html
diff --git a/docs/fritzbox_old.html b/fhem/docs/fritzbox_old.html
similarity index 100%
rename from docs/fritzbox_old.html
rename to fhem/docs/fritzbox_old.html
diff --git a/docs/ftdi_sio.fhz1000.patch b/fhem/docs/ftdi_sio.fhz1000.patch
similarity index 100%
rename from docs/ftdi_sio.fhz1000.patch
rename to fhem/docs/ftdi_sio.fhz1000.patch
diff --git a/docs/km271/km271_Aussentemperatur.png b/fhem/docs/km271/km271_Aussentemperatur.png
similarity index 100%
rename from docs/km271/km271_Aussentemperatur.png
rename to fhem/docs/km271/km271_Aussentemperatur.png
diff --git a/docs/km271/km271_Betriebswerte.png b/fhem/docs/km271/km271_Betriebswerte.png
similarity index 100%
rename from docs/km271/km271_Betriebswerte.png
rename to fhem/docs/km271/km271_Betriebswerte.png
diff --git a/docs/km271/km271_Brenneransteuerung.png b/fhem/docs/km271/km271_Brenneransteuerung.png
similarity index 100%
rename from docs/km271/km271_Brenneransteuerung.png
rename to fhem/docs/km271/km271_Brenneransteuerung.png
diff --git a/docs/km271/km271_Brennerlaufzeit.png b/fhem/docs/km271/km271_Brennerlaufzeit.png
similarity index 100%
rename from docs/km271/km271_Brennerlaufzeit.png
rename to fhem/docs/km271/km271_Brennerlaufzeit.png
diff --git a/docs/km271/km271_Brennerschalttemperatur.png b/fhem/docs/km271/km271_Brennerschalttemperatur.png
similarity index 100%
rename from docs/km271/km271_Brennerschalttemperatur.png
rename to fhem/docs/km271/km271_Brennerschalttemperatur.png
diff --git a/docs/km271/km271_Heizkennlinie.png b/fhem/docs/km271/km271_Heizkennlinie.png
similarity index 100%
rename from docs/km271/km271_Heizkennlinie.png
rename to fhem/docs/km271/km271_Heizkennlinie.png
diff --git a/docs/km271/km271_Kesselbetrieb.png b/fhem/docs/km271/km271_Kesselbetrieb.png
similarity index 100%
rename from docs/km271/km271_Kesselbetrieb.png
rename to fhem/docs/km271/km271_Kesselbetrieb.png
diff --git a/docs/km271/km271_Kesselintegral.png b/fhem/docs/km271/km271_Kesselintegral.png
similarity index 100%
rename from docs/km271/km271_Kesselintegral.png
rename to fhem/docs/km271/km271_Kesselintegral.png
diff --git a/docs/km271/km271_Ladepumpe.png b/fhem/docs/km271/km271_Ladepumpe.png
similarity index 100%
rename from docs/km271/km271_Ladepumpe.png
rename to fhem/docs/km271/km271_Ladepumpe.png
diff --git a/docs/km271/km271_Raumsolltemperatur_HK1.png b/fhem/docs/km271/km271_Raumsolltemperatur_HK1.png
similarity index 100%
rename from docs/km271/km271_Raumsolltemperatur_HK1.png
rename to fhem/docs/km271/km271_Raumsolltemperatur_HK1.png
diff --git a/docs/km271/km271_Vorlauftemperatur.png b/fhem/docs/km271/km271_Vorlauftemperatur.png
similarity index 100%
rename from docs/km271/km271_Vorlauftemperatur.png
rename to fhem/docs/km271/km271_Vorlauftemperatur.png
diff --git a/docs/km271/km271_Warmwasser.png b/fhem/docs/km271/km271_Warmwasser.png
similarity index 100%
rename from docs/km271/km271_Warmwasser.png
rename to fhem/docs/km271/km271_Warmwasser.png
diff --git a/docs/linux.html b/fhem/docs/linux.html
similarity index 100%
rename from docs/linux.html
rename to fhem/docs/linux.html
diff --git a/docs/linux_DE.html b/fhem/docs/linux_DE.html
similarity index 100%
rename from docs/linux_DE.html
rename to fhem/docs/linux_DE.html
diff --git a/docs/pgm2-1.png b/fhem/docs/pgm2-1.png
similarity index 100%
rename from docs/pgm2-1.png
rename to fhem/docs/pgm2-1.png
diff --git a/docs/pgm2-2.png b/fhem/docs/pgm2-2.png
similarity index 100%
rename from docs/pgm2-2.png
rename to fhem/docs/pgm2-2.png
diff --git a/docs/pgm2-3.png b/fhem/docs/pgm2-3.png
similarity index 100%
rename from docs/pgm2-3.png
rename to fhem/docs/pgm2-3.png
diff --git a/docs/pgm2-4.png b/fhem/docs/pgm2-4.png
similarity index 100%
rename from docs/pgm2-4.png
rename to fhem/docs/pgm2-4.png
diff --git a/docs/pgm2-5.png b/fhem/docs/pgm2-5.png
similarity index 100%
rename from docs/pgm2-5.png
rename to fhem/docs/pgm2-5.png
diff --git a/docs/pgm4.gif b/fhem/docs/pgm4.gif
similarity index 100%
rename from docs/pgm4.gif
rename to fhem/docs/pgm4.gif
diff --git a/docs/tirreG.jpg b/fhem/docs/tirreG.jpg
similarity index 100%
rename from docs/tirreG.jpg
rename to fhem/docs/tirreG.jpg
diff --git a/docs/web-tipps b/fhem/docs/web-tipps
similarity index 100%
rename from docs/web-tipps
rename to fhem/docs/web-tipps
diff --git a/fhem.cfg b/fhem/fhem.cfg
similarity index 100%
rename from fhem.cfg
rename to fhem/fhem.cfg
diff --git a/fhem.pl b/fhem/fhem.pl
similarity index 100%
rename from fhem.pl
rename to fhem/fhem.pl
diff --git a/webfrontend/pgm1/htdocs/index.html b/fhem/webfrontend/pgm1/htdocs/index.html
similarity index 100%
rename from webfrontend/pgm1/htdocs/index.html
rename to fhem/webfrontend/pgm1/htdocs/index.html
diff --git a/webfrontend/pgm1/scripts/hfm_get.pl b/fhem/webfrontend/pgm1/scripts/hfm_get.pl
similarity index 100%
rename from webfrontend/pgm1/scripts/hfm_get.pl
rename to fhem/webfrontend/pgm1/scripts/hfm_get.pl
diff --git a/webfrontend/pgm1/scripts/hfm_set.pl b/fhem/webfrontend/pgm1/scripts/hfm_set.pl
similarity index 100%
rename from webfrontend/pgm1/scripts/hfm_set.pl
rename to fhem/webfrontend/pgm1/scripts/hfm_set.pl
diff --git a/webfrontend/pgm1/scripts/hfm_tc.pl b/fhem/webfrontend/pgm1/scripts/hfm_tc.pl
similarity index 100%
rename from webfrontend/pgm1/scripts/hfm_tc.pl
rename to fhem/webfrontend/pgm1/scripts/hfm_tc.pl
diff --git a/webfrontend/pgm1/scripts/xsl/hfm_tc.xsl b/fhem/webfrontend/pgm1/scripts/xsl/hfm_tc.xsl
similarity index 100%
rename from webfrontend/pgm1/scripts/xsl/hfm_tc.xsl
rename to fhem/webfrontend/pgm1/scripts/xsl/hfm_tc.xsl
diff --git a/webfrontend/pgm3/CHANGED b/fhem/webfrontend/pgm3/CHANGED
similarity index 100%
rename from webfrontend/pgm3/CHANGED
rename to fhem/webfrontend/pgm3/CHANGED
diff --git a/webfrontend/pgm3/HISTORY b/fhem/webfrontend/pgm3/HISTORY
similarity index 100%
rename from webfrontend/pgm3/HISTORY
rename to fhem/webfrontend/pgm3/HISTORY
diff --git a/webfrontend/pgm3/config.php b/fhem/webfrontend/pgm3/config.php
similarity index 100%
rename from webfrontend/pgm3/config.php
rename to fhem/webfrontend/pgm3/config.php
diff --git a/webfrontend/pgm3/docs/README b/fhem/webfrontend/pgm3/docs/README
similarity index 100%
rename from webfrontend/pgm3/docs/README
rename to fhem/webfrontend/pgm3/docs/README
diff --git a/webfrontend/pgm3/docs/copyright_fonts.txt b/fhem/webfrontend/pgm3/docs/copyright_fonts.txt
similarity index 100%
rename from webfrontend/pgm3/docs/copyright_fonts.txt
rename to fhem/webfrontend/pgm3/docs/copyright_fonts.txt
diff --git a/webfrontend/pgm3/docs/logrotate/README b/fhem/webfrontend/pgm3/docs/logrotate/README
similarity index 100%
rename from webfrontend/pgm3/docs/logrotate/README
rename to fhem/webfrontend/pgm3/docs/logrotate/README
diff --git a/webfrontend/pgm3/include/FS20.off.gif b/fhem/webfrontend/pgm3/include/FS20.off.gif
similarity index 100%
rename from webfrontend/pgm3/include/FS20.off.gif
rename to fhem/webfrontend/pgm3/include/FS20.off.gif
diff --git a/webfrontend/pgm3/include/FS20.on.gif b/fhem/webfrontend/pgm3/include/FS20.on.gif
similarity index 100%
rename from webfrontend/pgm3/include/FS20.on.gif
rename to fhem/webfrontend/pgm3/include/FS20.on.gif
diff --git a/webfrontend/pgm3/include/Vera.ttf b/fhem/webfrontend/pgm3/include/Vera.ttf
similarity index 100%
rename from webfrontend/pgm3/include/Vera.ttf
rename to fhem/webfrontend/pgm3/include/Vera.ttf
diff --git a/webfrontend/pgm3/include/VeraBd.ttf b/fhem/webfrontend/pgm3/include/VeraBd.ttf
similarity index 100%
rename from webfrontend/pgm3/include/VeraBd.ttf
rename to fhem/webfrontend/pgm3/include/VeraBd.ttf
diff --git a/webfrontend/pgm3/include/dblog.php b/fhem/webfrontend/pgm3/include/dblog.php
similarity index 100%
rename from webfrontend/pgm3/include/dblog.php
rename to fhem/webfrontend/pgm3/include/dblog.php
diff --git a/webfrontend/pgm3/include/fht.php b/fhem/webfrontend/pgm3/include/fht.php
similarity index 100%
rename from webfrontend/pgm3/include/fht.php
rename to fhem/webfrontend/pgm3/include/fht.php
diff --git a/webfrontend/pgm3/include/fhtpulldown.php b/fhem/webfrontend/pgm3/include/fhtpulldown.php
similarity index 100%
rename from webfrontend/pgm3/include/fhtpulldown.php
rename to fhem/webfrontend/pgm3/include/fhtpulldown.php
diff --git a/webfrontend/pgm3/include/fs20.ico b/fhem/webfrontend/pgm3/include/fs20.ico
similarity index 100%
rename from webfrontend/pgm3/include/fs20.ico
rename to fhem/webfrontend/pgm3/include/fs20.ico
diff --git a/webfrontend/pgm3/include/fs20.php b/fhem/webfrontend/pgm3/include/fs20.php
similarity index 100%
rename from webfrontend/pgm3/include/fs20.php
rename to fhem/webfrontend/pgm3/include/fs20.php
diff --git a/webfrontend/pgm3/include/fs20pulldown.php b/fhem/webfrontend/pgm3/include/fs20pulldown.php
similarity index 100%
rename from webfrontend/pgm3/include/fs20pulldown.php
rename to fhem/webfrontend/pgm3/include/fs20pulldown.php
diff --git a/webfrontend/pgm3/include/functions.php b/fhem/webfrontend/pgm3/include/functions.php
similarity index 100%
rename from webfrontend/pgm3/include/functions.php
rename to fhem/webfrontend/pgm3/include/functions.php
diff --git a/webfrontend/pgm3/include/gnuplot.php b/fhem/webfrontend/pgm3/include/gnuplot.php
similarity index 100%
rename from webfrontend/pgm3/include/gnuplot.php
rename to fhem/webfrontend/pgm3/include/gnuplot.php
diff --git a/webfrontend/pgm3/include/hmpulldown.php b/fhem/webfrontend/pgm3/include/hmpulldown.php
similarity index 100%
rename from webfrontend/pgm3/include/hmpulldown.php
rename to fhem/webfrontend/pgm3/include/hmpulldown.php
diff --git a/webfrontend/pgm3/include/hms100.php b/fhem/webfrontend/pgm3/include/hms100.php
similarity index 100%
rename from webfrontend/pgm3/include/hms100.php
rename to fhem/webfrontend/pgm3/include/hms100.php
diff --git a/webfrontend/pgm3/include/img/FS20.off.png b/fhem/webfrontend/pgm3/include/img/FS20.off.png
similarity index 100%
rename from webfrontend/pgm3/include/img/FS20.off.png
rename to fhem/webfrontend/pgm3/include/img/FS20.off.png
diff --git a/webfrontend/pgm3/include/img/FS20.on.png b/fhem/webfrontend/pgm3/include/img/FS20.on.png
similarity index 100%
rename from webfrontend/pgm3/include/img/FS20.on.png
rename to fhem/webfrontend/pgm3/include/img/FS20.on.png
diff --git a/webfrontend/pgm3/include/img/dim06%.png b/fhem/webfrontend/pgm3/include/img/dim06%.png
similarity index 100%
rename from webfrontend/pgm3/include/img/dim06%.png
rename to fhem/webfrontend/pgm3/include/img/dim06%.png
diff --git a/webfrontend/pgm3/include/img/dim100%.png b/fhem/webfrontend/pgm3/include/img/dim100%.png
similarity index 100%
rename from webfrontend/pgm3/include/img/dim100%.png
rename to fhem/webfrontend/pgm3/include/img/dim100%.png
diff --git a/webfrontend/pgm3/include/img/dim12%.png b/fhem/webfrontend/pgm3/include/img/dim12%.png
similarity index 100%
rename from webfrontend/pgm3/include/img/dim12%.png
rename to fhem/webfrontend/pgm3/include/img/dim12%.png
diff --git a/webfrontend/pgm3/include/img/dim18%.png b/fhem/webfrontend/pgm3/include/img/dim18%.png
similarity index 100%
rename from webfrontend/pgm3/include/img/dim18%.png
rename to fhem/webfrontend/pgm3/include/img/dim18%.png
diff --git a/webfrontend/pgm3/include/img/dim25%.png b/fhem/webfrontend/pgm3/include/img/dim25%.png
similarity index 100%
rename from webfrontend/pgm3/include/img/dim25%.png
rename to fhem/webfrontend/pgm3/include/img/dim25%.png
diff --git a/webfrontend/pgm3/include/img/dim31%.png b/fhem/webfrontend/pgm3/include/img/dim31%.png
similarity index 100%
rename from webfrontend/pgm3/include/img/dim31%.png
rename to fhem/webfrontend/pgm3/include/img/dim31%.png
diff --git a/webfrontend/pgm3/include/img/dim37%.png b/fhem/webfrontend/pgm3/include/img/dim37%.png
similarity index 100%
rename from webfrontend/pgm3/include/img/dim37%.png
rename to fhem/webfrontend/pgm3/include/img/dim37%.png
diff --git a/webfrontend/pgm3/include/img/dim43%.png b/fhem/webfrontend/pgm3/include/img/dim43%.png
similarity index 100%
rename from webfrontend/pgm3/include/img/dim43%.png
rename to fhem/webfrontend/pgm3/include/img/dim43%.png
diff --git a/webfrontend/pgm3/include/img/dim50%.png b/fhem/webfrontend/pgm3/include/img/dim50%.png
similarity index 100%
rename from webfrontend/pgm3/include/img/dim50%.png
rename to fhem/webfrontend/pgm3/include/img/dim50%.png
diff --git a/webfrontend/pgm3/include/img/dim56%.png b/fhem/webfrontend/pgm3/include/img/dim56%.png
similarity index 100%
rename from webfrontend/pgm3/include/img/dim56%.png
rename to fhem/webfrontend/pgm3/include/img/dim56%.png
diff --git a/webfrontend/pgm3/include/img/dim62%.png b/fhem/webfrontend/pgm3/include/img/dim62%.png
similarity index 100%
rename from webfrontend/pgm3/include/img/dim62%.png
rename to fhem/webfrontend/pgm3/include/img/dim62%.png
diff --git a/webfrontend/pgm3/include/img/dim68%.png b/fhem/webfrontend/pgm3/include/img/dim68%.png
similarity index 100%
rename from webfrontend/pgm3/include/img/dim68%.png
rename to fhem/webfrontend/pgm3/include/img/dim68%.png
diff --git a/webfrontend/pgm3/include/img/dim75%.png b/fhem/webfrontend/pgm3/include/img/dim75%.png
similarity index 100%
rename from webfrontend/pgm3/include/img/dim75%.png
rename to fhem/webfrontend/pgm3/include/img/dim75%.png
diff --git a/webfrontend/pgm3/include/img/dim81%.png b/fhem/webfrontend/pgm3/include/img/dim81%.png
similarity index 100%
rename from webfrontend/pgm3/include/img/dim81%.png
rename to fhem/webfrontend/pgm3/include/img/dim81%.png
diff --git a/webfrontend/pgm3/include/img/dim87%.png b/fhem/webfrontend/pgm3/include/img/dim87%.png
similarity index 100%
rename from webfrontend/pgm3/include/img/dim87%.png
rename to fhem/webfrontend/pgm3/include/img/dim87%.png
diff --git a/webfrontend/pgm3/include/img/dim93%.png b/fhem/webfrontend/pgm3/include/img/dim93%.png
similarity index 100%
rename from webfrontend/pgm3/include/img/dim93%.png
rename to fhem/webfrontend/pgm3/include/img/dim93%.png
diff --git a/webfrontend/pgm3/include/img/dimdown.png b/fhem/webfrontend/pgm3/include/img/dimdown.png
similarity index 100%
rename from webfrontend/pgm3/include/img/dimdown.png
rename to fhem/webfrontend/pgm3/include/img/dimdown.png
diff --git a/webfrontend/pgm3/include/img/dimup.png b/fhem/webfrontend/pgm3/include/img/dimup.png
similarity index 100%
rename from webfrontend/pgm3/include/img/dimup.png
rename to fhem/webfrontend/pgm3/include/img/dimup.png
diff --git a/webfrontend/pgm3/include/img/off-for-timer.png b/fhem/webfrontend/pgm3/include/img/off-for-timer.png
similarity index 100%
rename from webfrontend/pgm3/include/img/off-for-timer.png
rename to fhem/webfrontend/pgm3/include/img/off-for-timer.png
diff --git a/webfrontend/pgm3/include/img/off.png b/fhem/webfrontend/pgm3/include/img/off.png
similarity index 100%
rename from webfrontend/pgm3/include/img/off.png
rename to fhem/webfrontend/pgm3/include/img/off.png
diff --git a/webfrontend/pgm3/include/img/on-for-timer.png b/fhem/webfrontend/pgm3/include/img/on-for-timer.png
similarity index 100%
rename from webfrontend/pgm3/include/img/on-for-timer.png
rename to fhem/webfrontend/pgm3/include/img/on-for-timer.png
diff --git a/webfrontend/pgm3/include/img/on-till.png b/fhem/webfrontend/pgm3/include/img/on-till.png
similarity index 100%
rename from webfrontend/pgm3/include/img/on-till.png
rename to fhem/webfrontend/pgm3/include/img/on-till.png
diff --git a/webfrontend/pgm3/include/img/on.png b/fhem/webfrontend/pgm3/include/img/on.png
similarity index 100%
rename from webfrontend/pgm3/include/img/on.png
rename to fhem/webfrontend/pgm3/include/img/on.png
diff --git a/webfrontend/pgm3/include/img/switch.off.png b/fhem/webfrontend/pgm3/include/img/switch.off.png
similarity index 100%
rename from webfrontend/pgm3/include/img/switch.off.png
rename to fhem/webfrontend/pgm3/include/img/switch.off.png
diff --git a/webfrontend/pgm3/include/img/switch.on.png b/fhem/webfrontend/pgm3/include/img/switch.on.png
similarity index 100%
rename from webfrontend/pgm3/include/img/switch.on.png
rename to fhem/webfrontend/pgm3/include/img/switch.on.png
diff --git a/webfrontend/pgm3/include/img/switch_gn.off-for-timer.png b/fhem/webfrontend/pgm3/include/img/switch_gn.off-for-timer.png
similarity index 100%
rename from webfrontend/pgm3/include/img/switch_gn.off-for-timer.png
rename to fhem/webfrontend/pgm3/include/img/switch_gn.off-for-timer.png
diff --git a/webfrontend/pgm3/include/img/switch_gn.off.png b/fhem/webfrontend/pgm3/include/img/switch_gn.off.png
similarity index 100%
rename from webfrontend/pgm3/include/img/switch_gn.off.png
rename to fhem/webfrontend/pgm3/include/img/switch_gn.off.png
diff --git a/webfrontend/pgm3/include/img/switch_gn.on-for-timer.png b/fhem/webfrontend/pgm3/include/img/switch_gn.on-for-timer.png
similarity index 100%
rename from webfrontend/pgm3/include/img/switch_gn.on-for-timer.png
rename to fhem/webfrontend/pgm3/include/img/switch_gn.on-for-timer.png
diff --git a/webfrontend/pgm3/include/img/switch_gn.on.png b/fhem/webfrontend/pgm3/include/img/switch_gn.on.png
similarity index 100%
rename from webfrontend/pgm3/include/img/switch_gn.on.png
rename to fhem/webfrontend/pgm3/include/img/switch_gn.on.png
diff --git a/webfrontend/pgm3/include/img/switch_rt.off-for-timer.png b/fhem/webfrontend/pgm3/include/img/switch_rt.off-for-timer.png
similarity index 100%
rename from webfrontend/pgm3/include/img/switch_rt.off-for-timer.png
rename to fhem/webfrontend/pgm3/include/img/switch_rt.off-for-timer.png
diff --git a/webfrontend/pgm3/include/img/switch_rt.off.png b/fhem/webfrontend/pgm3/include/img/switch_rt.off.png
similarity index 100%
rename from webfrontend/pgm3/include/img/switch_rt.off.png
rename to fhem/webfrontend/pgm3/include/img/switch_rt.off.png
diff --git a/webfrontend/pgm3/include/img/switch_rt.on-for-timer.png b/fhem/webfrontend/pgm3/include/img/switch_rt.on-for-timer.png
similarity index 100%
rename from webfrontend/pgm3/include/img/switch_rt.on-for-timer.png
rename to fhem/webfrontend/pgm3/include/img/switch_rt.on-for-timer.png
diff --git a/webfrontend/pgm3/include/img/switch_rt.on.png b/fhem/webfrontend/pgm3/include/img/switch_rt.on.png
similarity index 100%
rename from webfrontend/pgm3/include/img/switch_rt.on.png
rename to fhem/webfrontend/pgm3/include/img/switch_rt.on.png
diff --git a/webfrontend/pgm3/include/img/toggle.png b/fhem/webfrontend/pgm3/include/img/toggle.png
similarity index 100%
rename from webfrontend/pgm3/include/img/toggle.png
rename to fhem/webfrontend/pgm3/include/img/toggle.png
diff --git a/webfrontend/pgm3/include/ks300.php b/fhem/webfrontend/pgm3/include/ks300.php
similarity index 100%
rename from webfrontend/pgm3/include/ks300.php
rename to fhem/webfrontend/pgm3/include/ks300.php
diff --git a/webfrontend/pgm3/include/logpulldown.php b/fhem/webfrontend/pgm3/include/logpulldown.php
similarity index 100%
rename from webfrontend/pgm3/include/logpulldown.php
rename to fhem/webfrontend/pgm3/include/logpulldown.php
diff --git a/webfrontend/pgm3/include/room.php b/fhem/webfrontend/pgm3/include/room.php
similarity index 100%
rename from webfrontend/pgm3/include/room.php
rename to fhem/webfrontend/pgm3/include/room.php
diff --git a/webfrontend/pgm3/include/rssfeeds.php b/fhem/webfrontend/pgm3/include/rssfeeds.php
similarity index 100%
rename from webfrontend/pgm3/include/rssfeeds.php
rename to fhem/webfrontend/pgm3/include/rssfeeds.php
diff --git a/webfrontend/pgm3/include/style.css b/fhem/webfrontend/pgm3/include/style.css
similarity index 100%
rename from webfrontend/pgm3/include/style.css
rename to fhem/webfrontend/pgm3/include/style.css
diff --git a/webfrontend/pgm3/include/userdefs.php b/fhem/webfrontend/pgm3/include/userdefs.php
similarity index 100%
rename from webfrontend/pgm3/include/userdefs.php
rename to fhem/webfrontend/pgm3/include/userdefs.php
diff --git a/webfrontend/pgm3/include/weather.php b/fhem/webfrontend/pgm3/include/weather.php
similarity index 100%
rename from webfrontend/pgm3/include/weather.php
rename to fhem/webfrontend/pgm3/include/weather.php
diff --git a/webfrontend/pgm3/index.php b/fhem/webfrontend/pgm3/index.php
similarity index 100%
rename from webfrontend/pgm3/index.php
rename to fhem/webfrontend/pgm3/index.php
diff --git a/webfrontend/pgm3/tmp/do_not_delete b/fhem/webfrontend/pgm3/tmp/do_not_delete
similarity index 100%
rename from webfrontend/pgm3/tmp/do_not_delete
rename to fhem/webfrontend/pgm3/tmp/do_not_delete
diff --git a/webfrontend/pgm4/README b/fhem/webfrontend/pgm4/README
similarity index 100%
rename from webfrontend/pgm4/README
rename to fhem/webfrontend/pgm4/README
diff --git a/webfrontend/pgm4/fs20.php b/fhem/webfrontend/pgm4/fs20.php
similarity index 100%
rename from webfrontend/pgm4/fs20.php
rename to fhem/webfrontend/pgm4/fs20.php
diff --git a/webfrontend/pgm4/images/EG.gif b/fhem/webfrontend/pgm4/images/EG.gif
similarity index 100%
rename from webfrontend/pgm4/images/EG.gif
rename to fhem/webfrontend/pgm4/images/EG.gif
diff --git a/webfrontend/pgm5/02_FHEMRENDERER.pm b/fhem/webfrontend/pgm5/02_FHEMRENDERER.pm
similarity index 100%
rename from webfrontend/pgm5/02_FHEMRENDERER.pm
rename to fhem/webfrontend/pgm5/02_FHEMRENDERER.pm
diff --git a/webfrontend/pgm5/README-FHEMRENDERER.txt b/fhem/webfrontend/pgm5/README-FHEMRENDERER.txt
similarity index 100%
rename from webfrontend/pgm5/README-FHEMRENDERER.txt
rename to fhem/webfrontend/pgm5/README-FHEMRENDERER.txt
diff --git a/webfrontend/pgm5/README.txt b/fhem/webfrontend/pgm5/README.txt
similarity index 100%
rename from webfrontend/pgm5/README.txt
rename to fhem/webfrontend/pgm5/README.txt
diff --git a/webfrontend/pgm5/fhemweb.pl b/fhem/webfrontend/pgm5/fhemweb.pl
similarity index 100%
rename from webfrontend/pgm5/fhemweb.pl
rename to fhem/webfrontend/pgm5/fhemweb.pl
diff --git a/webfrontend/pgm5/icons/FS20.off.gif b/fhem/webfrontend/pgm5/icons/FS20.off.gif
similarity index 100%
rename from webfrontend/pgm5/icons/FS20.off.gif
rename to fhem/webfrontend/pgm5/icons/FS20.off.gif
diff --git a/webfrontend/pgm5/icons/FS20.on.gif b/fhem/webfrontend/pgm5/icons/FS20.on.gif
similarity index 100%
rename from webfrontend/pgm5/icons/FS20.on.gif
rename to fhem/webfrontend/pgm5/icons/FS20.on.gif
diff --git a/webfrontend/pgm5/icons/IT.off.gif b/fhem/webfrontend/pgm5/icons/IT.off.gif
similarity index 100%
rename from webfrontend/pgm5/icons/IT.off.gif
rename to fhem/webfrontend/pgm5/icons/IT.off.gif
diff --git a/webfrontend/pgm5/icons/IT.on.gif b/fhem/webfrontend/pgm5/icons/IT.on.gif
similarity index 100%
rename from webfrontend/pgm5/icons/IT.on.gif
rename to fhem/webfrontend/pgm5/icons/IT.on.gif
diff --git a/webfrontend/pgm5/icons/Next.png b/fhem/webfrontend/pgm5/icons/Next.png
similarity index 100%
rename from webfrontend/pgm5/icons/Next.png
rename to fhem/webfrontend/pgm5/icons/Next.png
diff --git a/webfrontend/pgm5/icons/Prev.png b/fhem/webfrontend/pgm5/icons/Prev.png
similarity index 100%
rename from webfrontend/pgm5/icons/Prev.png
rename to fhem/webfrontend/pgm5/icons/Prev.png
diff --git a/webfrontend/pgm5/icons/Zoom-in.png b/fhem/webfrontend/pgm5/icons/Zoom-in.png
similarity index 100%
rename from webfrontend/pgm5/icons/Zoom-in.png
rename to fhem/webfrontend/pgm5/icons/Zoom-in.png
diff --git a/webfrontend/pgm5/icons/Zoom-out.png b/fhem/webfrontend/pgm5/icons/Zoom-out.png
similarity index 100%
rename from webfrontend/pgm5/icons/Zoom-out.png
rename to fhem/webfrontend/pgm5/icons/Zoom-out.png
diff --git a/webfrontend/pgm5/style.css b/fhem/webfrontend/pgm5/style.css
similarity index 100%
rename from webfrontend/pgm5/style.css
rename to fhem/webfrontend/pgm5/style.css
diff --git a/www/gplot/bs4.gplot b/fhem/www/gplot/bs4.gplot
similarity index 100%
rename from www/gplot/bs4.gplot
rename to fhem/www/gplot/bs4.gplot
diff --git a/www/gplot/cpulog.gplot b/fhem/www/gplot/cpulog.gplot
similarity index 100%
rename from www/gplot/cpulog.gplot
rename to fhem/www/gplot/cpulog.gplot
diff --git a/www/gplot/dayAvgTemp5rain11.gplot b/fhem/www/gplot/dayAvgTemp5rain11.gplot
similarity index 100%
rename from www/gplot/dayAvgTemp5rain11.gplot
rename to fhem/www/gplot/dayAvgTemp5rain11.gplot
diff --git a/www/gplot/fht.gplot b/fhem/www/gplot/fht.gplot
similarity index 100%
rename from www/gplot/fht.gplot
rename to fhem/www/gplot/fht.gplot
diff --git a/www/gplot/fht80tf.gplot b/fhem/www/gplot/fht80tf.gplot
similarity index 100%
rename from www/gplot/fht80tf.gplot
rename to fhem/www/gplot/fht80tf.gplot
diff --git a/www/gplot/fs20.gplot b/fhem/www/gplot/fs20.gplot
similarity index 100%
rename from www/gplot/fs20.gplot
rename to fhem/www/gplot/fs20.gplot
diff --git a/www/gplot/garden.gplot b/fhem/www/gplot/garden.gplot
similarity index 100%
rename from www/gplot/garden.gplot
rename to fhem/www/gplot/garden.gplot
diff --git a/www/gplot/hum6wind8.gplot b/fhem/www/gplot/hum6wind8.gplot
similarity index 100%
rename from www/gplot/hum6wind8.gplot
rename to fhem/www/gplot/hum6wind8.gplot
diff --git a/www/gplot/km271_1.gplot b/fhem/www/gplot/km271_1.gplot
similarity index 100%
rename from www/gplot/km271_1.gplot
rename to fhem/www/gplot/km271_1.gplot
diff --git a/www/gplot/ks550_all.gplot b/fhem/www/gplot/ks550_all.gplot
similarity index 100%
rename from www/gplot/ks550_all.gplot
rename to fhem/www/gplot/ks550_all.gplot
diff --git a/www/gplot/ks550_light.gplot b/fhem/www/gplot/ks550_light.gplot
similarity index 100%
rename from www/gplot/ks550_light.gplot
rename to fhem/www/gplot/ks550_light.gplot
diff --git a/www/gplot/ks550_rain.gplot b/fhem/www/gplot/ks550_rain.gplot
similarity index 100%
rename from www/gplot/ks550_rain.gplot
rename to fhem/www/gplot/ks550_rain.gplot
diff --git a/www/gplot/ks550_th.gplot b/fhem/www/gplot/ks550_th.gplot
similarity index 100%
rename from www/gplot/ks550_th.gplot
rename to fhem/www/gplot/ks550_th.gplot
diff --git a/www/gplot/ks550_wind.gplot b/fhem/www/gplot/ks550_wind.gplot
similarity index 100%
rename from www/gplot/ks550_wind.gplot
rename to fhem/www/gplot/ks550_wind.gplot
diff --git a/www/gplot/monthAvgTemp5Rain11.gplot b/fhem/www/gplot/monthAvgTemp5Rain11.gplot
similarity index 100%
rename from www/gplot/monthAvgTemp5Rain11.gplot
rename to fhem/www/gplot/monthAvgTemp5Rain11.gplot
diff --git a/www/gplot/mpiri.gplot b/fhem/www/gplot/mpiri.gplot
similarity index 100%
rename from www/gplot/mpiri.gplot
rename to fhem/www/gplot/mpiri.gplot
diff --git a/www/gplot/piri.gplot b/fhem/www/gplot/piri.gplot
similarity index 100%
rename from www/gplot/piri.gplot
rename to fhem/www/gplot/piri.gplot
diff --git a/www/gplot/power4.gplot b/fhem/www/gplot/power4.gplot
similarity index 100%
rename from www/gplot/power4.gplot
rename to fhem/www/gplot/power4.gplot
diff --git a/www/gplot/power8.gplot b/fhem/www/gplot/power8.gplot
similarity index 100%
rename from www/gplot/power8.gplot
rename to fhem/www/gplot/power8.gplot
diff --git a/www/gplot/power8top10.gplot b/fhem/www/gplot/power8top10.gplot
similarity index 100%
rename from www/gplot/power8top10.gplot
rename to fhem/www/gplot/power8top10.gplot
diff --git a/www/gplot/rain4.gplot b/fhem/www/gplot/rain4.gplot
similarity index 100%
rename from www/gplot/rain4.gplot
rename to fhem/www/gplot/rain4.gplot
diff --git a/www/gplot/rain4press4.gplot b/fhem/www/gplot/rain4press4.gplot
similarity index 100%
rename from www/gplot/rain4press4.gplot
rename to fhem/www/gplot/rain4press4.gplot
diff --git a/www/gplot/temp4.gplot b/fhem/www/gplot/temp4.gplot
similarity index 100%
rename from www/gplot/temp4.gplot
rename to fhem/www/gplot/temp4.gplot
diff --git a/www/gplot/temp4hum4.gplot b/fhem/www/gplot/temp4hum4.gplot
similarity index 100%
rename from www/gplot/temp4hum4.gplot
rename to fhem/www/gplot/temp4hum4.gplot
diff --git a/www/gplot/temp4hum6.gplot b/fhem/www/gplot/temp4hum6.gplot
similarity index 100%
rename from www/gplot/temp4hum6.gplot
rename to fhem/www/gplot/temp4hum6.gplot
diff --git a/www/gplot/temp4rain10.gplot b/fhem/www/gplot/temp4rain10.gplot
similarity index 100%
rename from www/gplot/temp4rain10.gplot
rename to fhem/www/gplot/temp4rain10.gplot
diff --git a/www/gplot/temp4valve4.gplot b/fhem/www/gplot/temp4valve4.gplot
similarity index 100%
rename from www/gplot/temp4valve4.gplot
rename to fhem/www/gplot/temp4valve4.gplot
diff --git a/www/gplot/vol4.gplot b/fhem/www/gplot/vol4.gplot
similarity index 100%
rename from www/gplot/vol4.gplot
rename to fhem/www/gplot/vol4.gplot
diff --git a/www/gplot/wind4windDir4.gplot b/fhem/www/gplot/wind4windDir4.gplot
similarity index 100%
rename from www/gplot/wind4windDir4.gplot
rename to fhem/www/gplot/wind4windDir4.gplot
diff --git a/www/images/dark/darklogo.png b/fhem/www/images/dark/darklogo.png
similarity index 100%
rename from www/images/dark/darklogo.png
rename to fhem/www/images/dark/darklogo.png
diff --git a/www/images/default/FS20.off.png b/fhem/www/images/default/FS20.off.png
similarity index 100%
rename from www/images/default/FS20.off.png
rename to fhem/www/images/default/FS20.off.png
diff --git a/www/images/default/FS20.on.png b/fhem/www/images/default/FS20.on.png
similarity index 100%
rename from www/images/default/FS20.on.png
rename to fhem/www/images/default/FS20.on.png
diff --git a/www/images/default/HOME_Status.0.png b/fhem/www/images/default/HOME_Status.0.png
similarity index 100%
rename from www/images/default/HOME_Status.0.png
rename to fhem/www/images/default/HOME_Status.0.png
diff --git a/www/images/default/HOME_Status.1.png b/fhem/www/images/default/HOME_Status.1.png
similarity index 100%
rename from www/images/default/HOME_Status.1.png
rename to fhem/www/images/default/HOME_Status.1.png
diff --git a/www/images/default/HOME_Status.3.png b/fhem/www/images/default/HOME_Status.3.png
similarity index 100%
rename from www/images/default/HOME_Status.3.png
rename to fhem/www/images/default/HOME_Status.3.png
diff --git a/www/images/default/HOME_Status.4.png b/fhem/www/images/default/HOME_Status.4.png
similarity index 100%
rename from www/images/default/HOME_Status.4.png
rename to fhem/www/images/default/HOME_Status.4.png
diff --git a/www/images/default/Heizung_Hauptschalter.off-for-timer.png b/fhem/www/images/default/Heizung_Hauptschalter.off-for-timer.png
similarity index 100%
rename from www/images/default/Heizung_Hauptschalter.off-for-timer.png
rename to fhem/www/images/default/Heizung_Hauptschalter.off-for-timer.png
diff --git a/www/images/default/Heizung_Hauptschalter.off.png b/fhem/www/images/default/Heizung_Hauptschalter.off.png
similarity index 100%
rename from www/images/default/Heizung_Hauptschalter.off.png
rename to fhem/www/images/default/Heizung_Hauptschalter.off.png
diff --git a/www/images/default/Heizung_Hauptschalter.on.png b/fhem/www/images/default/Heizung_Hauptschalter.on.png
similarity index 100%
rename from www/images/default/Heizung_Hauptschalter.on.png
rename to fhem/www/images/default/Heizung_Hauptschalter.on.png
diff --git a/www/images/default/Next.png b/fhem/www/images/default/Next.png
similarity index 100%
rename from www/images/default/Next.png
rename to fhem/www/images/default/Next.png
diff --git a/www/images/default/Prev.png b/fhem/www/images/default/Prev.png
similarity index 100%
rename from www/images/default/Prev.png
rename to fhem/www/images/default/Prev.png
diff --git a/www/images/default/Restart.png b/fhem/www/images/default/Restart.png
similarity index 100%
rename from www/images/default/Restart.png
rename to fhem/www/images/default/Restart.png
diff --git a/www/images/default/Shutdown.png b/fhem/www/images/default/Shutdown.png
similarity index 100%
rename from www/images/default/Shutdown.png
rename to fhem/www/images/default/Shutdown.png
diff --git a/www/images/default/StandBy.png b/fhem/www/images/default/StandBy.png
similarity index 100%
rename from www/images/default/StandBy.png
rename to fhem/www/images/default/StandBy.png
diff --git a/www/images/default/Update.png b/fhem/www/images/default/Update.png
similarity index 100%
rename from www/images/default/Update.png
rename to fhem/www/images/default/Update.png
diff --git a/www/images/default/WLAN_Status.0.png b/fhem/www/images/default/WLAN_Status.0.png
similarity index 100%
rename from www/images/default/WLAN_Status.0.png
rename to fhem/www/images/default/WLAN_Status.0.png
diff --git a/www/images/default/WLAN_Status.1.png b/fhem/www/images/default/WLAN_Status.1.png
similarity index 100%
rename from www/images/default/WLAN_Status.1.png
rename to fhem/www/images/default/WLAN_Status.1.png
diff --git a/www/images/default/Wecker.Aus.png b/fhem/www/images/default/Wecker.Aus.png
similarity index 100%
rename from www/images/default/Wecker.Aus.png
rename to fhem/www/images/default/Wecker.Aus.png
diff --git a/www/images/default/Wecker.Immer.png b/fhem/www/images/default/Wecker.Immer.png
similarity index 100%
rename from www/images/default/Wecker.Immer.png
rename to fhem/www/images/default/Wecker.Immer.png
diff --git a/www/images/default/Wecker.Wochenende.png b/fhem/www/images/default/Wecker.Wochenende.png
similarity index 100%
rename from www/images/default/Wecker.Wochenende.png
rename to fhem/www/images/default/Wecker.Wochenende.png
diff --git a/www/images/default/Wecker.Wochentags.png b/fhem/www/images/default/Wecker.Wochentags.png
similarity index 100%
rename from www/images/default/Wecker.Wochentags.png
rename to fhem/www/images/default/Wecker.Wochentags.png
diff --git a/www/images/default/Zoom-in.png b/fhem/www/images/default/Zoom-in.png
similarity index 100%
rename from www/images/default/Zoom-in.png
rename to fhem/www/images/default/Zoom-in.png
diff --git a/www/images/default/Zoom-out.png b/fhem/www/images/default/Zoom-out.png
similarity index 100%
rename from www/images/default/Zoom-out.png
rename to fhem/www/images/default/Zoom-out.png
diff --git a/www/images/default/back.png b/fhem/www/images/default/back.png
similarity index 100%
rename from www/images/default/back.png
rename to fhem/www/images/default/back.png
diff --git a/www/images/default/black_FS20.off.png b/fhem/www/images/default/black_FS20.off.png
similarity index 100%
rename from www/images/default/black_FS20.off.png
rename to fhem/www/images/default/black_FS20.off.png
diff --git a/www/images/default/black_FS20.on.png b/fhem/www/images/default/black_FS20.on.png
similarity index 100%
rename from www/images/default/black_FS20.on.png
rename to fhem/www/images/default/black_FS20.on.png
diff --git a/www/images/default/black_Steckdose.off.png b/fhem/www/images/default/black_Steckdose.off.png
similarity index 100%
rename from www/images/default/black_Steckdose.off.png
rename to fhem/www/images/default/black_Steckdose.off.png
diff --git a/www/images/default/black_Steckdose.on.png b/fhem/www/images/default/black_Steckdose.on.png
similarity index 100%
rename from www/images/default/black_Steckdose.on.png
rename to fhem/www/images/default/black_Steckdose.on.png
diff --git a/www/images/default/black_down.png b/fhem/www/images/default/black_down.png
similarity index 100%
rename from www/images/default/black_down.png
rename to fhem/www/images/default/black_down.png
diff --git a/www/images/default/black_up.png b/fhem/www/images/default/black_up.png
similarity index 100%
rename from www/images/default/black_up.png
rename to fhem/www/images/default/black_up.png
diff --git a/www/images/default/close.png b/fhem/www/images/default/close.png
similarity index 100%
rename from www/images/default/close.png
rename to fhem/www/images/default/close.png
diff --git a/www/images/default/closeG.png b/fhem/www/images/default/closeG.png
similarity index 100%
rename from www/images/default/closeG.png
rename to fhem/www/images/default/closeG.png
diff --git a/www/images/default/dim06%.png b/fhem/www/images/default/dim06%.png
similarity index 100%
rename from www/images/default/dim06%.png
rename to fhem/www/images/default/dim06%.png
diff --git a/www/images/default/dim100%.png b/fhem/www/images/default/dim100%.png
similarity index 100%
rename from www/images/default/dim100%.png
rename to fhem/www/images/default/dim100%.png
diff --git a/www/images/default/dim12%.png b/fhem/www/images/default/dim12%.png
similarity index 100%
rename from www/images/default/dim12%.png
rename to fhem/www/images/default/dim12%.png
diff --git a/www/images/default/dim18%.png b/fhem/www/images/default/dim18%.png
similarity index 100%
rename from www/images/default/dim18%.png
rename to fhem/www/images/default/dim18%.png
diff --git a/www/images/default/dim25%.png b/fhem/www/images/default/dim25%.png
similarity index 100%
rename from www/images/default/dim25%.png
rename to fhem/www/images/default/dim25%.png
diff --git a/www/images/default/dim31%.png b/fhem/www/images/default/dim31%.png
similarity index 100%
rename from www/images/default/dim31%.png
rename to fhem/www/images/default/dim31%.png
diff --git a/www/images/default/dim37%.png b/fhem/www/images/default/dim37%.png
similarity index 100%
rename from www/images/default/dim37%.png
rename to fhem/www/images/default/dim37%.png
diff --git a/www/images/default/dim43%.png b/fhem/www/images/default/dim43%.png
similarity index 100%
rename from www/images/default/dim43%.png
rename to fhem/www/images/default/dim43%.png
diff --git a/www/images/default/dim50%.png b/fhem/www/images/default/dim50%.png
similarity index 100%
rename from www/images/default/dim50%.png
rename to fhem/www/images/default/dim50%.png
diff --git a/www/images/default/dim56%.png b/fhem/www/images/default/dim56%.png
similarity index 100%
rename from www/images/default/dim56%.png
rename to fhem/www/images/default/dim56%.png
diff --git a/www/images/default/dim62%.png b/fhem/www/images/default/dim62%.png
similarity index 100%
rename from www/images/default/dim62%.png
rename to fhem/www/images/default/dim62%.png
diff --git a/www/images/default/dim68%.png b/fhem/www/images/default/dim68%.png
similarity index 100%
rename from www/images/default/dim68%.png
rename to fhem/www/images/default/dim68%.png
diff --git a/www/images/default/dim75%.png b/fhem/www/images/default/dim75%.png
similarity index 100%
rename from www/images/default/dim75%.png
rename to fhem/www/images/default/dim75%.png
diff --git a/www/images/default/dim81%.png b/fhem/www/images/default/dim81%.png
similarity index 100%
rename from www/images/default/dim81%.png
rename to fhem/www/images/default/dim81%.png
diff --git a/www/images/default/dim87%.png b/fhem/www/images/default/dim87%.png
similarity index 100%
rename from www/images/default/dim87%.png
rename to fhem/www/images/default/dim87%.png
diff --git a/www/images/default/dim93%.png b/fhem/www/images/default/dim93%.png
similarity index 100%
rename from www/images/default/dim93%.png
rename to fhem/www/images/default/dim93%.png
diff --git a/www/images/default/dimdown.png b/fhem/www/images/default/dimdown.png
similarity index 100%
rename from www/images/default/dimdown.png
rename to fhem/www/images/default/dimdown.png
diff --git a/www/images/default/dimup.png b/fhem/www/images/default/dimup.png
similarity index 100%
rename from www/images/default/dimup.png
rename to fhem/www/images/default/dimup.png
diff --git a/www/images/default/favicon.ico b/fhem/www/images/default/favicon.ico
similarity index 100%
rename from www/images/default/favicon.ico
rename to fhem/www/images/default/favicon.ico
diff --git a/www/images/default/fhemicon.png b/fhem/www/images/default/fhemicon.png
similarity index 100%
rename from www/images/default/fhemicon.png
rename to fhem/www/images/default/fhemicon.png
diff --git a/www/images/default/heizung.0.png b/fhem/www/images/default/heizung.0.png
similarity index 100%
rename from www/images/default/heizung.0.png
rename to fhem/www/images/default/heizung.0.png
diff --git a/www/images/default/icoAUSSEN.png b/fhem/www/images/default/icoAUSSEN.png
similarity index 100%
rename from www/images/default/icoAUSSEN.png
rename to fhem/www/images/default/icoAUSSEN.png
diff --git a/www/images/default/icoAUSSENBEREICH.png b/fhem/www/images/default/icoAUSSENBEREICH.png
similarity index 100%
rename from www/images/default/icoAUSSENBEREICH.png
rename to fhem/www/images/default/icoAUSSENBEREICH.png
diff --git a/www/images/default/icoBELEUCHTUNG.png b/fhem/www/images/default/icoBELEUCHTUNG.png
similarity index 100%
rename from www/images/default/icoBELEUCHTUNG.png
rename to fhem/www/images/default/icoBELEUCHTUNG.png
diff --git a/www/images/default/icoBaum.png b/fhem/www/images/default/icoBaum.png
similarity index 100%
rename from www/images/default/icoBaum.png
rename to fhem/www/images/default/icoBaum.png
diff --git a/www/images/default/icoBlitz.png b/fhem/www/images/default/icoBlitz.png
similarity index 100%
rename from www/images/default/icoBlitz.png
rename to fhem/www/images/default/icoBlitz.png
diff --git a/www/images/default/icoEverything.png b/fhem/www/images/default/icoEverything.png
similarity index 100%
rename from www/images/default/icoEverything.png
rename to fhem/www/images/default/icoEverything.png
diff --git a/www/images/default/icoGraph.png b/fhem/www/images/default/icoGraph.png
similarity index 100%
rename from www/images/default/icoGraph.png
rename to fhem/www/images/default/icoGraph.png
diff --git a/www/images/default/icoHEIZUNG.png b/fhem/www/images/default/icoHEIZUNG.png
similarity index 100%
rename from www/images/default/icoHEIZUNG.png
rename to fhem/www/images/default/icoHEIZUNG.png
diff --git a/www/images/default/icoHISTORIE.png b/fhem/www/images/default/icoHISTORIE.png
similarity index 100%
rename from www/images/default/icoHISTORIE.png
rename to fhem/www/images/default/icoHISTORIE.png
diff --git a/www/images/default/icoHaus.png b/fhem/www/images/default/icoHaus.png
similarity index 100%
rename from www/images/default/icoHaus.png
rename to fhem/www/images/default/icoHaus.png
diff --git a/www/images/default/icoHeizungAn.png b/fhem/www/images/default/icoHeizungAn.png
similarity index 100%
rename from www/images/default/icoHeizungAn.png
rename to fhem/www/images/default/icoHeizungAn.png
diff --git a/www/images/default/icoHeizungReg.png b/fhem/www/images/default/icoHeizungReg.png
similarity index 100%
rename from www/images/default/icoHeizungReg.png
rename to fhem/www/images/default/icoHeizungReg.png
diff --git a/www/images/default/icoHouse.png b/fhem/www/images/default/icoHouse.png
similarity index 100%
rename from www/images/default/icoHouse.png
rename to fhem/www/images/default/icoHouse.png
diff --git a/www/images/default/icoKLIMA.png b/fhem/www/images/default/icoKLIMA.png
similarity index 100%
rename from www/images/default/icoKLIMA.png
rename to fhem/www/images/default/icoKLIMA.png
diff --git a/www/images/default/icoLicht.png b/fhem/www/images/default/icoLicht.png
similarity index 100%
rename from www/images/default/icoLicht.png
rename to fhem/www/images/default/icoLicht.png
diff --git a/www/images/default/icoLichtBaum.png b/fhem/www/images/default/icoLichtBaum.png
similarity index 100%
rename from www/images/default/icoLichtBaum.png
rename to fhem/www/images/default/icoLichtBaum.png
diff --git a/www/images/default/icoLichtHaus.png b/fhem/www/images/default/icoLichtHaus.png
similarity index 100%
rename from www/images/default/icoLichtHaus.png
rename to fhem/www/images/default/icoLichtHaus.png
diff --git a/www/images/default/icoLog.png b/fhem/www/images/default/icoLog.png
similarity index 100%
rename from www/images/default/icoLog.png
rename to fhem/www/images/default/icoLog.png
diff --git a/www/images/default/icoLuefter.png b/fhem/www/images/default/icoLuefter.png
similarity index 100%
rename from www/images/default/icoLuefter.png
rename to fhem/www/images/default/icoLuefter.png
diff --git a/www/images/default/icoMail.png b/fhem/www/images/default/icoMail.png
similarity index 100%
rename from www/images/default/icoMail.png
rename to fhem/www/images/default/icoMail.png
diff --git a/www/images/default/icoPfeil.png b/fhem/www/images/default/icoPfeil.png
similarity index 100%
rename from www/images/default/icoPfeil.png
rename to fhem/www/images/default/icoPfeil.png
diff --git a/www/images/default/icoPirAuto.png b/fhem/www/images/default/icoPirAuto.png
similarity index 100%
rename from www/images/default/icoPirAuto.png
rename to fhem/www/images/default/icoPirAuto.png
diff --git a/www/images/default/icoPirBaum.png b/fhem/www/images/default/icoPirBaum.png
similarity index 100%
rename from www/images/default/icoPirBaum.png
rename to fhem/www/images/default/icoPirBaum.png
diff --git a/www/images/default/icoSYSTEM.png b/fhem/www/images/default/icoSYSTEM.png
similarity index 100%
rename from www/images/default/icoSYSTEM.png
rename to fhem/www/images/default/icoSYSTEM.png
diff --git a/www/images/default/icoTemp.png b/fhem/www/images/default/icoTemp.png
similarity index 100%
rename from www/images/default/icoTemp.png
rename to fhem/www/images/default/icoTemp.png
diff --git a/www/images/default/icoTempBaum.png b/fhem/www/images/default/icoTempBaum.png
similarity index 100%
rename from www/images/default/icoTempBaum.png
rename to fhem/www/images/default/icoTempBaum.png
diff --git a/www/images/default/icoTempHausEG.png b/fhem/www/images/default/icoTempHausEG.png
similarity index 100%
rename from www/images/default/icoTempHausEG.png
rename to fhem/www/images/default/icoTempHausEG.png
diff --git a/www/images/default/icoTempHausOG.png b/fhem/www/images/default/icoTempHausOG.png
similarity index 100%
rename from www/images/default/icoTempHausOG.png
rename to fhem/www/images/default/icoTempHausOG.png
diff --git a/www/images/default/icoTempHausReg.png b/fhem/www/images/default/icoTempHausReg.png
similarity index 100%
rename from www/images/default/icoTempHausReg.png
rename to fhem/www/images/default/icoTempHausReg.png
diff --git a/www/images/default/icoTempHausRegEG.png b/fhem/www/images/default/icoTempHausRegEG.png
similarity index 100%
rename from www/images/default/icoTempHausRegEG.png
rename to fhem/www/images/default/icoTempHausRegEG.png
diff --git a/www/images/default/icoTempHausRegOG.png b/fhem/www/images/default/icoTempHausRegOG.png
similarity index 100%
rename from www/images/default/icoTempHausRegOG.png
rename to fhem/www/images/default/icoTempHausRegOG.png
diff --git a/www/images/default/icoTempHeizung.png b/fhem/www/images/default/icoTempHeizung.png
similarity index 100%
rename from www/images/default/icoTempHeizung.png
rename to fhem/www/images/default/icoTempHeizung.png
diff --git a/www/images/default/icoTempWasser.png b/fhem/www/images/default/icoTempWasser.png
similarity index 100%
rename from www/images/default/icoTempWasser.png
rename to fhem/www/images/default/icoTempWasser.png
diff --git a/www/images/default/icoTermHaus.png b/fhem/www/images/default/icoTermHaus.png
similarity index 100%
rename from www/images/default/icoTermHaus.png
rename to fhem/www/images/default/icoTermHaus.png
diff --git a/www/images/default/icoTool.png b/fhem/www/images/default/icoTool.png
similarity index 100%
rename from www/images/default/icoTool.png
rename to fhem/www/images/default/icoTool.png
diff --git a/www/images/default/icoUhr.png b/fhem/www/images/default/icoUhr.png
similarity index 100%
rename from www/images/default/icoUhr.png
rename to fhem/www/images/default/icoUhr.png
diff --git a/www/images/default/icoWelt.png b/fhem/www/images/default/icoWelt.png
similarity index 100%
rename from www/images/default/icoWelt.png
rename to fhem/www/images/default/icoWelt.png
diff --git a/www/images/default/icoZirkulationAn.png b/fhem/www/images/default/icoZirkulationAn.png
similarity index 100%
rename from www/images/default/icoZirkulationAn.png
rename to fhem/www/images/default/icoZirkulationAn.png
diff --git a/www/images/default/leer.png b/fhem/www/images/default/leer.png
similarity index 100%
rename from www/images/default/leer.png
rename to fhem/www/images/default/leer.png
diff --git a/www/images/default/off-for-timer.png b/fhem/www/images/default/off-for-timer.png
similarity index 100%
rename from www/images/default/off-for-timer.png
rename to fhem/www/images/default/off-for-timer.png
diff --git a/www/images/default/off.png b/fhem/www/images/default/off.png
similarity index 100%
rename from www/images/default/off.png
rename to fhem/www/images/default/off.png
diff --git a/www/images/default/on-for-timer.png b/fhem/www/images/default/on-for-timer.png
similarity index 100%
rename from www/images/default/on-for-timer.png
rename to fhem/www/images/default/on-for-timer.png
diff --git a/www/images/default/on-till.png b/fhem/www/images/default/on-till.png
similarity index 100%
rename from www/images/default/on-till.png
rename to fhem/www/images/default/on-till.png
diff --git a/www/images/default/on.png b/fhem/www/images/default/on.png
similarity index 100%
rename from www/images/default/on.png
rename to fhem/www/images/default/on.png
diff --git a/www/images/default/shutter_closed_big.png b/fhem/www/images/default/shutter_closed_big.png
similarity index 100%
rename from www/images/default/shutter_closed_big.png
rename to fhem/www/images/default/shutter_closed_big.png
diff --git a/www/images/default/shutter_open_big.png b/fhem/www/images/default/shutter_open_big.png
similarity index 100%
rename from www/images/default/shutter_open_big.png
rename to fhem/www/images/default/shutter_open_big.png
diff --git a/www/images/default/signal_Fenster_Offen.off.png b/fhem/www/images/default/signal_Fenster_Offen.off.png
similarity index 100%
rename from www/images/default/signal_Fenster_Offen.off.png
rename to fhem/www/images/default/signal_Fenster_Offen.off.png
diff --git a/www/images/default/signal_Fenster_Offen.on.png b/fhem/www/images/default/signal_Fenster_Offen.on.png
similarity index 100%
rename from www/images/default/signal_Fenster_Offen.on.png
rename to fhem/www/images/default/signal_Fenster_Offen.on.png
diff --git a/www/images/default/toggle.png b/fhem/www/images/default/toggle.png
similarity index 100%
rename from www/images/default/toggle.png
rename to fhem/www/images/default/toggle.png
diff --git a/www/images/default/weather/COPYRIGHT b/fhem/www/images/default/weather/COPYRIGHT
similarity index 100%
rename from www/images/default/weather/COPYRIGHT
rename to fhem/www/images/default/weather/COPYRIGHT
diff --git a/www/images/default/weather/chance_of_rain.png b/fhem/www/images/default/weather/chance_of_rain.png
similarity index 100%
rename from www/images/default/weather/chance_of_rain.png
rename to fhem/www/images/default/weather/chance_of_rain.png
diff --git a/www/images/default/weather/chance_of_rain_night.png b/fhem/www/images/default/weather/chance_of_rain_night.png
similarity index 100%
rename from www/images/default/weather/chance_of_rain_night.png
rename to fhem/www/images/default/weather/chance_of_rain_night.png
diff --git a/www/images/default/weather/chance_of_sleet.png b/fhem/www/images/default/weather/chance_of_sleet.png
similarity index 100%
rename from www/images/default/weather/chance_of_sleet.png
rename to fhem/www/images/default/weather/chance_of_sleet.png
diff --git a/www/images/default/weather/chance_of_snow.png b/fhem/www/images/default/weather/chance_of_snow.png
similarity index 100%
rename from www/images/default/weather/chance_of_snow.png
rename to fhem/www/images/default/weather/chance_of_snow.png
diff --git a/www/images/default/weather/chance_of_storm.png b/fhem/www/images/default/weather/chance_of_storm.png
similarity index 100%
rename from www/images/default/weather/chance_of_storm.png
rename to fhem/www/images/default/weather/chance_of_storm.png
diff --git a/www/images/default/weather/chance_of_storm_night.png b/fhem/www/images/default/weather/chance_of_storm_night.png
similarity index 100%
rename from www/images/default/weather/chance_of_storm_night.png
rename to fhem/www/images/default/weather/chance_of_storm_night.png
diff --git a/www/images/default/weather/clear.png b/fhem/www/images/default/weather/clear.png
similarity index 100%
rename from www/images/default/weather/clear.png
rename to fhem/www/images/default/weather/clear.png
diff --git a/www/images/default/weather/cloudy.png b/fhem/www/images/default/weather/cloudy.png
similarity index 100%
rename from www/images/default/weather/cloudy.png
rename to fhem/www/images/default/weather/cloudy.png
diff --git a/www/images/default/weather/drizzle.png b/fhem/www/images/default/weather/drizzle.png
similarity index 100%
rename from www/images/default/weather/drizzle.png
rename to fhem/www/images/default/weather/drizzle.png
diff --git a/www/images/default/weather/drizzle_night.png b/fhem/www/images/default/weather/drizzle_night.png
similarity index 100%
rename from www/images/default/weather/drizzle_night.png
rename to fhem/www/images/default/weather/drizzle_night.png
diff --git a/www/images/default/weather/dust.png b/fhem/www/images/default/weather/dust.png
similarity index 100%
rename from www/images/default/weather/dust.png
rename to fhem/www/images/default/weather/dust.png
diff --git a/www/images/default/weather/flurries.png b/fhem/www/images/default/weather/flurries.png
similarity index 100%
rename from www/images/default/weather/flurries.png
rename to fhem/www/images/default/weather/flurries.png
diff --git a/www/images/default/weather/fog.png b/fhem/www/images/default/weather/fog.png
similarity index 100%
rename from www/images/default/weather/fog.png
rename to fhem/www/images/default/weather/fog.png
diff --git a/www/images/default/weather/haze.png b/fhem/www/images/default/weather/haze.png
similarity index 100%
rename from www/images/default/weather/haze.png
rename to fhem/www/images/default/weather/haze.png
diff --git a/www/images/default/weather/haze_night.png b/fhem/www/images/default/weather/haze_night.png
similarity index 100%
rename from www/images/default/weather/haze_night.png
rename to fhem/www/images/default/weather/haze_night.png
diff --git a/www/images/default/weather/heavyrain.png b/fhem/www/images/default/weather/heavyrain.png
similarity index 100%
rename from www/images/default/weather/heavyrain.png
rename to fhem/www/images/default/weather/heavyrain.png
diff --git a/www/images/default/weather/heavysnow.png b/fhem/www/images/default/weather/heavysnow.png
similarity index 100%
rename from www/images/default/weather/heavysnow.png
rename to fhem/www/images/default/weather/heavysnow.png
diff --git a/www/images/default/weather/icy.png b/fhem/www/images/default/weather/icy.png
similarity index 100%
rename from www/images/default/weather/icy.png
rename to fhem/www/images/default/weather/icy.png
diff --git a/www/images/default/weather/mist.png b/fhem/www/images/default/weather/mist.png
similarity index 100%
rename from www/images/default/weather/mist.png
rename to fhem/www/images/default/weather/mist.png
diff --git a/www/images/default/weather/mostly_clear_night.png b/fhem/www/images/default/weather/mostly_clear_night.png
similarity index 100%
rename from www/images/default/weather/mostly_clear_night.png
rename to fhem/www/images/default/weather/mostly_clear_night.png
diff --git a/www/images/default/weather/mostly_cloudy.png b/fhem/www/images/default/weather/mostly_cloudy.png
similarity index 100%
rename from www/images/default/weather/mostly_cloudy.png
rename to fhem/www/images/default/weather/mostly_cloudy.png
diff --git a/www/images/default/weather/mostly_cloudy_night.png b/fhem/www/images/default/weather/mostly_cloudy_night.png
similarity index 100%
rename from www/images/default/weather/mostly_cloudy_night.png
rename to fhem/www/images/default/weather/mostly_cloudy_night.png
diff --git a/www/images/default/weather/mostly_sunny.png b/fhem/www/images/default/weather/mostly_sunny.png
similarity index 100%
rename from www/images/default/weather/mostly_sunny.png
rename to fhem/www/images/default/weather/mostly_sunny.png
diff --git a/www/images/default/weather/mostlycloudy.png b/fhem/www/images/default/weather/mostlycloudy.png
similarity index 100%
rename from www/images/default/weather/mostlycloudy.png
rename to fhem/www/images/default/weather/mostlycloudy.png
diff --git a/www/images/default/weather/mostlycloudy_night.png b/fhem/www/images/default/weather/mostlycloudy_night.png
similarity index 100%
rename from www/images/default/weather/mostlycloudy_night.png
rename to fhem/www/images/default/weather/mostlycloudy_night.png
diff --git a/www/images/default/weather/na.png b/fhem/www/images/default/weather/na.png
similarity index 100%
rename from www/images/default/weather/na.png
rename to fhem/www/images/default/weather/na.png
diff --git a/www/images/default/weather/overcast.png b/fhem/www/images/default/weather/overcast.png
similarity index 100%
rename from www/images/default/weather/overcast.png
rename to fhem/www/images/default/weather/overcast.png
diff --git a/www/images/default/weather/partly_cloudy.png b/fhem/www/images/default/weather/partly_cloudy.png
similarity index 100%
rename from www/images/default/weather/partly_cloudy.png
rename to fhem/www/images/default/weather/partly_cloudy.png
diff --git a/www/images/default/weather/partly_cloudy_night.png b/fhem/www/images/default/weather/partly_cloudy_night.png
similarity index 100%
rename from www/images/default/weather/partly_cloudy_night.png
rename to fhem/www/images/default/weather/partly_cloudy_night.png
diff --git a/www/images/default/weather/partlycloudy.png b/fhem/www/images/default/weather/partlycloudy.png
similarity index 100%
rename from www/images/default/weather/partlycloudy.png
rename to fhem/www/images/default/weather/partlycloudy.png
diff --git a/www/images/default/weather/partlycloudy_night.png b/fhem/www/images/default/weather/partlycloudy_night.png
similarity index 100%
rename from www/images/default/weather/partlycloudy_night.png
rename to fhem/www/images/default/weather/partlycloudy_night.png
diff --git a/www/images/default/weather/rain.png b/fhem/www/images/default/weather/rain.png
similarity index 100%
rename from www/images/default/weather/rain.png
rename to fhem/www/images/default/weather/rain.png
diff --git a/www/images/default/weather/rainsnow.png b/fhem/www/images/default/weather/rainsnow.png
similarity index 100%
rename from www/images/default/weather/rainsnow.png
rename to fhem/www/images/default/weather/rainsnow.png
diff --git a/www/images/default/weather/scatteredshowers.png b/fhem/www/images/default/weather/scatteredshowers.png
similarity index 100%
rename from www/images/default/weather/scatteredshowers.png
rename to fhem/www/images/default/weather/scatteredshowers.png
diff --git a/www/images/default/weather/scatteredshowers_night.png b/fhem/www/images/default/weather/scatteredshowers_night.png
similarity index 100%
rename from www/images/default/weather/scatteredshowers_night.png
rename to fhem/www/images/default/weather/scatteredshowers_night.png
diff --git a/www/images/default/weather/scatteredthunderstorms.png b/fhem/www/images/default/weather/scatteredthunderstorms.png
similarity index 100%
rename from www/images/default/weather/scatteredthunderstorms.png
rename to fhem/www/images/default/weather/scatteredthunderstorms.png
diff --git a/www/images/default/weather/scatteredthunderstorms_night.png b/fhem/www/images/default/weather/scatteredthunderstorms_night.png
similarity index 100%
rename from www/images/default/weather/scatteredthunderstorms_night.png
rename to fhem/www/images/default/weather/scatteredthunderstorms_night.png
diff --git a/www/images/default/weather/showers.png b/fhem/www/images/default/weather/showers.png
similarity index 100%
rename from www/images/default/weather/showers.png
rename to fhem/www/images/default/weather/showers.png
diff --git a/www/images/default/weather/showers_night.png b/fhem/www/images/default/weather/showers_night.png
similarity index 100%
rename from www/images/default/weather/showers_night.png
rename to fhem/www/images/default/weather/showers_night.png
diff --git a/www/images/default/weather/sleet.png b/fhem/www/images/default/weather/sleet.png
similarity index 100%
rename from www/images/default/weather/sleet.png
rename to fhem/www/images/default/weather/sleet.png
diff --git a/www/images/default/weather/smoke.png b/fhem/www/images/default/weather/smoke.png
similarity index 100%
rename from www/images/default/weather/smoke.png
rename to fhem/www/images/default/weather/smoke.png
diff --git a/www/images/default/weather/snow.png b/fhem/www/images/default/weather/snow.png
similarity index 100%
rename from www/images/default/weather/snow.png
rename to fhem/www/images/default/weather/snow.png
diff --git a/www/images/default/weather/snowflurries.png b/fhem/www/images/default/weather/snowflurries.png
similarity index 100%
rename from www/images/default/weather/snowflurries.png
rename to fhem/www/images/default/weather/snowflurries.png
diff --git a/www/images/default/weather/storm.png b/fhem/www/images/default/weather/storm.png
similarity index 100%
rename from www/images/default/weather/storm.png
rename to fhem/www/images/default/weather/storm.png
diff --git a/www/images/default/weather/sunny.png b/fhem/www/images/default/weather/sunny.png
similarity index 100%
rename from www/images/default/weather/sunny.png
rename to fhem/www/images/default/weather/sunny.png
diff --git a/www/images/default/weather/sunny_night.png b/fhem/www/images/default/weather/sunny_night.png
similarity index 100%
rename from www/images/default/weather/sunny_night.png
rename to fhem/www/images/default/weather/sunny_night.png
diff --git a/www/images/default/weather/thunderstorm.png b/fhem/www/images/default/weather/thunderstorm.png
similarity index 100%
rename from www/images/default/weather/thunderstorm.png
rename to fhem/www/images/default/weather/thunderstorm.png
diff --git a/www/images/default/weather/windy.png b/fhem/www/images/default/weather/windy.png
similarity index 100%
rename from www/images/default/weather/windy.png
rename to fhem/www/images/default/weather/windy.png
diff --git a/www/images/smallscreen/fhem_smallscreen.png b/fhem/www/images/smallscreen/fhem_smallscreen.png
similarity index 100%
rename from www/images/smallscreen/fhem_smallscreen.png
rename to fhem/www/images/smallscreen/fhem_smallscreen.png
diff --git a/www/pgm2/console.js b/fhem/www/pgm2/console.js
similarity index 100%
rename from www/pgm2/console.js
rename to fhem/www/pgm2/console.js
diff --git a/www/pgm2/darkfloorplanstyle.css b/fhem/www/pgm2/darkfloorplanstyle.css
similarity index 100%
rename from www/pgm2/darkfloorplanstyle.css
rename to fhem/www/pgm2/darkfloorplanstyle.css
diff --git a/www/pgm2/darkstyle.css b/fhem/www/pgm2/darkstyle.css
similarity index 100%
rename from www/pgm2/darkstyle.css
rename to fhem/www/pgm2/darkstyle.css
diff --git a/www/pgm2/darksvg_defs.svg b/fhem/www/pgm2/darksvg_defs.svg
similarity index 100%
rename from www/pgm2/darksvg_defs.svg
rename to fhem/www/pgm2/darksvg_defs.svg
diff --git a/www/pgm2/darksvg_style.css b/fhem/www/pgm2/darksvg_style.css
similarity index 100%
rename from www/pgm2/darksvg_style.css
rename to fhem/www/pgm2/darksvg_style.css
diff --git a/www/pgm2/fhemweb.js b/fhem/www/pgm2/fhemweb.js
similarity index 100%
rename from www/pgm2/fhemweb.js
rename to fhem/www/pgm2/fhemweb.js
diff --git a/www/pgm2/floorplanstyle.css b/fhem/www/pgm2/floorplanstyle.css
similarity index 100%
rename from www/pgm2/floorplanstyle.css
rename to fhem/www/pgm2/floorplanstyle.css
diff --git a/www/pgm2/smallscreenstyle.css b/fhem/www/pgm2/smallscreenstyle.css
similarity index 100%
rename from www/pgm2/smallscreenstyle.css
rename to fhem/www/pgm2/smallscreenstyle.css
diff --git a/www/pgm2/style.css b/fhem/www/pgm2/style.css
similarity index 100%
rename from www/pgm2/style.css
rename to fhem/www/pgm2/style.css
diff --git a/www/pgm2/svg.js b/fhem/www/pgm2/svg.js
similarity index 100%
rename from www/pgm2/svg.js
rename to fhem/www/pgm2/svg.js
diff --git a/www/pgm2/svg_defs.svg b/fhem/www/pgm2/svg_defs.svg
similarity index 100%
rename from www/pgm2/svg_defs.svg
rename to fhem/www/pgm2/svg_defs.svg
diff --git a/www/pgm2/svg_style.css b/fhem/www/pgm2/svg_style.css
similarity index 100%
rename from www/pgm2/svg_style.css
rename to fhem/www/pgm2/svg_style.css
diff --git a/www/pgm2/touchpadstyle.css b/fhem/www/pgm2/touchpadstyle.css
similarity index 100%
rename from www/pgm2/touchpadstyle.css
rename to fhem/www/pgm2/touchpadstyle.css