diff --git a/devices/aeon-home-energy-meter/aeon-home-energy-meter.groovy b/devicetypes/codersaur/aeon-home-energy-meter.src/aeon-home-energy-meter.groovy
similarity index 100%
rename from devices/aeon-home-energy-meter/aeon-home-energy-meter.groovy
rename to devicetypes/codersaur/aeon-home-energy-meter.src/aeon-home-energy-meter.groovy
diff --git a/devices/aeon-home-energy-meter/screenshots/grafana_daily_usage.png b/devicetypes/codersaur/aeon-home-energy-meter.src/screenshots/grafana_daily_usage.png
similarity index 100%
rename from devices/aeon-home-energy-meter/screenshots/grafana_daily_usage.png
rename to devicetypes/codersaur/aeon-home-energy-meter.src/screenshots/grafana_daily_usage.png
diff --git a/devices/aeon-home-energy-meter/screenshots/grafana_power_chart.png b/devicetypes/codersaur/aeon-home-energy-meter.src/screenshots/grafana_power_chart.png
similarity index 100%
rename from devices/aeon-home-energy-meter/screenshots/grafana_power_chart.png
rename to devicetypes/codersaur/aeon-home-energy-meter.src/screenshots/grafana_power_chart.png
diff --git a/devices/aeon-home-energy-meter/screenshots/st_device.png b/devicetypes/codersaur/aeon-home-energy-meter.src/screenshots/st_device.png
similarity index 100%
rename from devices/aeon-home-energy-meter/screenshots/st_device.png
rename to devicetypes/codersaur/aeon-home-energy-meter.src/screenshots/st_device.png
diff --git a/devices/aeon-home-energy-meter/screenshots/st_device_settings.png b/devicetypes/codersaur/aeon-home-energy-meter.src/screenshots/st_device_settings.png
similarity index 100%
rename from devices/aeon-home-energy-meter/screenshots/st_device_settings.png
rename to devicetypes/codersaur/aeon-home-energy-meter.src/screenshots/st_device_settings.png
diff --git a/devices/evohome/evohome-heating-zone.groovy b/devicetypes/codersaur/evohome.src/evohome-heating-zone.groovy
similarity index 100%
rename from devices/evohome/evohome-heating-zone.groovy
rename to devicetypes/codersaur/evohome.src/evohome-heating-zone.groovy
diff --git a/devices/fibaro-dimmer-2/README.md b/devicetypes/codersaur/fibaro-dimmer-2.src/README.md
similarity index 100%
rename from devices/fibaro-dimmer-2/README.md
rename to devicetypes/codersaur/fibaro-dimmer-2.src/README.md
diff --git a/devices/fibaro-dimmer-2/fibaro-dimmer-2.groovy b/devicetypes/codersaur/fibaro-dimmer-2.src/fibaro-dimmer-2.groovy
similarity index 100%
rename from devices/fibaro-dimmer-2/fibaro-dimmer-2.groovy
rename to devicetypes/codersaur/fibaro-dimmer-2.src/fibaro-dimmer-2.groovy
diff --git a/devices/fibaro-dimmer-2/screenshots/fd2-ss-logmessages.PNG b/devicetypes/codersaur/fibaro-dimmer-2.src/screenshots/fd2-ss-logmessages.PNG
similarity index 100%
rename from devices/fibaro-dimmer-2/screenshots/fd2-ss-logmessages.PNG
rename to devicetypes/codersaur/fibaro-dimmer-2.src/screenshots/fd2-ss-logmessages.PNG
diff --git a/devices/fibaro-dimmer-2/screenshots/fd2-ss-settings-assocgroups.png b/devicetypes/codersaur/fibaro-dimmer-2.src/screenshots/fd2-ss-settings-assocgroups.png
similarity index 100%
rename from devices/fibaro-dimmer-2/screenshots/fd2-ss-settings-assocgroups.png
rename to devicetypes/codersaur/fibaro-dimmer-2.src/screenshots/fd2-ss-settings-assocgroups.png
diff --git a/devices/fibaro-dimmer-2/screenshots/fd2-ss-settings-general.png b/devicetypes/codersaur/fibaro-dimmer-2.src/screenshots/fd2-ss-settings-general.png
similarity index 100%
rename from devices/fibaro-dimmer-2/screenshots/fd2-ss-settings-general.png
rename to devicetypes/codersaur/fibaro-dimmer-2.src/screenshots/fd2-ss-settings-general.png
diff --git a/devices/fibaro-dimmer-2/screenshots/fd2-ss-settings-nightmode.png b/devicetypes/codersaur/fibaro-dimmer-2.src/screenshots/fd2-ss-settings-nightmode.png
similarity index 100%
rename from devices/fibaro-dimmer-2/screenshots/fd2-ss-settings-nightmode.png
rename to devicetypes/codersaur/fibaro-dimmer-2.src/screenshots/fd2-ss-settings-nightmode.png
diff --git a/devices/fibaro-dimmer-2/screenshots/fd2-ss-settings-params.png b/devicetypes/codersaur/fibaro-dimmer-2.src/screenshots/fd2-ss-settings-params.png
similarity index 100%
rename from devices/fibaro-dimmer-2/screenshots/fd2-ss-settings-params.png
rename to devicetypes/codersaur/fibaro-dimmer-2.src/screenshots/fd2-ss-settings-params.png
diff --git a/devices/fibaro-dimmer-2/screenshots/fd2-ss-settings-protection.png b/devicetypes/codersaur/fibaro-dimmer-2.src/screenshots/fd2-ss-settings-protection.png
similarity index 100%
rename from devices/fibaro-dimmer-2/screenshots/fd2-ss-settings-protection.png
rename to devicetypes/codersaur/fibaro-dimmer-2.src/screenshots/fd2-ss-settings-protection.png
diff --git a/devices/fibaro-dimmer-2/screenshots/fd2-ss-settings-protection2.png b/devicetypes/codersaur/fibaro-dimmer-2.src/screenshots/fd2-ss-settings-protection2.png
similarity index 100%
rename from devices/fibaro-dimmer-2/screenshots/fd2-ss-settings-protection2.png
rename to devicetypes/codersaur/fibaro-dimmer-2.src/screenshots/fd2-ss-settings-protection2.png
diff --git a/devices/fibaro-dimmer-2/screenshots/fd2-ss-tiles-fault.png b/devicetypes/codersaur/fibaro-dimmer-2.src/screenshots/fd2-ss-tiles-fault.png
similarity index 100%
rename from devices/fibaro-dimmer-2/screenshots/fd2-ss-tiles-fault.png
rename to devicetypes/codersaur/fibaro-dimmer-2.src/screenshots/fd2-ss-tiles-fault.png
diff --git a/devices/fibaro-dimmer-2/screenshots/fd2-ss-tiles-off.png b/devicetypes/codersaur/fibaro-dimmer-2.src/screenshots/fd2-ss-tiles-off.png
similarity index 100%
rename from devices/fibaro-dimmer-2/screenshots/fd2-ss-tiles-off.png
rename to devicetypes/codersaur/fibaro-dimmer-2.src/screenshots/fd2-ss-tiles-off.png
diff --git a/devices/fibaro-dimmer-2/screenshots/fd2-ss-tiles-on.png b/devicetypes/codersaur/fibaro-dimmer-2.src/screenshots/fd2-ss-tiles-on.png
similarity index 100%
rename from devices/fibaro-dimmer-2/screenshots/fd2-ss-tiles-on.png
rename to devicetypes/codersaur/fibaro-dimmer-2.src/screenshots/fd2-ss-tiles-on.png
diff --git a/devices/fibaro-dimmer-2/screenshots/fd2-ss-tiles-power-energy.png b/devicetypes/codersaur/fibaro-dimmer-2.src/screenshots/fd2-ss-tiles-power-energy.png
similarity index 100%
rename from devices/fibaro-dimmer-2/screenshots/fd2-ss-tiles-power-energy.png
rename to devicetypes/codersaur/fibaro-dimmer-2.src/screenshots/fd2-ss-tiles-power-energy.png
diff --git a/devices/fibaro-dimmer-2/screenshots/fd2-ss-tiles-sync.png b/devicetypes/codersaur/fibaro-dimmer-2.src/screenshots/fd2-ss-tiles-sync.png
similarity index 100%
rename from devices/fibaro-dimmer-2/screenshots/fd2-ss-tiles-sync.png
rename to devicetypes/codersaur/fibaro-dimmer-2.src/screenshots/fd2-ss-tiles-sync.png
diff --git a/devices/fibaro-flood-sensor/README.md b/devicetypes/codersaur/fibaro-flood-sensor.src/README.md
similarity index 100%
rename from devices/fibaro-flood-sensor/README.md
rename to devicetypes/codersaur/fibaro-flood-sensor.src/README.md
diff --git a/devices/fibaro-flood-sensor/fibaro-flood-sensor.groovy b/devicetypes/codersaur/fibaro-flood-sensor.src/fibaro-flood-sensor.groovy
similarity index 100%
rename from devices/fibaro-flood-sensor/fibaro-flood-sensor.groovy
rename to devicetypes/codersaur/fibaro-flood-sensor.src/fibaro-flood-sensor.groovy
diff --git a/devices/fibaro-flood-sensor/screenshots/ffs-ss-settings-assoc.png b/devicetypes/codersaur/fibaro-flood-sensor.src/screenshots/ffs-ss-settings-assoc.png
similarity index 100%
rename from devices/fibaro-flood-sensor/screenshots/ffs-ss-settings-assoc.png
rename to devicetypes/codersaur/fibaro-flood-sensor.src/screenshots/ffs-ss-settings-assoc.png
diff --git a/devices/fibaro-flood-sensor/screenshots/ffs-ss-settings-general.png b/devicetypes/codersaur/fibaro-flood-sensor.src/screenshots/ffs-ss-settings-general.png
similarity index 100%
rename from devices/fibaro-flood-sensor/screenshots/ffs-ss-settings-general.png
rename to devicetypes/codersaur/fibaro-flood-sensor.src/screenshots/ffs-ss-settings-general.png
diff --git a/devices/fibaro-flood-sensor/screenshots/ffs-ss-settings-parameters.png b/devicetypes/codersaur/fibaro-flood-sensor.src/screenshots/ffs-ss-settings-parameters.png
similarity index 100%
rename from devices/fibaro-flood-sensor/screenshots/ffs-ss-settings-parameters.png
rename to devicetypes/codersaur/fibaro-flood-sensor.src/screenshots/ffs-ss-settings-parameters.png
diff --git a/devices/fibaro-flood-sensor/screenshots/ffs-ss-settings-wakeup.png b/devicetypes/codersaur/fibaro-flood-sensor.src/screenshots/ffs-ss-settings-wakeup.png
similarity index 100%
rename from devices/fibaro-flood-sensor/screenshots/ffs-ss-settings-wakeup.png
rename to devicetypes/codersaur/fibaro-flood-sensor.src/screenshots/ffs-ss-settings-wakeup.png
diff --git a/devices/fibaro-flood-sensor/screenshots/ffs-ss-tiles-battery.png b/devicetypes/codersaur/fibaro-flood-sensor.src/screenshots/ffs-ss-tiles-battery.png
similarity index 100%
rename from devices/fibaro-flood-sensor/screenshots/ffs-ss-tiles-battery.png
rename to devicetypes/codersaur/fibaro-flood-sensor.src/screenshots/ffs-ss-tiles-battery.png
diff --git a/devices/fibaro-flood-sensor/screenshots/ffs-ss-tiles-main.png b/devicetypes/codersaur/fibaro-flood-sensor.src/screenshots/ffs-ss-tiles-main.png
similarity index 100%
rename from devices/fibaro-flood-sensor/screenshots/ffs-ss-tiles-main.png
rename to devicetypes/codersaur/fibaro-flood-sensor.src/screenshots/ffs-ss-tiles-main.png
diff --git a/devices/fibaro-flood-sensor/screenshots/ffs-ss-tiles-sync.png b/devicetypes/codersaur/fibaro-flood-sensor.src/screenshots/ffs-ss-tiles-sync.png
similarity index 100%
rename from devices/fibaro-flood-sensor/screenshots/ffs-ss-tiles-sync.png
rename to devicetypes/codersaur/fibaro-flood-sensor.src/screenshots/ffs-ss-tiles-sync.png
diff --git a/devices/fibaro-flood-sensor/screenshots/ffs-ss-tiles-tamper.png b/devicetypes/codersaur/fibaro-flood-sensor.src/screenshots/ffs-ss-tiles-tamper.png
similarity index 100%
rename from devices/fibaro-flood-sensor/screenshots/ffs-ss-tiles-tamper.png
rename to devicetypes/codersaur/fibaro-flood-sensor.src/screenshots/ffs-ss-tiles-tamper.png
diff --git a/devices/fibaro-flood-sensor/screenshots/ffs-ss-tiles-wet.png b/devicetypes/codersaur/fibaro-flood-sensor.src/screenshots/ffs-ss-tiles-wet.png
similarity index 100%
rename from devices/fibaro-flood-sensor/screenshots/ffs-ss-tiles-wet.png
rename to devicetypes/codersaur/fibaro-flood-sensor.src/screenshots/ffs-ss-tiles-wet.png
diff --git a/devices/fibaro-rgbw-controller/README.md b/devicetypes/codersaur/fibaro-rgbw-controller.src/README.md
similarity index 100%
rename from devices/fibaro-rgbw-controller/README.md
rename to devicetypes/codersaur/fibaro-rgbw-controller.src/README.md
diff --git a/devices/fibaro-rgbw-controller/fibaro-rgbw-controller.groovy b/devicetypes/codersaur/fibaro-rgbw-controller.src/fibaro-rgbw-controller.groovy
similarity index 100%
rename from devices/fibaro-rgbw-controller/fibaro-rgbw-controller.groovy
rename to devicetypes/codersaur/fibaro-rgbw-controller.src/fibaro-rgbw-controller.groovy
diff --git a/devices/fibaro-rgbw-controller/screenshots/device_attributes_partial.png b/devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/device_attributes_partial.png
similarity index 100%
rename from devices/fibaro-rgbw-controller/screenshots/device_attributes_partial.png
rename to devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/device_attributes_partial.png
diff --git a/devices/fibaro-rgbw-controller/screenshots/screenshot_color_shortcuts.png b/devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/screenshot_color_shortcuts.png
similarity index 100%
rename from devices/fibaro-rgbw-controller/screenshots/screenshot_color_shortcuts.png
rename to devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/screenshot_color_shortcuts.png
diff --git a/devices/fibaro-rgbw-controller/screenshots/screenshot_four_inputs.png b/devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/screenshot_four_inputs.png
similarity index 100%
rename from devices/fibaro-rgbw-controller/screenshots/screenshot_four_inputs.png
rename to devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/screenshot_four_inputs.png
diff --git a/devices/fibaro-rgbw-controller/screenshots/screenshot_power_energy.png b/devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/screenshot_power_energy.png
similarity index 100%
rename from devices/fibaro-rgbw-controller/screenshots/screenshot_power_energy.png
rename to devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/screenshot_power_energy.png
diff --git a/devices/fibaro-rgbw-controller/screenshots/screenshot_power_energy2.png b/devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/screenshot_power_energy2.png
similarity index 100%
rename from devices/fibaro-rgbw-controller/screenshots/screenshot_power_energy2.png
rename to devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/screenshot_power_energy2.png
diff --git a/devices/fibaro-rgbw-controller/screenshots/screenshot_rgb_plus_input.png b/devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/screenshot_rgb_plus_input.png
similarity index 100%
rename from devices/fibaro-rgbw-controller/screenshots/screenshot_rgb_plus_input.png
rename to devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/screenshot_rgb_plus_input.png
diff --git a/devices/fibaro-rgbw-controller/screenshots/screenshot_rgbw.png b/devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/screenshot_rgbw.png
similarity index 100%
rename from devices/fibaro-rgbw-controller/screenshots/screenshot_rgbw.png
rename to devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/screenshot_rgbw.png
diff --git a/devices/fibaro-rgbw-controller/screenshots/screenshot_two_out_two_in.png b/devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/screenshot_two_out_two_in.png
similarity index 100%
rename from devices/fibaro-rgbw-controller/screenshots/screenshot_two_out_two_in.png
rename to devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/screenshot_two_out_two_in.png
diff --git a/devices/fibaro-rgbw-controller/screenshots/settings_aggregates.png b/devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/settings_aggregates.png
similarity index 100%
rename from devices/fibaro-rgbw-controller/screenshots/settings_aggregates.png
rename to devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/settings_aggregates.png
diff --git a/devices/fibaro-rgbw-controller/screenshots/settings_mappings_four_inputs.png b/devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/settings_mappings_four_inputs.png
similarity index 100%
rename from devices/fibaro-rgbw-controller/screenshots/settings_mappings_four_inputs.png
rename to devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/settings_mappings_four_inputs.png
diff --git a/devices/fibaro-rgbw-controller/screenshots/settings_mappings_rgb.png b/devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/settings_mappings_rgb.png
similarity index 100%
rename from devices/fibaro-rgbw-controller/screenshots/settings_mappings_rgb.png
rename to devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/settings_mappings_rgb.png
diff --git a/devices/fibaro-rgbw-controller/screenshots/settings_params_four_inputs.png b/devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/settings_params_four_inputs.png
similarity index 100%
rename from devices/fibaro-rgbw-controller/screenshots/settings_params_four_inputs.png
rename to devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/settings_params_four_inputs.png
diff --git a/devices/fibaro-rgbw-controller/screenshots/settings_params_rgb_plus_in.png b/devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/settings_params_rgb_plus_in.png
similarity index 100%
rename from devices/fibaro-rgbw-controller/screenshots/settings_params_rgb_plus_in.png
rename to devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/settings_params_rgb_plus_in.png
diff --git a/devices/fibaro-rgbw-controller/screenshots/settings_params_rgbw.png b/devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/settings_params_rgbw.png
similarity index 100%
rename from devices/fibaro-rgbw-controller/screenshots/settings_params_rgbw.png
rename to devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/settings_params_rgbw.png
diff --git a/devices/fibaro-rgbw-controller/screenshots/settings_params_two_out_two_in.png b/devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/settings_params_two_out_two_in.png
similarity index 100%
rename from devices/fibaro-rgbw-controller/screenshots/settings_params_two_out_two_in.png
rename to devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/settings_params_two_out_two_in.png
diff --git a/devices/fibaro-rgbw-controller/screenshots/tiles_code_four_inputs.png b/devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/tiles_code_four_inputs.png
similarity index 100%
rename from devices/fibaro-rgbw-controller/screenshots/tiles_code_four_inputs.png
rename to devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/tiles_code_four_inputs.png
diff --git a/devices/fibaro-rgbw-controller/screenshots/tiles_code_rgb_plus_input.png b/devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/tiles_code_rgb_plus_input.png
similarity index 100%
rename from devices/fibaro-rgbw-controller/screenshots/tiles_code_rgb_plus_input.png
rename to devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/tiles_code_rgb_plus_input.png
diff --git a/devices/fibaro-rgbw-controller/screenshots/tiles_code_rgbw.png b/devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/tiles_code_rgbw.png
similarity index 100%
rename from devices/fibaro-rgbw-controller/screenshots/tiles_code_rgbw.png
rename to devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/tiles_code_rgbw.png
diff --git a/devices/fibaro-rgbw-controller/screenshots/tiles_code_two_out_two_in.png b/devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/tiles_code_two_out_two_in.png
similarity index 100%
rename from devices/fibaro-rgbw-controller/screenshots/tiles_code_two_out_two_in.png
rename to devicetypes/codersaur/fibaro-rgbw-controller.src/screenshots/tiles_code_two_out_two_in.png
diff --git a/devices/greenwave-powernode-single/README.md b/devicetypes/codersaur/greenwave-powernode-single.src/README.md
similarity index 100%
rename from devices/greenwave-powernode-single/README.md
rename to devicetypes/codersaur/greenwave-powernode-single.src/README.md
diff --git a/devices/greenwave-powernode-single/greenwave-powernode-single.groovy b/devicetypes/codersaur/greenwave-powernode-single.src/greenwave-powernode-single.groovy
similarity index 100%
rename from devices/greenwave-powernode-single/greenwave-powernode-single.groovy
rename to devicetypes/codersaur/greenwave-powernode-single.src/greenwave-powernode-single.groovy
diff --git a/devices/greenwave-powernode-single/screenshots/gwpn-ss-settings-device.png b/devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-settings-device.png
similarity index 100%
rename from devices/greenwave-powernode-single/screenshots/gwpn-ss-settings-device.png
rename to devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-settings-device.png
diff --git a/devices/greenwave-powernode-single/screenshots/gwpn-ss-settings-general.png b/devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-settings-general.png
similarity index 100%
rename from devices/greenwave-powernode-single/screenshots/gwpn-ss-settings-general.png
rename to devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-settings-general.png
diff --git a/devices/greenwave-powernode-single/screenshots/gwpn-ss-settings-params.png b/devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-settings-params.png
similarity index 100%
rename from devices/greenwave-powernode-single/screenshots/gwpn-ss-settings-params.png
rename to devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-settings-params.png
diff --git a/devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-blink.png b/devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-blink.png
similarity index 100%
rename from devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-blink.png
rename to devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-blink.png
diff --git a/devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-clear.png b/devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-clear.png
similarity index 100%
rename from devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-clear.png
rename to devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-clear.png
diff --git a/devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-colour-wheel-aqua.png b/devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-colour-wheel-aqua.png
similarity index 100%
rename from devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-colour-wheel-aqua.png
rename to devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-colour-wheel-aqua.png
diff --git a/devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-colour-wheel-orange.png b/devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-colour-wheel-orange.png
similarity index 100%
rename from devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-colour-wheel-orange.png
rename to devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-colour-wheel-orange.png
diff --git a/devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-fault-active.png b/devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-fault-active.png
similarity index 100%
rename from devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-fault-active.png
rename to devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-fault-active.png
diff --git a/devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-fault.png b/devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-fault.png
similarity index 100%
rename from devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-fault.png
rename to devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-fault.png
diff --git a/devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-local-full.png b/devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-local-full.png
similarity index 100%
rename from devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-local-full.png
rename to devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-local-full.png
diff --git a/devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-local-protected.png b/devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-local-protected.png
similarity index 100%
rename from devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-local-protected.png
rename to devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-local-protected.png
diff --git a/devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-lp-protected.png b/devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-lp-protected.png
similarity index 100%
rename from devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-lp-protected.png
rename to devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-lp-protected.png
diff --git a/devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-lp-unprotected.png b/devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-lp-unprotected.png
similarity index 100%
rename from devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-lp-unprotected.png
rename to devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-lp-unprotected.png
diff --git a/devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-main.png b/devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-main.png
similarity index 100%
rename from devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-main.png
rename to devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-main.png
diff --git a/devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-power-energy.png b/devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-power-energy.png
similarity index 100%
rename from devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-power-energy.png
rename to devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-power-energy.png
diff --git a/devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-rfp-protected.png b/devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-rfp-protected.png
similarity index 100%
rename from devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-rfp-protected.png
rename to devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-rfp-protected.png
diff --git a/devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-rfp-unprotected.png b/devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-rfp-unprotected.png
similarity index 100%
rename from devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-rfp-unprotected.png
rename to devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-rfp-unprotected.png
diff --git a/devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-sync-pending.png b/devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-sync-pending.png
similarity index 100%
rename from devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-sync-pending.png
rename to devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-sync-pending.png
diff --git a/devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-sync.png b/devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-sync.png
similarity index 100%
rename from devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-sync.png
rename to devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-sync.png
diff --git a/devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-synced.png b/devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-synced.png
similarity index 100%
rename from devices/greenwave-powernode-single/screenshots/gwpn-ss-tiles-synced.png
rename to devicetypes/codersaur/greenwave-powernode-single.src/screenshots/gwpn-ss-tiles-synced.png
diff --git a/devices/philio-dual-relay/philio-dual-relay.groovy b/devicetypes/codersaur/philio-dual-relay.src/philio-dual-relay.groovy
similarity index 100%
rename from devices/philio-dual-relay/philio-dual-relay.groovy
rename to devicetypes/codersaur/philio-dual-relay.src/philio-dual-relay.groovy
diff --git a/devices/tkb-metering-switch/tkb-metering-switch.groovy b/devicetypes/codersaur/tkb-metering-switch.src/tkb-metering-switch.groovy
similarity index 100%
rename from devices/tkb-metering-switch/tkb-metering-switch.groovy
rename to devicetypes/codersaur/tkb-metering-switch.src/tkb-metering-switch.groovy
diff --git a/devices/zwave-tweaker/README.md b/devicetypes/codersaur/zwave-tweaker.src/README.md
similarity index 100%
rename from devices/zwave-tweaker/README.md
rename to devicetypes/codersaur/zwave-tweaker.src/README.md
diff --git a/devices/zwave-tweaker/screenshots/zwt-ss-log-assocgroupsync.png b/devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-log-assocgroupsync.png
similarity index 100%
rename from devices/zwave-tweaker/screenshots/zwt-ss-log-assocgroupsync.png
rename to devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-log-assocgroupsync.png
diff --git a/devices/zwave-tweaker/screenshots/zwt-ss-log-paramsync.png b/devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-log-paramsync.png
similarity index 100%
rename from devices/zwave-tweaker/screenshots/zwt-ss-log-paramsync.png
rename to devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-log-paramsync.png
diff --git a/devices/zwave-tweaker/screenshots/zwt-ss-log-print-assocgroups.png b/devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-log-print-assocgroups.png
similarity index 100%
rename from devices/zwave-tweaker/screenshots/zwt-ss-log-print-assocgroups.png
rename to devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-log-print-assocgroups.png
diff --git a/devices/zwave-tweaker/screenshots/zwt-ss-log-print-commands.png b/devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-log-print-commands.png
similarity index 100%
rename from devices/zwave-tweaker/screenshots/zwt-ss-log-print-commands.png
rename to devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-log-print-commands.png
diff --git a/devices/zwave-tweaker/screenshots/zwt-ss-log-print-endpoints.png b/devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-log-print-endpoints.png
similarity index 100%
rename from devices/zwave-tweaker/screenshots/zwt-ss-log-print-endpoints.png
rename to devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-log-print-endpoints.png
diff --git a/devices/zwave-tweaker/screenshots/zwt-ss-log-print-general-stats.png b/devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-log-print-general-stats.png
similarity index 100%
rename from devices/zwave-tweaker/screenshots/zwt-ss-log-print-general-stats.png
rename to devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-log-print-general-stats.png
diff --git a/devices/zwave-tweaker/screenshots/zwt-ss-log-print-general.png b/devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-log-print-general.png
similarity index 100%
rename from devices/zwave-tweaker/screenshots/zwt-ss-log-print-general.png
rename to devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-log-print-general.png
diff --git a/devices/zwave-tweaker/screenshots/zwt-ss-log-print-params.png b/devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-log-print-params.png
similarity index 100%
rename from devices/zwave-tweaker/screenshots/zwt-ss-log-print-params.png
rename to devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-log-print-params.png
diff --git a/devices/zwave-tweaker/screenshots/zwt-ss-log-print-sensor.png b/devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-log-print-sensor.png
similarity index 100%
rename from devices/zwave-tweaker/screenshots/zwt-ss-log-print-sensor.png
rename to devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-log-print-sensor.png
diff --git a/devices/zwave-tweaker/screenshots/zwt-ss-log-protection-sync.png b/devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-log-protection-sync.png
similarity index 100%
rename from devices/zwave-tweaker/screenshots/zwt-ss-log-protection-sync.png
rename to devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-log-protection-sync.png
diff --git a/devices/zwave-tweaker/screenshots/zwt-ss-log-switch-all-sync.png b/devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-log-switch-all-sync.png
similarity index 100%
rename from devices/zwave-tweaker/screenshots/zwt-ss-log-switch-all-sync.png
rename to devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-log-switch-all-sync.png
diff --git a/devices/zwave-tweaker/screenshots/zwt-ss-settings-assocgroup.png b/devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-settings-assocgroup.png
similarity index 100%
rename from devices/zwave-tweaker/screenshots/zwt-ss-settings-assocgroup.png
rename to devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-settings-assocgroup.png
diff --git a/devices/zwave-tweaker/screenshots/zwt-ss-settings-general.png b/devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-settings-general.png
similarity index 100%
rename from devices/zwave-tweaker/screenshots/zwt-ss-settings-general.png
rename to devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-settings-general.png
diff --git a/devices/zwave-tweaker/screenshots/zwt-ss-settings-original.png b/devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-settings-original.png
similarity index 100%
rename from devices/zwave-tweaker/screenshots/zwt-ss-settings-original.png
rename to devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-settings-original.png
diff --git a/devices/zwave-tweaker/screenshots/zwt-ss-settings-param.png b/devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-settings-param.png
similarity index 100%
rename from devices/zwave-tweaker/screenshots/zwt-ss-settings-param.png
rename to devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-settings-param.png
diff --git a/devices/zwave-tweaker/screenshots/zwt-ss-settings-protection.png b/devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-settings-protection.png
similarity index 100%
rename from devices/zwave-tweaker/screenshots/zwt-ss-settings-protection.png
rename to devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-settings-protection.png
diff --git a/devices/zwave-tweaker/screenshots/zwt-ss-settings-scan-ranges.png b/devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-settings-scan-ranges.png
similarity index 100%
rename from devices/zwave-tweaker/screenshots/zwt-ss-settings-scan-ranges.png
rename to devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-settings-scan-ranges.png
diff --git a/devices/zwave-tweaker/screenshots/zwt-ss-settings-switch-all.png b/devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-settings-switch-all.png
similarity index 100%
rename from devices/zwave-tweaker/screenshots/zwt-ss-settings-switch-all.png
rename to devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-settings-switch-all.png
diff --git a/devices/zwave-tweaker/screenshots/zwt-ss-tiles-clear.png b/devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-tiles-clear.png
similarity index 100%
rename from devices/zwave-tweaker/screenshots/zwt-ss-tiles-clear.png
rename to devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-tiles-clear.png
diff --git a/devices/zwave-tweaker/screenshots/zwt-ss-tiles-main.png b/devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-tiles-main.png
similarity index 100%
rename from devices/zwave-tweaker/screenshots/zwt-ss-tiles-main.png
rename to devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-tiles-main.png
diff --git a/devices/zwave-tweaker/screenshots/zwt-ss-tiles-main2.png b/devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-tiles-main2.png
similarity index 100%
rename from devices/zwave-tweaker/screenshots/zwt-ss-tiles-main2.png
rename to devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-tiles-main2.png
diff --git a/devices/zwave-tweaker/screenshots/zwt-ss-tiles-sync-pending.png b/devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-tiles-sync-pending.png
similarity index 100%
rename from devices/zwave-tweaker/screenshots/zwt-ss-tiles-sync-pending.png
rename to devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-tiles-sync-pending.png
diff --git a/devices/zwave-tweaker/screenshots/zwt-ss-tiles-synced.png b/devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-tiles-synced.png
similarity index 100%
rename from devices/zwave-tweaker/screenshots/zwt-ss-tiles-synced.png
rename to devicetypes/codersaur/zwave-tweaker.src/screenshots/zwt-ss-tiles-synced.png
diff --git a/devices/zwave-tweaker/zwave-tweaker.groovy b/devicetypes/codersaur/zwave-tweaker.src/zwave-tweaker.groovy
similarity index 100%
rename from devices/zwave-tweaker/zwave-tweaker.groovy
rename to devicetypes/codersaur/zwave-tweaker.src/zwave-tweaker.groovy
diff --git a/smartapps/evohome-connect/evohome-connect.groovy b/smartapps/codersaur/evohome-connect.src/evohome-connect.groovy
similarity index 100%
rename from smartapps/evohome-connect/evohome-connect.groovy
rename to smartapps/codersaur/evohome-connect.src/evohome-connect.groovy
diff --git a/smartapps/influxdb-logger/README.md b/smartapps/codersaur/influxdb-logger.src/README.md
similarity index 100%
rename from smartapps/influxdb-logger/README.md
rename to smartapps/codersaur/influxdb-logger.src/README.md
diff --git a/smartapps/influxdb-logger/influxdb-logger.groovy b/smartapps/codersaur/influxdb-logger.src/influxdb-logger.groovy
similarity index 100%
rename from smartapps/influxdb-logger/influxdb-logger.groovy
rename to smartapps/codersaur/influxdb-logger.src/influxdb-logger.groovy