diff --git a/core_brands/amazon/icon.png b/core_brands/amazon/icon.png
new file mode 100644
index 00000000..1e6fc769
Binary files /dev/null and b/core_brands/amazon/icon.png differ
diff --git a/core_brands/amazon/icon@2x.png b/core_brands/amazon/icon@2x.png
new file mode 100644
index 00000000..de540250
Binary files /dev/null and b/core_brands/amazon/icon@2x.png differ
diff --git a/core_brands/amazon/logo.png b/core_brands/amazon/logo.png
new file mode 100644
index 00000000..392e7022
Binary files /dev/null and b/core_brands/amazon/logo.png differ
diff --git a/core_brands/amazon/logo@2x.png b/core_brands/amazon/logo@2x.png
new file mode 100644
index 00000000..51fc3939
Binary files /dev/null and b/core_brands/amazon/logo@2x.png differ
diff --git a/core_integrations/aruba/icon.png b/core_brands/aruba/icon.png
similarity index 100%
rename from core_integrations/aruba/icon.png
rename to core_brands/aruba/icon.png
diff --git a/core_integrations/aruba/icon@2x.png b/core_brands/aruba/icon@2x.png
similarity index 100%
rename from core_integrations/aruba/icon@2x.png
rename to core_brands/aruba/icon@2x.png
diff --git a/core_integrations/aruba/logo.png b/core_brands/aruba/logo.png
similarity index 100%
rename from core_integrations/aruba/logo.png
rename to core_brands/aruba/logo.png
diff --git a/core_integrations/aruba/logo@2x.png b/core_brands/aruba/logo@2x.png
similarity index 100%
rename from core_integrations/aruba/logo@2x.png
rename to core_brands/aruba/logo@2x.png
diff --git a/core_integrations/asterisk_mbox/icon.png b/core_brands/asterisk/icon.png
similarity index 100%
rename from core_integrations/asterisk_mbox/icon.png
rename to core_brands/asterisk/icon.png
diff --git a/core_integrations/asterisk_mbox/icon@2x.png b/core_brands/asterisk/icon@2x.png
similarity index 100%
rename from core_integrations/asterisk_mbox/icon@2x.png
rename to core_brands/asterisk/icon@2x.png
diff --git a/core_integrations/asterisk_mbox/logo.png b/core_brands/asterisk/logo.png
similarity index 100%
rename from core_integrations/asterisk_mbox/logo.png
rename to core_brands/asterisk/logo.png
diff --git a/core_integrations/asterisk_mbox/logo@2x.png b/core_brands/asterisk/logo@2x.png
similarity index 100%
rename from core_integrations/asterisk_mbox/logo@2x.png
rename to core_brands/asterisk/logo@2x.png
diff --git a/core_integrations/august/icon.png b/core_brands/august/icon.png
similarity index 100%
rename from core_integrations/august/icon.png
rename to core_brands/august/icon.png
diff --git a/core_integrations/august/icon@2x.png b/core_brands/august/icon@2x.png
similarity index 100%
rename from core_integrations/august/icon@2x.png
rename to core_brands/august/icon@2x.png
diff --git a/core_integrations/august/logo.png b/core_brands/august/logo.png
similarity index 100%
rename from core_integrations/august/logo.png
rename to core_brands/august/logo.png
diff --git a/core_integrations/august/logo@2x.png b/core_brands/august/logo@2x.png
similarity index 100%
rename from core_integrations/august/logo@2x.png
rename to core_brands/august/logo@2x.png
diff --git a/core_integrations/cisco_mobility_express/icon.png b/core_brands/cisco/icon.png
similarity index 100%
rename from core_integrations/cisco_mobility_express/icon.png
rename to core_brands/cisco/icon.png
diff --git a/core_integrations/cisco_mobility_express/icon@2x.png b/core_brands/cisco/icon@2x.png
similarity index 100%
rename from core_integrations/cisco_mobility_express/icon@2x.png
rename to core_brands/cisco/icon@2x.png
diff --git a/core_integrations/cisco_mobility_express/logo.png b/core_brands/cisco/logo.png
similarity index 100%
rename from core_integrations/cisco_mobility_express/logo.png
rename to core_brands/cisco/logo.png
diff --git a/core_integrations/cisco_mobility_express/logo@2x.png b/core_brands/cisco/logo@2x.png
similarity index 100%
rename from core_integrations/cisco_mobility_express/logo@2x.png
rename to core_brands/cisco/logo@2x.png
diff --git a/core_integrations/clicksend/icon.png b/core_brands/clicksend/icon.png
similarity index 100%
rename from core_integrations/clicksend/icon.png
rename to core_brands/clicksend/icon.png
diff --git a/core_integrations/clicksend/icon@2x.png b/core_brands/clicksend/icon@2x.png
similarity index 100%
rename from core_integrations/clicksend/icon@2x.png
rename to core_brands/clicksend/icon@2x.png
diff --git a/core_integrations/clicksend/logo.png b/core_brands/clicksend/logo.png
similarity index 100%
rename from core_integrations/clicksend/logo.png
rename to core_brands/clicksend/logo.png
diff --git a/core_integrations/clicksend/logo@2x.png b/core_brands/clicksend/logo@2x.png
similarity index 100%
rename from core_integrations/clicksend/logo@2x.png
rename to core_brands/clicksend/logo@2x.png
diff --git a/core_brands/devolo/dark_logo.png b/core_brands/devolo/dark_logo.png
new file mode 100644
index 00000000..6f22a695
Binary files /dev/null and b/core_brands/devolo/dark_logo.png differ
diff --git a/core_brands/devolo/dark_logo@2x.png b/core_brands/devolo/dark_logo@2x.png
new file mode 100644
index 00000000..5eedf2f2
Binary files /dev/null and b/core_brands/devolo/dark_logo@2x.png differ
diff --git a/core_brands/devolo/logo.png b/core_brands/devolo/logo.png
new file mode 100644
index 00000000..b754aa0c
Binary files /dev/null and b/core_brands/devolo/logo.png differ
diff --git a/core_brands/devolo/logo@2x.png b/core_brands/devolo/logo@2x.png
new file mode 100644
index 00000000..b82d3bb1
Binary files /dev/null and b/core_brands/devolo/logo@2x.png differ
diff --git a/core_integrations/dlna_dmr/icon.png b/core_brands/dlna/icon.png
similarity index 100%
rename from core_integrations/dlna_dmr/icon.png
rename to core_brands/dlna/icon.png
diff --git a/core_integrations/dlna_dmr/icon@2x.png b/core_brands/dlna/icon@2x.png
similarity index 100%
rename from core_integrations/dlna_dmr/icon@2x.png
rename to core_brands/dlna/icon@2x.png
diff --git a/core_integrations/dlna_dmr/logo.png b/core_brands/dlna/logo.png
similarity index 100%
rename from core_integrations/dlna_dmr/logo.png
rename to core_brands/dlna/logo.png
diff --git a/core_integrations/dlna_dmr/logo@2x.png b/core_brands/dlna/logo@2x.png
similarity index 100%
rename from core_integrations/dlna_dmr/logo@2x.png
rename to core_brands/dlna/logo@2x.png
diff --git a/core_integrations/elgato/icon.png b/core_brands/elgato/icon.png
similarity index 100%
rename from core_integrations/elgato/icon.png
rename to core_brands/elgato/icon.png
diff --git a/core_integrations/elgato/icon@2x.png b/core_brands/elgato/icon@2x.png
similarity index 100%
rename from core_integrations/elgato/icon@2x.png
rename to core_brands/elgato/icon@2x.png
diff --git a/core_integrations/elgato/logo.png b/core_brands/elgato/logo.png
similarity index 100%
rename from core_integrations/elgato/logo.png
rename to core_brands/elgato/logo.png
diff --git a/core_integrations/elgato/logo@2x.png b/core_brands/elgato/logo@2x.png
similarity index 100%
rename from core_integrations/elgato/logo@2x.png
rename to core_brands/elgato/logo@2x.png
diff --git a/core_brands/emoncms/icon.png b/core_brands/emoncms/icon.png
new file mode 100644
index 00000000..b4554254
Binary files /dev/null and b/core_brands/emoncms/icon.png differ
diff --git a/core_integrations/emoncms/icon@2x.png b/core_brands/emoncms/icon@2x.png
similarity index 100%
rename from core_integrations/emoncms/icon@2x.png
rename to core_brands/emoncms/icon@2x.png
diff --git a/core_integrations/epson/icon.png b/core_brands/epson/icon.png
similarity index 100%
rename from core_integrations/epson/icon.png
rename to core_brands/epson/icon.png
diff --git a/core_integrations/epson/icon@2x.png b/core_brands/epson/icon@2x.png
similarity index 100%
rename from core_integrations/epson/icon@2x.png
rename to core_brands/epson/icon@2x.png
diff --git a/core_integrations/epson/logo.png b/core_brands/epson/logo.png
similarity index 100%
rename from core_integrations/epson/logo.png
rename to core_brands/epson/logo.png
diff --git a/core_integrations/epson/logo@2x.png b/core_brands/epson/logo@2x.png
similarity index 100%
rename from core_integrations/epson/logo@2x.png
rename to core_brands/epson/logo@2x.png
diff --git a/core_integrations/eq3btsmart/icon.png b/core_brands/eq3/icon.png
similarity index 100%
rename from core_integrations/eq3btsmart/icon.png
rename to core_brands/eq3/icon.png
diff --git a/core_integrations/eq3btsmart/icon@2x.png b/core_brands/eq3/icon@2x.png
similarity index 100%
rename from core_integrations/eq3btsmart/icon@2x.png
rename to core_brands/eq3/icon@2x.png
diff --git a/core_integrations/eq3btsmart/logo.png b/core_brands/eq3/logo.png
similarity index 100%
rename from core_integrations/eq3btsmart/logo.png
rename to core_brands/eq3/logo.png
diff --git a/core_integrations/eq3btsmart/logo@2x.png b/core_brands/eq3/logo@2x.png
similarity index 100%
rename from core_integrations/eq3btsmart/logo@2x.png
rename to core_brands/eq3/logo@2x.png
diff --git a/core_integrations/ffmpeg/icon.png b/core_brands/ffmpeg/icon.png
similarity index 100%
rename from core_integrations/ffmpeg/icon.png
rename to core_brands/ffmpeg/icon.png
diff --git a/core_integrations/ffmpeg/icon@2x.png b/core_brands/ffmpeg/icon@2x.png
similarity index 100%
rename from core_integrations/ffmpeg/icon@2x.png
rename to core_brands/ffmpeg/icon@2x.png
diff --git a/core_integrations/ffmpeg/logo.png b/core_brands/ffmpeg/logo.png
similarity index 100%
rename from core_integrations/ffmpeg/logo.png
rename to core_brands/ffmpeg/logo.png
diff --git a/core_integrations/ffmpeg/logo@2x.png b/core_brands/ffmpeg/logo@2x.png
similarity index 100%
rename from core_integrations/ffmpeg/logo@2x.png
rename to core_brands/ffmpeg/logo@2x.png
diff --git a/core_integrations/geonetnz_quakes/icon.png b/core_brands/geonet/icon.png
similarity index 100%
rename from core_integrations/geonetnz_quakes/icon.png
rename to core_brands/geonet/icon.png
diff --git a/core_integrations/geonetnz_quakes/icon@2x.png b/core_brands/geonet/icon@2x.png
similarity index 100%
rename from core_integrations/geonetnz_quakes/icon@2x.png
rename to core_brands/geonet/icon@2x.png
diff --git a/core_integrations/geonetnz_quakes/logo.png b/core_brands/geonet/logo.png
similarity index 100%
rename from core_integrations/geonetnz_quakes/logo.png
rename to core_brands/geonet/logo.png
diff --git a/core_integrations/gc100/icon.png b/core_brands/globalcache/icon.png
similarity index 100%
rename from core_integrations/gc100/icon.png
rename to core_brands/globalcache/icon.png
diff --git a/core_integrations/gc100/icon@2x.png b/core_brands/globalcache/icon@2x.png
similarity index 100%
rename from core_integrations/gc100/icon@2x.png
rename to core_brands/globalcache/icon@2x.png
diff --git a/core_integrations/gc100/logo.png b/core_brands/globalcache/logo.png
similarity index 100%
rename from core_integrations/gc100/logo.png
rename to core_brands/globalcache/logo.png
diff --git a/core_integrations/gc100/logo@2x.png b/core_brands/globalcache/logo@2x.png
similarity index 100%
rename from core_integrations/gc100/logo@2x.png
rename to core_brands/globalcache/logo@2x.png
diff --git a/core_integrations/hikvision/icon.png b/core_brands/hikvision/icon.png
similarity index 100%
rename from core_integrations/hikvision/icon.png
rename to core_brands/hikvision/icon.png
diff --git a/core_integrations/hikvision/icon@2x.png b/core_brands/hikvision/icon@2x.png
similarity index 100%
rename from core_integrations/hikvision/icon@2x.png
rename to core_brands/hikvision/icon@2x.png
diff --git a/core_integrations/hikvision/logo.png b/core_brands/hikvision/logo.png
similarity index 100%
rename from core_integrations/hikvision/logo.png
rename to core_brands/hikvision/logo.png
diff --git a/core_integrations/hikvision/logo@2x.png b/core_brands/hikvision/logo@2x.png
similarity index 100%
rename from core_integrations/hikvision/logo@2x.png
rename to core_brands/hikvision/logo@2x.png
diff --git a/core_integrations/homematic/icon.png b/core_brands/homematic/icon.png
similarity index 100%
rename from core_integrations/homematic/icon.png
rename to core_brands/homematic/icon.png
diff --git a/core_integrations/homematic/icon@2x.png b/core_brands/homematic/icon@2x.png
similarity index 100%
rename from core_integrations/homematic/icon@2x.png
rename to core_brands/homematic/icon@2x.png
diff --git a/core_integrations/homematic/logo.png b/core_brands/homematic/logo.png
similarity index 100%
rename from core_integrations/homematic/logo.png
rename to core_brands/homematic/logo.png
diff --git a/core_integrations/homematic/logo@2x.png b/core_brands/homematic/logo@2x.png
similarity index 100%
rename from core_integrations/homematic/logo@2x.png
rename to core_brands/homematic/logo@2x.png
diff --git a/core_integrations/honeywell/icon.png b/core_brands/honeywell/icon.png
similarity index 100%
rename from core_integrations/honeywell/icon.png
rename to core_brands/honeywell/icon.png
diff --git a/core_integrations/honeywell/icon@2x.png b/core_brands/honeywell/icon@2x.png
similarity index 100%
rename from core_integrations/honeywell/icon@2x.png
rename to core_brands/honeywell/icon@2x.png
diff --git a/core_integrations/honeywell/logo.png b/core_brands/honeywell/logo.png
similarity index 100%
rename from core_integrations/honeywell/logo.png
rename to core_brands/honeywell/logo.png
diff --git a/core_integrations/honeywell/logo@2x.png b/core_brands/honeywell/logo@2x.png
similarity index 100%
rename from core_integrations/honeywell/logo@2x.png
rename to core_brands/honeywell/logo@2x.png
diff --git a/core_brands/ibm/icon.png b/core_brands/ibm/icon.png
new file mode 100644
index 00000000..748a815b
Binary files /dev/null and b/core_brands/ibm/icon.png differ
diff --git a/core_brands/ibm/icon@2x.png b/core_brands/ibm/icon@2x.png
new file mode 100644
index 00000000..b8e2cd8f
Binary files /dev/null and b/core_brands/ibm/icon@2x.png differ
diff --git a/core_brands/ibm/logo.png b/core_brands/ibm/logo.png
new file mode 100644
index 00000000..c7fb1f38
Binary files /dev/null and b/core_brands/ibm/logo.png differ
diff --git a/core_brands/ibm/logo@2x.png b/core_brands/ibm/logo@2x.png
new file mode 100644
index 00000000..ea6a2475
Binary files /dev/null and b/core_brands/ibm/logo@2x.png differ
diff --git a/core_integrations/lg_netcast/icon.png b/core_brands/lg/icon.png
similarity index 100%
rename from core_integrations/lg_netcast/icon.png
rename to core_brands/lg/icon.png
diff --git a/core_integrations/lg_netcast/icon@2x.png b/core_brands/lg/icon@2x.png
similarity index 100%
rename from core_integrations/lg_netcast/icon@2x.png
rename to core_brands/lg/icon@2x.png
diff --git a/core_integrations/lg_netcast/logo.png b/core_brands/lg/logo.png
similarity index 100%
rename from core_integrations/lg_netcast/logo.png
rename to core_brands/lg/logo.png
diff --git a/core_integrations/lg_netcast/logo@2x.png b/core_brands/lg/logo@2x.png
similarity index 100%
rename from core_integrations/lg_netcast/logo@2x.png
rename to core_brands/lg/logo@2x.png
diff --git a/core_brands/logitech/icon.png b/core_brands/logitech/icon.png
new file mode 100644
index 00000000..141c07db
Binary files /dev/null and b/core_brands/logitech/icon.png differ
diff --git a/core_brands/logitech/icon@2x.png b/core_brands/logitech/icon@2x.png
new file mode 100644
index 00000000..4a32843c
Binary files /dev/null and b/core_brands/logitech/icon@2x.png differ
diff --git a/core_brands/logitech/logo.png b/core_brands/logitech/logo.png
new file mode 100644
index 00000000..cdfa3081
Binary files /dev/null and b/core_brands/logitech/logo.png differ
diff --git a/core_brands/logitech/logo@2x.png b/core_brands/logitech/logo@2x.png
new file mode 100644
index 00000000..4189791c
Binary files /dev/null and b/core_brands/logitech/logo@2x.png differ
diff --git a/core_integrations/lutron/dark_icon.png b/core_brands/lutron/dark_icon.png
similarity index 100%
rename from core_integrations/lutron/dark_icon.png
rename to core_brands/lutron/dark_icon.png
diff --git a/core_integrations/lutron/dark_icon@2x.png b/core_brands/lutron/dark_icon@2x.png
similarity index 100%
rename from core_integrations/lutron/dark_icon@2x.png
rename to core_brands/lutron/dark_icon@2x.png
diff --git a/core_integrations/lutron/dark_logo.png b/core_brands/lutron/dark_logo.png
similarity index 100%
rename from core_integrations/lutron/dark_logo.png
rename to core_brands/lutron/dark_logo.png
diff --git a/core_integrations/lutron/dark_logo@2x.png b/core_brands/lutron/dark_logo@2x.png
similarity index 100%
rename from core_integrations/lutron/dark_logo@2x.png
rename to core_brands/lutron/dark_logo@2x.png
diff --git a/core_integrations/lutron/icon.png b/core_brands/lutron/icon.png
similarity index 100%
rename from core_integrations/lutron/icon.png
rename to core_brands/lutron/icon.png
diff --git a/core_integrations/lutron/icon@2x.png b/core_brands/lutron/icon@2x.png
similarity index 100%
rename from core_integrations/lutron/icon@2x.png
rename to core_brands/lutron/icon@2x.png
diff --git a/core_integrations/lutron/logo.png b/core_brands/lutron/logo.png
similarity index 100%
rename from core_integrations/lutron/logo.png
rename to core_brands/lutron/logo.png
diff --git a/core_integrations/lutron/logo@2x.png b/core_brands/lutron/logo@2x.png
similarity index 100%
rename from core_integrations/lutron/logo@2x.png
rename to core_brands/lutron/logo@2x.png
diff --git a/core_integrations/melnor/icon.png b/core_brands/melnor/icon.png
similarity index 100%
rename from core_integrations/melnor/icon.png
rename to core_brands/melnor/icon.png
diff --git a/core_integrations/melnor/icon@2x.png b/core_brands/melnor/icon@2x.png
similarity index 100%
rename from core_integrations/melnor/icon@2x.png
rename to core_brands/melnor/icon@2x.png
diff --git a/core_integrations/melnor/logo.png b/core_brands/melnor/logo.png
similarity index 100%
rename from core_integrations/melnor/logo.png
rename to core_brands/melnor/logo.png
diff --git a/core_integrations/melnor/logo@2x.png b/core_brands/melnor/logo@2x.png
similarity index 100%
rename from core_integrations/melnor/logo@2x.png
rename to core_brands/melnor/logo@2x.png
diff --git a/core_integrations/microsoft/icon.png b/core_brands/microsoft/icon.png
similarity index 100%
rename from core_integrations/microsoft/icon.png
rename to core_brands/microsoft/icon.png
diff --git a/core_integrations/microsoft/icon@2x.png b/core_brands/microsoft/icon@2x.png
similarity index 100%
rename from core_integrations/microsoft/icon@2x.png
rename to core_brands/microsoft/icon@2x.png
diff --git a/core_integrations/microsoft/logo.png b/core_brands/microsoft/logo.png
similarity index 100%
rename from core_integrations/microsoft/logo.png
rename to core_brands/microsoft/logo.png
diff --git a/core_integrations/microsoft/logo@2x.png b/core_brands/microsoft/logo@2x.png
similarity index 100%
rename from core_integrations/microsoft/logo@2x.png
rename to core_brands/microsoft/logo@2x.png
diff --git a/core_integrations/mqtt/dark_logo.png b/core_brands/mqtt/dark_logo.png
similarity index 100%
rename from core_integrations/mqtt/dark_logo.png
rename to core_brands/mqtt/dark_logo.png
diff --git a/core_integrations/mqtt/dark_logo@2x.png b/core_brands/mqtt/dark_logo@2x.png
similarity index 100%
rename from core_integrations/mqtt/dark_logo@2x.png
rename to core_brands/mqtt/dark_logo@2x.png
diff --git a/core_integrations/mqtt/icon.png b/core_brands/mqtt/icon.png
similarity index 100%
rename from core_integrations/mqtt/icon.png
rename to core_brands/mqtt/icon.png
diff --git a/core_integrations/mqtt/icon@2x.png b/core_brands/mqtt/icon@2x.png
similarity index 100%
rename from core_integrations/mqtt/icon@2x.png
rename to core_brands/mqtt/icon@2x.png
diff --git a/core_integrations/mqtt/logo.png b/core_brands/mqtt/logo.png
similarity index 100%
rename from core_integrations/mqtt/logo.png
rename to core_brands/mqtt/logo.png
diff --git a/core_integrations/mqtt/logo@2x.png b/core_brands/mqtt/logo@2x.png
similarity index 100%
rename from core_integrations/mqtt/logo@2x.png
rename to core_brands/mqtt/logo@2x.png
diff --git a/core_integrations/netgear/icon.png b/core_brands/netgear/icon.png
similarity index 100%
rename from core_integrations/netgear/icon.png
rename to core_brands/netgear/icon.png
diff --git a/core_integrations/netgear/icon@2x.png b/core_brands/netgear/icon@2x.png
similarity index 100%
rename from core_integrations/netgear/icon@2x.png
rename to core_brands/netgear/icon@2x.png
diff --git a/core_integrations/netgear/logo.png b/core_brands/netgear/logo.png
similarity index 100%
rename from core_integrations/netgear/logo.png
rename to core_brands/netgear/logo.png
diff --git a/core_integrations/netgear/logo@2x.png b/core_brands/netgear/logo@2x.png
similarity index 100%
rename from core_integrations/netgear/logo@2x.png
rename to core_brands/netgear/logo@2x.png
diff --git a/core_integrations/ubus/icon.png b/core_brands/openwrt/icon.png
similarity index 100%
rename from core_integrations/ubus/icon.png
rename to core_brands/openwrt/icon.png
diff --git a/core_integrations/ubus/icon@2x.png b/core_brands/openwrt/icon@2x.png
similarity index 100%
rename from core_integrations/ubus/icon@2x.png
rename to core_brands/openwrt/icon@2x.png
diff --git a/core_integrations/ubus/logo.png b/core_brands/openwrt/logo.png
similarity index 100%
rename from core_integrations/ubus/logo.png
rename to core_brands/openwrt/logo.png
diff --git a/core_integrations/ubus/logo@2x.png b/core_brands/openwrt/logo@2x.png
similarity index 100%
rename from core_integrations/ubus/logo@2x.png
rename to core_brands/openwrt/logo@2x.png
diff --git a/core_integrations/panasonic_viera/icon.png b/core_brands/panasonic/icon.png
similarity index 100%
rename from core_integrations/panasonic_viera/icon.png
rename to core_brands/panasonic/icon.png
diff --git a/core_integrations/panasonic_viera/icon@2x.png b/core_brands/panasonic/icon@2x.png
similarity index 100%
rename from core_integrations/panasonic_viera/icon@2x.png
rename to core_brands/panasonic/icon@2x.png
diff --git a/core_integrations/panasonic_viera/logo.png b/core_brands/panasonic/logo.png
similarity index 100%
rename from core_integrations/panasonic_viera/logo.png
rename to core_brands/panasonic/logo.png
diff --git a/core_integrations/panasonic_viera/logo@2x.png b/core_brands/panasonic/logo@2x.png
similarity index 100%
rename from core_integrations/panasonic_viera/logo@2x.png
rename to core_brands/panasonic/logo@2x.png
diff --git a/core_integrations/philips_js/icon.png b/core_brands/philips/icon.png
similarity index 100%
rename from core_integrations/philips_js/icon.png
rename to core_brands/philips/icon.png
diff --git a/core_integrations/philips_js/icon@2x.png b/core_brands/philips/icon@2x.png
similarity index 100%
rename from core_integrations/philips_js/icon@2x.png
rename to core_brands/philips/icon@2x.png
diff --git a/core_integrations/philips_js/logo.png b/core_brands/philips/logo.png
similarity index 100%
rename from core_integrations/philips_js/logo.png
rename to core_brands/philips/logo.png
diff --git a/core_integrations/philips_js/logo@2x.png b/core_brands/philips/logo@2x.png
similarity index 100%
rename from core_integrations/philips_js/logo@2x.png
rename to core_brands/philips/logo@2x.png
diff --git a/core_integrations/qnap/icon.png b/core_brands/qnap/icon.png
similarity index 100%
rename from core_integrations/qnap/icon.png
rename to core_brands/qnap/icon.png
diff --git a/core_integrations/qnap/icon@2x.png b/core_brands/qnap/icon@2x.png
similarity index 100%
rename from core_integrations/qnap/icon@2x.png
rename to core_brands/qnap/icon@2x.png
diff --git a/core_integrations/qnap/logo.png b/core_brands/qnap/logo.png
similarity index 100%
rename from core_integrations/qnap/logo.png
rename to core_brands/qnap/logo.png
diff --git a/core_integrations/qnap/logo@2x.png b/core_brands/qnap/logo@2x.png
similarity index 100%
rename from core_integrations/qnap/logo@2x.png
rename to core_brands/qnap/logo@2x.png
diff --git a/core_integrations/rpi_camera/icon.png b/core_brands/raspberry_pi/icon.png
similarity index 100%
rename from core_integrations/rpi_camera/icon.png
rename to core_brands/raspberry_pi/icon.png
diff --git a/core_integrations/rpi_camera/icon@2x.png b/core_brands/raspberry_pi/icon@2x.png
similarity index 100%
rename from core_integrations/rpi_camera/icon@2x.png
rename to core_brands/raspberry_pi/icon@2x.png
diff --git a/core_integrations/rpi_camera/logo.png b/core_brands/raspberry_pi/logo.png
similarity index 100%
rename from core_integrations/rpi_camera/logo.png
rename to core_brands/raspberry_pi/logo.png
diff --git a/core_integrations/rpi_camera/logo@2x.png b/core_brands/raspberry_pi/logo@2x.png
similarity index 100%
rename from core_integrations/rpi_camera/logo@2x.png
rename to core_brands/raspberry_pi/logo@2x.png
diff --git a/core_integrations/russound_rio/icon.png b/core_brands/russound/icon.png
similarity index 100%
rename from core_integrations/russound_rio/icon.png
rename to core_brands/russound/icon.png
diff --git a/core_integrations/russound_rio/icon@2x.png b/core_brands/russound/icon@2x.png
similarity index 100%
rename from core_integrations/russound_rio/icon@2x.png
rename to core_brands/russound/icon@2x.png
diff --git a/core_integrations/russound_rnet/logo.png b/core_brands/russound/logo.png
similarity index 100%
rename from core_integrations/russound_rnet/logo.png
rename to core_brands/russound/logo.png
diff --git a/core_integrations/russound_rnet/logo@2x.png b/core_brands/russound/logo@2x.png
similarity index 100%
rename from core_integrations/russound_rnet/logo@2x.png
rename to core_brands/russound/logo@2x.png
diff --git a/core_integrations/samsungtv/icon.png b/core_brands/samsung/icon.png
similarity index 100%
rename from core_integrations/samsungtv/icon.png
rename to core_brands/samsung/icon.png
diff --git a/core_integrations/samsungtv/icon@2x.png b/core_brands/samsung/icon@2x.png
similarity index 100%
rename from core_integrations/samsungtv/icon@2x.png
rename to core_brands/samsung/icon@2x.png
diff --git a/core_integrations/samsungtv/logo.png b/core_brands/samsung/logo.png
similarity index 100%
rename from core_integrations/samsungtv/logo.png
rename to core_brands/samsung/logo.png
diff --git a/core_integrations/samsungtv/logo@2x.png b/core_brands/samsung/logo@2x.png
similarity index 100%
rename from core_integrations/samsungtv/logo@2x.png
rename to core_brands/samsung/logo@2x.png
diff --git a/core_integrations/solaredge/icon.png b/core_brands/solaredge/icon.png
similarity index 100%
rename from core_integrations/solaredge/icon.png
rename to core_brands/solaredge/icon.png
diff --git a/core_integrations/solaredge/icon@2x.png b/core_brands/solaredge/icon@2x.png
similarity index 100%
rename from core_integrations/solaredge/icon@2x.png
rename to core_brands/solaredge/icon@2x.png
diff --git a/core_integrations/solaredge/logo.png b/core_brands/solaredge/logo.png
similarity index 100%
rename from core_integrations/solaredge/logo.png
rename to core_brands/solaredge/logo.png
diff --git a/core_integrations/solaredge/logo@2x.png b/core_brands/solaredge/logo@2x.png
similarity index 100%
rename from core_integrations/solaredge/logo@2x.png
rename to core_brands/solaredge/logo@2x.png
diff --git a/core_integrations/sony_projector/icon.png b/core_brands/sony/icon.png
similarity index 100%
rename from core_integrations/sony_projector/icon.png
rename to core_brands/sony/icon.png
diff --git a/core_integrations/sony_projector/icon@2x.png b/core_brands/sony/icon@2x.png
similarity index 100%
rename from core_integrations/sony_projector/icon@2x.png
rename to core_brands/sony/icon@2x.png
diff --git a/core_integrations/songpal/logo.png b/core_brands/sony/logo.png
similarity index 100%
rename from core_integrations/songpal/logo.png
rename to core_brands/sony/logo.png
diff --git a/core_integrations/songpal/logo@2x.png b/core_brands/sony/logo@2x.png
similarity index 100%
rename from core_integrations/songpal/logo@2x.png
rename to core_brands/sony/logo@2x.png
diff --git a/core_brands/synology/dark_logo.png b/core_brands/synology/dark_logo.png
new file mode 100644
index 00000000..1bca3127
Binary files /dev/null and b/core_brands/synology/dark_logo.png differ
diff --git a/core_brands/synology/dark_logo@2x.png b/core_brands/synology/dark_logo@2x.png
new file mode 100644
index 00000000..2795ce10
Binary files /dev/null and b/core_brands/synology/dark_logo@2x.png differ
diff --git a/core_brands/synology/icon.png b/core_brands/synology/icon.png
new file mode 100644
index 00000000..a06c5e8e
Binary files /dev/null and b/core_brands/synology/icon.png differ
diff --git a/core_brands/synology/icon@2x.png b/core_brands/synology/icon@2x.png
new file mode 100644
index 00000000..600b3855
Binary files /dev/null and b/core_brands/synology/icon@2x.png differ
diff --git a/core_brands/synology/logo.png b/core_brands/synology/logo.png
new file mode 100644
index 00000000..491218fa
Binary files /dev/null and b/core_brands/synology/logo.png differ
diff --git a/core_brands/synology/logo@2x.png b/core_brands/synology/logo@2x.png
new file mode 100644
index 00000000..969fb2db
Binary files /dev/null and b/core_brands/synology/logo@2x.png differ
diff --git a/core_integrations/telegram/icon.png b/core_brands/telegram/icon.png
similarity index 100%
rename from core_integrations/telegram/icon.png
rename to core_brands/telegram/icon.png
diff --git a/core_integrations/telegram/icon@2x.png b/core_brands/telegram/icon@2x.png
similarity index 100%
rename from core_integrations/telegram/icon@2x.png
rename to core_brands/telegram/icon@2x.png
diff --git a/core_integrations/telegram/logo.png b/core_brands/telegram/logo.png
similarity index 100%
rename from core_integrations/telegram/logo.png
rename to core_brands/telegram/logo.png
diff --git a/core_integrations/telegram/logo@2x.png b/core_brands/telegram/logo@2x.png
similarity index 100%
rename from core_integrations/telegram/logo@2x.png
rename to core_brands/telegram/logo@2x.png
diff --git a/core_integrations/tellstick/icon.png b/core_brands/telldus/icon.png
similarity index 100%
rename from core_integrations/tellstick/icon.png
rename to core_brands/telldus/icon.png
diff --git a/core_integrations/tellstick/icon@2x.png b/core_brands/telldus/icon@2x.png
similarity index 100%
rename from core_integrations/tellstick/icon@2x.png
rename to core_brands/telldus/icon@2x.png
diff --git a/core_integrations/tellstick/logo.png b/core_brands/telldus/logo.png
similarity index 100%
rename from core_integrations/tellstick/logo.png
rename to core_brands/telldus/logo.png
diff --git a/core_integrations/tellstick/logo@2x.png b/core_brands/telldus/logo@2x.png
similarity index 100%
rename from core_integrations/tellstick/logo@2x.png
rename to core_brands/telldus/logo@2x.png
diff --git a/core_brands/tesla/icon.png b/core_brands/tesla/icon.png
new file mode 100644
index 00000000..4ba45825
Binary files /dev/null and b/core_brands/tesla/icon.png differ
diff --git a/core_brands/tesla/icon@2x.png b/core_brands/tesla/icon@2x.png
new file mode 100644
index 00000000..adebc3c6
Binary files /dev/null and b/core_brands/tesla/icon@2x.png differ
diff --git a/core_brands/tesla/logo.png b/core_brands/tesla/logo.png
new file mode 100644
index 00000000..60c8429a
Binary files /dev/null and b/core_brands/tesla/logo.png differ
diff --git a/core_brands/tesla/logo@2x.png b/core_brands/tesla/logo@2x.png
new file mode 100644
index 00000000..e665ac82
Binary files /dev/null and b/core_brands/tesla/logo@2x.png differ
diff --git a/core_integrations/trafikverket_ferry/icon.png b/core_brands/trafikverket/icon.png
similarity index 100%
rename from core_integrations/trafikverket_ferry/icon.png
rename to core_brands/trafikverket/icon.png
diff --git a/core_integrations/trafikverket_ferry/icon@2x.png b/core_brands/trafikverket/icon@2x.png
similarity index 100%
rename from core_integrations/trafikverket_ferry/icon@2x.png
rename to core_brands/trafikverket/icon@2x.png
diff --git a/core_integrations/trafikverket_ferry/logo.png b/core_brands/trafikverket/logo.png
similarity index 100%
rename from core_integrations/trafikverket_ferry/logo.png
rename to core_brands/trafikverket/logo.png
diff --git a/core_integrations/trafikverket_ferry/logo@2x.png b/core_brands/trafikverket/logo@2x.png
similarity index 100%
rename from core_integrations/trafikverket_ferry/logo@2x.png
rename to core_brands/trafikverket/logo@2x.png
diff --git a/core_integrations/twilio/icon.png b/core_brands/twilio/icon.png
similarity index 100%
rename from core_integrations/twilio/icon.png
rename to core_brands/twilio/icon.png
diff --git a/core_integrations/twilio/icon@2x.png b/core_brands/twilio/icon@2x.png
similarity index 100%
rename from core_integrations/twilio/icon@2x.png
rename to core_brands/twilio/icon@2x.png
diff --git a/core_integrations/twilio/logo.png b/core_brands/twilio/logo.png
similarity index 100%
rename from core_integrations/twilio/logo.png
rename to core_brands/twilio/logo.png
diff --git a/core_integrations/twilio/logo@2x.png b/core_brands/twilio/logo@2x.png
similarity index 100%
rename from core_integrations/twilio/logo@2x.png
rename to core_brands/twilio/logo@2x.png
diff --git a/core_integrations/vlc/icon.png b/core_brands/vlc/icon.png
similarity index 100%
rename from core_integrations/vlc/icon.png
rename to core_brands/vlc/icon.png
diff --git a/core_integrations/vlc/icon@2x.png b/core_brands/vlc/icon@2x.png
similarity index 100%
rename from core_integrations/vlc/icon@2x.png
rename to core_brands/vlc/icon@2x.png
diff --git a/core_integrations/vlc/logo.png b/core_brands/vlc/logo.png
similarity index 100%
rename from core_integrations/vlc/logo.png
rename to core_brands/vlc/logo.png
diff --git a/core_integrations/vlc/logo@2x.png b/core_brands/vlc/logo@2x.png
similarity index 100%
rename from core_integrations/vlc/logo@2x.png
rename to core_brands/vlc/logo@2x.png
diff --git a/core_integrations/xiaomi/icon.png b/core_brands/xiaomi/icon.png
similarity index 100%
rename from core_integrations/xiaomi/icon.png
rename to core_brands/xiaomi/icon.png
diff --git a/core_integrations/xiaomi/icon@2x.png b/core_brands/xiaomi/icon@2x.png
similarity index 100%
rename from core_integrations/xiaomi/icon@2x.png
rename to core_brands/xiaomi/icon@2x.png
diff --git a/core_integrations/xiaomi/logo.png b/core_brands/xiaomi/logo.png
similarity index 100%
rename from core_integrations/xiaomi/logo.png
rename to core_brands/xiaomi/logo.png
diff --git a/core_integrations/xiaomi/logo@2x.png b/core_brands/xiaomi/logo@2x.png
similarity index 100%
rename from core_integrations/xiaomi/logo@2x.png
rename to core_brands/xiaomi/logo@2x.png
diff --git a/core_brands/yale/icon.png b/core_brands/yale/icon.png
new file mode 100644
index 00000000..b12b34b7
Binary files /dev/null and b/core_brands/yale/icon.png differ
diff --git a/core_brands/yale/icon@2x.png b/core_brands/yale/icon@2x.png
new file mode 100644
index 00000000..4d1fe1c4
Binary files /dev/null and b/core_brands/yale/icon@2x.png differ
diff --git a/core_integrations/yandextts/icon.png b/core_brands/yandex/icon.png
similarity index 100%
rename from core_integrations/yandextts/icon.png
rename to core_brands/yandex/icon.png
diff --git a/core_integrations/yandextts/icon@2x.png b/core_brands/yandex/icon@2x.png
similarity index 100%
rename from core_integrations/yandextts/icon@2x.png
rename to core_brands/yandex/icon@2x.png
diff --git a/core_integrations/yandex_transport/logo.png b/core_brands/yandex/logo.png
similarity index 100%
rename from core_integrations/yandex_transport/logo.png
rename to core_brands/yandex/logo.png
diff --git a/core_integrations/yandex_transport/logo@2x.png b/core_brands/yandex/logo@2x.png
similarity index 100%
rename from core_integrations/yandex_transport/logo@2x.png
rename to core_brands/yandex/logo@2x.png
diff --git a/core_integrations/yeelight/icon.png b/core_brands/yeelight/icon.png
similarity index 100%
rename from core_integrations/yeelight/icon.png
rename to core_brands/yeelight/icon.png
diff --git a/core_integrations/yeelight/icon@2x.png b/core_brands/yeelight/icon@2x.png
similarity index 100%
rename from core_integrations/yeelight/icon@2x.png
rename to core_brands/yeelight/icon@2x.png
diff --git a/core_integrations/yeelight/logo.png b/core_brands/yeelight/logo.png
similarity index 100%
rename from core_integrations/yeelight/logo.png
rename to core_brands/yeelight/logo.png
diff --git a/core_integrations/yeelight/logo@2x.png b/core_brands/yeelight/logo@2x.png
similarity index 100%
rename from core_integrations/yeelight/logo@2x.png
rename to core_brands/yeelight/logo@2x.png
diff --git a/core_integrations/aruba b/core_integrations/aruba
new file mode 120000
index 00000000..649d1450
--- /dev/null
+++ b/core_integrations/aruba
@@ -0,0 +1 @@
+../core_brands/aruba
\ No newline at end of file
diff --git a/core_integrations/asterisk_cdr b/core_integrations/asterisk_cdr
index 57f5174a..256baa76 120000
--- a/core_integrations/asterisk_cdr
+++ b/core_integrations/asterisk_cdr
@@ -1 +1 @@
-asterisk_mbox
\ No newline at end of file
+../core_brands/asterisk
\ No newline at end of file
diff --git a/core_integrations/asterisk_mbox b/core_integrations/asterisk_mbox
new file mode 120000
index 00000000..256baa76
--- /dev/null
+++ b/core_integrations/asterisk_mbox
@@ -0,0 +1 @@
+../core_brands/asterisk
\ No newline at end of file
diff --git a/core_integrations/august b/core_integrations/august
new file mode 120000
index 00000000..2965435e
--- /dev/null
+++ b/core_integrations/august
@@ -0,0 +1 @@
+../core_brands/august
\ No newline at end of file
diff --git a/core_integrations/august_ble b/core_integrations/august_ble
index ee61f945..2965435e 120000
--- a/core_integrations/august_ble
+++ b/core_integrations/august_ble
@@ -1 +1 @@
-august
\ No newline at end of file
+../core_brands/august
\ No newline at end of file
diff --git a/core_integrations/avea b/core_integrations/avea
index b2d8babd..b3661e5f 120000
--- a/core_integrations/avea
+++ b/core_integrations/avea
@@ -1 +1 @@
-elgato
\ No newline at end of file
+../core_brands/elgato
\ No newline at end of file
diff --git a/core_integrations/cisco_ios b/core_integrations/cisco_ios
index bb541d67..c4cf2345 120000
--- a/core_integrations/cisco_ios
+++ b/core_integrations/cisco_ios
@@ -1 +1 @@
-cisco_mobility_express
\ No newline at end of file
+../core_brands/cisco
\ No newline at end of file
diff --git a/core_integrations/cisco_mobility_express b/core_integrations/cisco_mobility_express
new file mode 120000
index 00000000..c4cf2345
--- /dev/null
+++ b/core_integrations/cisco_mobility_express
@@ -0,0 +1 @@
+../core_brands/cisco
\ No newline at end of file
diff --git a/core_integrations/clicksend b/core_integrations/clicksend
new file mode 120000
index 00000000..88e8f963
--- /dev/null
+++ b/core_integrations/clicksend
@@ -0,0 +1 @@
+../core_brands/clicksend
\ No newline at end of file
diff --git a/core_integrations/clicksend_tts b/core_integrations/clicksend_tts
index b4376117..88e8f963 120000
--- a/core_integrations/clicksend_tts
+++ b/core_integrations/clicksend_tts
@@ -1 +1 @@
-clicksend
\ No newline at end of file
+../core_brands/clicksend
\ No newline at end of file
diff --git a/core_integrations/cppm_tracker b/core_integrations/cppm_tracker
index ef157f6d..649d1450 120000
--- a/core_integrations/cppm_tracker
+++ b/core_integrations/cppm_tracker
@@ -1 +1 @@
-aruba
\ No newline at end of file
+../core_brands/aruba
\ No newline at end of file
diff --git a/core_integrations/dlna_dmr b/core_integrations/dlna_dmr
new file mode 120000
index 00000000..2cb5fe92
--- /dev/null
+++ b/core_integrations/dlna_dmr
@@ -0,0 +1 @@
+../core_brands/dlna
\ No newline at end of file
diff --git a/core_integrations/dlna_dms b/core_integrations/dlna_dms
new file mode 120000
index 00000000..2cb5fe92
--- /dev/null
+++ b/core_integrations/dlna_dms
@@ -0,0 +1 @@
+../core_brands/dlna
\ No newline at end of file
diff --git a/core_integrations/dlna_dms/icon.png b/core_integrations/dlna_dms/icon.png
deleted file mode 100644
index 763d2422..00000000
Binary files a/core_integrations/dlna_dms/icon.png and /dev/null differ
diff --git a/core_integrations/dlna_dms/icon@2x.png b/core_integrations/dlna_dms/icon@2x.png
deleted file mode 100644
index 90d81ca2..00000000
Binary files a/core_integrations/dlna_dms/icon@2x.png and /dev/null differ
diff --git a/core_integrations/dlna_dms/logo.png b/core_integrations/dlna_dms/logo.png
deleted file mode 100644
index cca31064..00000000
Binary files a/core_integrations/dlna_dms/logo.png and /dev/null differ
diff --git a/core_integrations/dlna_dms/logo@2x.png b/core_integrations/dlna_dms/logo@2x.png
deleted file mode 100644
index 2a117eed..00000000
Binary files a/core_integrations/dlna_dms/logo@2x.png and /dev/null differ
diff --git a/core_integrations/elgato b/core_integrations/elgato
new file mode 120000
index 00000000..b3661e5f
--- /dev/null
+++ b/core_integrations/elgato
@@ -0,0 +1 @@
+../core_brands/elgato
\ No newline at end of file
diff --git a/core_integrations/emoncms b/core_integrations/emoncms
new file mode 120000
index 00000000..a4f99ac1
--- /dev/null
+++ b/core_integrations/emoncms
@@ -0,0 +1 @@
+../core_brands/emoncms
\ No newline at end of file
diff --git a/core_integrations/emoncms/icon.png b/core_integrations/emoncms/icon.png
deleted file mode 100644
index 13325718..00000000
Binary files a/core_integrations/emoncms/icon.png and /dev/null differ
diff --git a/core_integrations/emoncms_history b/core_integrations/emoncms_history
index 8316c797..a4f99ac1 120000
--- a/core_integrations/emoncms_history
+++ b/core_integrations/emoncms_history
@@ -1 +1 @@
-emoncms
\ No newline at end of file
+../core_brands/emoncms
\ No newline at end of file
diff --git a/core_integrations/epson b/core_integrations/epson
new file mode 120000
index 00000000..ce9332a7
--- /dev/null
+++ b/core_integrations/epson
@@ -0,0 +1 @@
+../core_brands/epson
\ No newline at end of file
diff --git a/core_integrations/epsonworkforce b/core_integrations/epsonworkforce
index b68f228f..ce9332a7 120000
--- a/core_integrations/epsonworkforce
+++ b/core_integrations/epsonworkforce
@@ -1 +1 @@
-epson
\ No newline at end of file
+../core_brands/epson
\ No newline at end of file
diff --git a/core_integrations/eq3btsmart b/core_integrations/eq3btsmart
new file mode 120000
index 00000000..6b4328ab
--- /dev/null
+++ b/core_integrations/eq3btsmart
@@ -0,0 +1 @@
+../core_brands/eq3
\ No newline at end of file
diff --git a/core_integrations/evohome b/core_integrations/evohome
index c7760010..b7d6d395 120000
--- a/core_integrations/evohome
+++ b/core_integrations/evohome
@@ -1 +1 @@
-honeywell
\ No newline at end of file
+../core_brands/honeywell
\ No newline at end of file
diff --git a/core_integrations/ffmpeg b/core_integrations/ffmpeg
new file mode 120000
index 00000000..715b8449
--- /dev/null
+++ b/core_integrations/ffmpeg
@@ -0,0 +1 @@
+../core_brands/ffmpeg
\ No newline at end of file
diff --git a/core_integrations/ffmpeg_motion b/core_integrations/ffmpeg_motion
index a9f1eea0..715b8449 120000
--- a/core_integrations/ffmpeg_motion
+++ b/core_integrations/ffmpeg_motion
@@ -1 +1 @@
-ffmpeg
\ No newline at end of file
+../core_brands/ffmpeg
\ No newline at end of file
diff --git a/core_integrations/ffmpeg_noise b/core_integrations/ffmpeg_noise
index a9f1eea0..715b8449 120000
--- a/core_integrations/ffmpeg_noise
+++ b/core_integrations/ffmpeg_noise
@@ -1 +1 @@
-ffmpeg
\ No newline at end of file
+../core_brands/ffmpeg
\ No newline at end of file
diff --git a/core_integrations/gc100 b/core_integrations/gc100
new file mode 120000
index 00000000..8d873414
--- /dev/null
+++ b/core_integrations/gc100
@@ -0,0 +1 @@
+../core_brands/globalcache
\ No newline at end of file
diff --git a/core_integrations/geonetnz_quakes b/core_integrations/geonetnz_quakes
new file mode 120000
index 00000000..b9dd8d98
--- /dev/null
+++ b/core_integrations/geonetnz_quakes
@@ -0,0 +1 @@
+../core_brands/geonet
\ No newline at end of file
diff --git a/core_integrations/geonetnz_volcano b/core_integrations/geonetnz_volcano
index d1c96884..b9dd8d98 120000
--- a/core_integrations/geonetnz_volcano
+++ b/core_integrations/geonetnz_volcano
@@ -1 +1 @@
-geonetnz_quakes
\ No newline at end of file
+../core_brands/geonet
\ No newline at end of file
diff --git a/core_integrations/harmony b/core_integrations/harmony
new file mode 120000
index 00000000..f4e7196f
--- /dev/null
+++ b/core_integrations/harmony
@@ -0,0 +1 @@
+../core_brands/logitech
\ No newline at end of file
diff --git a/core_integrations/harmony/icon.png b/core_integrations/harmony/icon.png
deleted file mode 100644
index 278b1f77..00000000
Binary files a/core_integrations/harmony/icon.png and /dev/null differ
diff --git a/core_integrations/harmony/icon@2x.png b/core_integrations/harmony/icon@2x.png
deleted file mode 100644
index 451417e5..00000000
Binary files a/core_integrations/harmony/icon@2x.png and /dev/null differ
diff --git a/core_integrations/harmony/logo.png b/core_integrations/harmony/logo.png
deleted file mode 100644
index 48d466b1..00000000
Binary files a/core_integrations/harmony/logo.png and /dev/null differ
diff --git a/core_integrations/harmony/logo@2x.png b/core_integrations/harmony/logo@2x.png
deleted file mode 100644
index 34e67f0d..00000000
Binary files a/core_integrations/harmony/logo@2x.png and /dev/null differ
diff --git a/core_integrations/hikvision b/core_integrations/hikvision
new file mode 120000
index 00000000..ab8e0ce1
--- /dev/null
+++ b/core_integrations/hikvision
@@ -0,0 +1 @@
+../core_brands/hikvision
\ No newline at end of file
diff --git a/core_integrations/hikvisioncam b/core_integrations/hikvisioncam
index 173cd793..ab8e0ce1 120000
--- a/core_integrations/hikvisioncam
+++ b/core_integrations/hikvisioncam
@@ -1 +1 @@
-hikvision
\ No newline at end of file
+../core_brands/hikvision
\ No newline at end of file
diff --git a/core_integrations/homematic b/core_integrations/homematic
new file mode 120000
index 00000000..91dfb6df
--- /dev/null
+++ b/core_integrations/homematic
@@ -0,0 +1 @@
+../core_brands/homematic
\ No newline at end of file
diff --git a/core_integrations/homeworks b/core_integrations/homeworks
index 2df32fcf..ee06257d 120000
--- a/core_integrations/homeworks
+++ b/core_integrations/homeworks
@@ -1 +1 @@
-lutron
\ No newline at end of file
+../core_brands/lutron
\ No newline at end of file
diff --git a/core_integrations/honeywell b/core_integrations/honeywell
new file mode 120000
index 00000000..b7d6d395
--- /dev/null
+++ b/core_integrations/honeywell
@@ -0,0 +1 @@
+../core_brands/honeywell
\ No newline at end of file
diff --git a/core_integrations/itach b/core_integrations/itach
index f21f6061..8d873414 120000
--- a/core_integrations/itach
+++ b/core_integrations/itach
@@ -1 +1 @@
-gc100
\ No newline at end of file
+../core_brands/globalcache
\ No newline at end of file
diff --git a/core_integrations/lg_netcast b/core_integrations/lg_netcast
new file mode 120000
index 00000000..2a13d55b
--- /dev/null
+++ b/core_integrations/lg_netcast
@@ -0,0 +1 @@
+../core_brands/lg
\ No newline at end of file
diff --git a/core_integrations/lg_soundbar b/core_integrations/lg_soundbar
index 2c623cf8..2a13d55b 120000
--- a/core_integrations/lg_soundbar
+++ b/core_integrations/lg_soundbar
@@ -1 +1 @@
-lg_netcast
\ No newline at end of file
+../core_brands/lg
\ No newline at end of file
diff --git a/core_integrations/luci b/core_integrations/luci
index d596b0f4..83cc2656 120000
--- a/core_integrations/luci
+++ b/core_integrations/luci
@@ -1 +1 @@
-ubus
\ No newline at end of file
+../core_brands/openwrt
\ No newline at end of file
diff --git a/core_integrations/lutron b/core_integrations/lutron
new file mode 120000
index 00000000..ee06257d
--- /dev/null
+++ b/core_integrations/lutron
@@ -0,0 +1 @@
+../core_brands/lutron
\ No newline at end of file
diff --git a/core_integrations/lutron_caseta b/core_integrations/lutron_caseta
index 2df32fcf..ee06257d 120000
--- a/core_integrations/lutron_caseta
+++ b/core_integrations/lutron_caseta
@@ -1 +1 @@
-lutron
\ No newline at end of file
+../core_brands/lutron
\ No newline at end of file
diff --git a/core_integrations/lyric b/core_integrations/lyric
new file mode 120000
index 00000000..b7d6d395
--- /dev/null
+++ b/core_integrations/lyric
@@ -0,0 +1 @@
+../core_brands/honeywell
\ No newline at end of file
diff --git a/core_integrations/lyric/icon.png b/core_integrations/lyric/icon.png
deleted file mode 100644
index 13b3d42f..00000000
Binary files a/core_integrations/lyric/icon.png and /dev/null differ
diff --git a/core_integrations/lyric/icon@2x.png b/core_integrations/lyric/icon@2x.png
deleted file mode 100644
index 18fdac16..00000000
Binary files a/core_integrations/lyric/icon@2x.png and /dev/null differ
diff --git a/core_integrations/lyric/logo.png b/core_integrations/lyric/logo.png
deleted file mode 100644
index d2764e03..00000000
Binary files a/core_integrations/lyric/logo.png and /dev/null differ
diff --git a/core_integrations/lyric/logo@2x.png b/core_integrations/lyric/logo@2x.png
deleted file mode 100644
index 8ed20a2b..00000000
Binary files a/core_integrations/lyric/logo@2x.png and /dev/null differ
diff --git a/core_integrations/manual_mqtt b/core_integrations/manual_mqtt
index e77771d4..8a359bf4 120000
--- a/core_integrations/manual_mqtt
+++ b/core_integrations/manual_mqtt
@@ -1 +1 @@
-alarm_control_panel
\ No newline at end of file
+../core_brands/mqtt
\ No newline at end of file
diff --git a/core_integrations/melnor b/core_integrations/melnor
new file mode 120000
index 00000000..6f1419a6
--- /dev/null
+++ b/core_integrations/melnor
@@ -0,0 +1 @@
+../core_brands/melnor
\ No newline at end of file
diff --git a/core_integrations/microsoft b/core_integrations/microsoft
new file mode 120000
index 00000000..aa3b6612
--- /dev/null
+++ b/core_integrations/microsoft
@@ -0,0 +1 @@
+../core_brands/microsoft
\ No newline at end of file
diff --git a/core_integrations/microsoft_face b/core_integrations/microsoft_face
index 51a3d8a3..aa3b6612 120000
--- a/core_integrations/microsoft_face
+++ b/core_integrations/microsoft_face
@@ -1 +1 @@
-microsoft
\ No newline at end of file
+../core_brands/microsoft
\ No newline at end of file
diff --git a/core_integrations/microsoft_face_detect b/core_integrations/microsoft_face_detect
index 51a3d8a3..aa3b6612 120000
--- a/core_integrations/microsoft_face_detect
+++ b/core_integrations/microsoft_face_detect
@@ -1 +1 @@
-microsoft
\ No newline at end of file
+../core_brands/microsoft
\ No newline at end of file
diff --git a/core_integrations/microsoft_face_identify b/core_integrations/microsoft_face_identify
index 51a3d8a3..aa3b6612 120000
--- a/core_integrations/microsoft_face_identify
+++ b/core_integrations/microsoft_face_identify
@@ -1 +1 @@
-microsoft
\ No newline at end of file
+../core_brands/microsoft
\ No newline at end of file
diff --git a/core_integrations/mqtt b/core_integrations/mqtt
new file mode 120000
index 00000000..8a359bf4
--- /dev/null
+++ b/core_integrations/mqtt
@@ -0,0 +1 @@
+../core_brands/mqtt
\ No newline at end of file
diff --git a/core_integrations/mqtt_eventstream b/core_integrations/mqtt_eventstream
index 1d00b34f..8a359bf4 120000
--- a/core_integrations/mqtt_eventstream
+++ b/core_integrations/mqtt_eventstream
@@ -1 +1 @@
-mqtt
\ No newline at end of file
+../core_brands/mqtt
\ No newline at end of file
diff --git a/core_integrations/mqtt_json b/core_integrations/mqtt_json
index 1d00b34f..8a359bf4 120000
--- a/core_integrations/mqtt_json
+++ b/core_integrations/mqtt_json
@@ -1 +1 @@
-mqtt
\ No newline at end of file
+../core_brands/mqtt
\ No newline at end of file
diff --git a/core_integrations/mqtt_room b/core_integrations/mqtt_room
index 1d00b34f..8a359bf4 120000
--- a/core_integrations/mqtt_room
+++ b/core_integrations/mqtt_room
@@ -1 +1 @@
-mqtt
\ No newline at end of file
+../core_brands/mqtt
\ No newline at end of file
diff --git a/core_integrations/mqtt_statestream b/core_integrations/mqtt_statestream
index 1d00b34f..8a359bf4 120000
--- a/core_integrations/mqtt_statestream
+++ b/core_integrations/mqtt_statestream
@@ -1 +1 @@
-mqtt
\ No newline at end of file
+../core_brands/mqtt
\ No newline at end of file
diff --git a/core_integrations/netgear b/core_integrations/netgear
new file mode 120000
index 00000000..787d327c
--- /dev/null
+++ b/core_integrations/netgear
@@ -0,0 +1 @@
+../core_brands/netgear
\ No newline at end of file
diff --git a/core_integrations/netgear_lte b/core_integrations/netgear_lte
index 0b3087f5..787d327c 120000
--- a/core_integrations/netgear_lte
+++ b/core_integrations/netgear_lte
@@ -1 +1 @@
-netgear
\ No newline at end of file
+../core_brands/netgear
\ No newline at end of file
diff --git a/core_integrations/panasonic_bluray b/core_integrations/panasonic_bluray
index 720a6c03..498307f1 120000
--- a/core_integrations/panasonic_bluray
+++ b/core_integrations/panasonic_bluray
@@ -1 +1 @@
-panasonic_viera
\ No newline at end of file
+../core_brands/panasonic
\ No newline at end of file
diff --git a/core_integrations/panasonic_viera b/core_integrations/panasonic_viera
new file mode 120000
index 00000000..498307f1
--- /dev/null
+++ b/core_integrations/panasonic_viera
@@ -0,0 +1 @@
+../core_brands/panasonic
\ No newline at end of file
diff --git a/core_integrations/philips_js b/core_integrations/philips_js
new file mode 120000
index 00000000..64bca19e
--- /dev/null
+++ b/core_integrations/philips_js
@@ -0,0 +1 @@
+../core_brands/philips
\ No newline at end of file
diff --git a/core_integrations/powerwall b/core_integrations/powerwall
index eae73f3b..99b7f925 120000
--- a/core_integrations/powerwall
+++ b/core_integrations/powerwall
@@ -1 +1 @@
-tesla/
\ No newline at end of file
+../core_brands/tesla
\ No newline at end of file
diff --git a/core_integrations/qnap b/core_integrations/qnap
new file mode 120000
index 00000000..567a9ae4
--- /dev/null
+++ b/core_integrations/qnap
@@ -0,0 +1 @@
+../core_brands/qnap
\ No newline at end of file
diff --git a/core_integrations/qnap_qsw b/core_integrations/qnap_qsw
index 5dec5300..567a9ae4 120000
--- a/core_integrations/qnap_qsw
+++ b/core_integrations/qnap_qsw
@@ -1 +1 @@
-qnap
\ No newline at end of file
+../core_brands/qnap
\ No newline at end of file
diff --git a/core_integrations/raincloud b/core_integrations/raincloud
new file mode 120000
index 00000000..6f1419a6
--- /dev/null
+++ b/core_integrations/raincloud
@@ -0,0 +1 @@
+../core_brands/melnor
\ No newline at end of file
diff --git a/core_integrations/raincloud/icon.png b/core_integrations/raincloud/icon.png
deleted file mode 100644
index d261b078..00000000
Binary files a/core_integrations/raincloud/icon.png and /dev/null differ
diff --git a/core_integrations/raincloud/icon@2x.png b/core_integrations/raincloud/icon@2x.png
deleted file mode 100644
index d06b8087..00000000
Binary files a/core_integrations/raincloud/icon@2x.png and /dev/null differ
diff --git a/core_integrations/raincloud/logo.png b/core_integrations/raincloud/logo.png
deleted file mode 100644
index e2b4dc92..00000000
Binary files a/core_integrations/raincloud/logo.png and /dev/null differ
diff --git a/core_integrations/raincloud/logo@2x.png b/core_integrations/raincloud/logo@2x.png
deleted file mode 100644
index f5079df0..00000000
Binary files a/core_integrations/raincloud/logo@2x.png and /dev/null differ
diff --git a/core_integrations/remote_rpi_gpio b/core_integrations/remote_rpi_gpio
index 9c855977..f2be9871 120000
--- a/core_integrations/remote_rpi_gpio
+++ b/core_integrations/remote_rpi_gpio
@@ -1 +1 @@
-rpi_camera
\ No newline at end of file
+../core_brands/raspberry_pi
\ No newline at end of file
diff --git a/core_integrations/rpi_camera b/core_integrations/rpi_camera
new file mode 120000
index 00000000..f2be9871
--- /dev/null
+++ b/core_integrations/rpi_camera
@@ -0,0 +1 @@
+../core_brands/raspberry_pi
\ No newline at end of file
diff --git a/core_integrations/rpi_power b/core_integrations/rpi_power
index 9c855977..f2be9871 120000
--- a/core_integrations/rpi_power
+++ b/core_integrations/rpi_power
@@ -1 +1 @@
-rpi_camera
\ No newline at end of file
+../core_brands/raspberry_pi
\ No newline at end of file
diff --git a/core_integrations/russound_rio b/core_integrations/russound_rio
new file mode 120000
index 00000000..72a80292
--- /dev/null
+++ b/core_integrations/russound_rio
@@ -0,0 +1 @@
+../core_brands/russound
\ No newline at end of file
diff --git a/core_integrations/russound_rio/logo.png b/core_integrations/russound_rio/logo.png
deleted file mode 100644
index 6535a8c3..00000000
Binary files a/core_integrations/russound_rio/logo.png and /dev/null differ
diff --git a/core_integrations/russound_rio/logo@2x.png b/core_integrations/russound_rio/logo@2x.png
deleted file mode 100644
index 6535a8c3..00000000
Binary files a/core_integrations/russound_rio/logo@2x.png and /dev/null differ
diff --git a/core_integrations/russound_rnet b/core_integrations/russound_rnet
new file mode 120000
index 00000000..72a80292
--- /dev/null
+++ b/core_integrations/russound_rnet
@@ -0,0 +1 @@
+../core_brands/russound
\ No newline at end of file
diff --git a/core_integrations/russound_rnet/icon.png b/core_integrations/russound_rnet/icon.png
deleted file mode 100644
index eb22eede..00000000
Binary files a/core_integrations/russound_rnet/icon.png and /dev/null differ
diff --git a/core_integrations/russound_rnet/icon@2x.png b/core_integrations/russound_rnet/icon@2x.png
deleted file mode 100644
index dc829d8a..00000000
Binary files a/core_integrations/russound_rnet/icon@2x.png and /dev/null differ
diff --git a/core_integrations/samsungtv b/core_integrations/samsungtv
new file mode 120000
index 00000000..c043ff79
--- /dev/null
+++ b/core_integrations/samsungtv
@@ -0,0 +1 @@
+../core_brands/samsung
\ No newline at end of file
diff --git a/core_integrations/solaredge b/core_integrations/solaredge
new file mode 120000
index 00000000..f6d64e06
--- /dev/null
+++ b/core_integrations/solaredge
@@ -0,0 +1 @@
+../core_brands/solaredge
\ No newline at end of file
diff --git a/core_integrations/solaredge_local b/core_integrations/solaredge_local
index 4ea62b7c..f6d64e06 120000
--- a/core_integrations/solaredge_local
+++ b/core_integrations/solaredge_local
@@ -1 +1 @@
-solaredge
\ No newline at end of file
+../core_brands/solaredge
\ No newline at end of file
diff --git a/core_integrations/songpal b/core_integrations/songpal
new file mode 120000
index 00000000..1e00afa6
--- /dev/null
+++ b/core_integrations/songpal
@@ -0,0 +1 @@
+../core_brands/sony
\ No newline at end of file
diff --git a/core_integrations/songpal/icon.png b/core_integrations/songpal/icon.png
deleted file mode 100644
index afb742ed..00000000
Binary files a/core_integrations/songpal/icon.png and /dev/null differ
diff --git a/core_integrations/songpal/icon@2x.png b/core_integrations/songpal/icon@2x.png
deleted file mode 100644
index 6831d5a5..00000000
Binary files a/core_integrations/songpal/icon@2x.png and /dev/null differ
diff --git a/core_integrations/sony_projector b/core_integrations/sony_projector
new file mode 120000
index 00000000..1e00afa6
--- /dev/null
+++ b/core_integrations/sony_projector
@@ -0,0 +1 @@
+../core_brands/sony
\ No newline at end of file
diff --git a/core_integrations/sony_projector/logo.png b/core_integrations/sony_projector/logo.png
deleted file mode 100644
index 1c799d0b..00000000
Binary files a/core_integrations/sony_projector/logo.png and /dev/null differ
diff --git a/core_integrations/sony_projector/logo@2x.png b/core_integrations/sony_projector/logo@2x.png
deleted file mode 100644
index 9ca4f384..00000000
Binary files a/core_integrations/sony_projector/logo@2x.png and /dev/null differ
diff --git a/core_integrations/syncthru b/core_integrations/syncthru
index 31475b4d..c043ff79 120000
--- a/core_integrations/syncthru
+++ b/core_integrations/syncthru
@@ -1 +1 @@
-samsungtv
\ No newline at end of file
+../core_brands/samsung
\ No newline at end of file
diff --git a/core_integrations/synology_chat b/core_integrations/synology_chat
index 3ad9e845..4f78b8cb 120000
--- a/core_integrations/synology_chat
+++ b/core_integrations/synology_chat
@@ -1 +1 @@
-synology
\ No newline at end of file
+../core_brands/synology
\ No newline at end of file
diff --git a/core_integrations/synology_dsm b/core_integrations/synology_dsm
index 3ad9e845..4f78b8cb 120000
--- a/core_integrations/synology_dsm
+++ b/core_integrations/synology_dsm
@@ -1 +1 @@
-synology
\ No newline at end of file
+../core_brands/synology
\ No newline at end of file
diff --git a/core_integrations/synology_srm b/core_integrations/synology_srm
index 3ad9e845..4f78b8cb 120000
--- a/core_integrations/synology_srm
+++ b/core_integrations/synology_srm
@@ -1 +1 @@
-synology
\ No newline at end of file
+../core_brands/synology
\ No newline at end of file
diff --git a/core_integrations/telegram b/core_integrations/telegram
new file mode 120000
index 00000000..e0a061d7
--- /dev/null
+++ b/core_integrations/telegram
@@ -0,0 +1 @@
+../core_brands/telegram
\ No newline at end of file
diff --git a/core_integrations/telegram_bot b/core_integrations/telegram_bot
index af339fd1..e0a061d7 120000
--- a/core_integrations/telegram_bot
+++ b/core_integrations/telegram_bot
@@ -1 +1 @@
-telegram
\ No newline at end of file
+../core_brands/telegram
\ No newline at end of file
diff --git a/core_integrations/tellstick b/core_integrations/tellstick
new file mode 120000
index 00000000..863958d3
--- /dev/null
+++ b/core_integrations/tellstick
@@ -0,0 +1 @@
+../core_brands/telldus
\ No newline at end of file
diff --git a/core_integrations/tesla_wall_connector b/core_integrations/tesla_wall_connector
index d56f4a35..99b7f925 120000
--- a/core_integrations/tesla_wall_connector
+++ b/core_integrations/tesla_wall_connector
@@ -1 +1 @@
-tesla
\ No newline at end of file
+../core_brands/tesla
\ No newline at end of file
diff --git a/core_integrations/trafikverket_ferry b/core_integrations/trafikverket_ferry
new file mode 120000
index 00000000..6f42929c
--- /dev/null
+++ b/core_integrations/trafikverket_ferry
@@ -0,0 +1 @@
+../core_brands/trafikverket
\ No newline at end of file
diff --git a/core_integrations/trafikverket_train b/core_integrations/trafikverket_train
new file mode 120000
index 00000000..6f42929c
--- /dev/null
+++ b/core_integrations/trafikverket_train
@@ -0,0 +1 @@
+../core_brands/trafikverket
\ No newline at end of file
diff --git a/core_integrations/trafikverket_train/icon.png b/core_integrations/trafikverket_train/icon.png
deleted file mode 100644
index f1826b36..00000000
Binary files a/core_integrations/trafikverket_train/icon.png and /dev/null differ
diff --git a/core_integrations/trafikverket_train/icon@2x.png b/core_integrations/trafikverket_train/icon@2x.png
deleted file mode 100644
index 8e8ae535..00000000
Binary files a/core_integrations/trafikverket_train/icon@2x.png and /dev/null differ
diff --git a/core_integrations/trafikverket_train/logo.png b/core_integrations/trafikverket_train/logo.png
deleted file mode 100644
index 69aea8b7..00000000
Binary files a/core_integrations/trafikverket_train/logo.png and /dev/null differ
diff --git a/core_integrations/trafikverket_train/logo@2x.png b/core_integrations/trafikverket_train/logo@2x.png
deleted file mode 100644
index dd92eda5..00000000
Binary files a/core_integrations/trafikverket_train/logo@2x.png and /dev/null differ
diff --git a/core_integrations/trafikverket_weatherstation b/core_integrations/trafikverket_weatherstation
index 73a1fb6a..6f42929c 120000
--- a/core_integrations/trafikverket_weatherstation
+++ b/core_integrations/trafikverket_weatherstation
@@ -1 +1 @@
-trafikverket_train/
\ No newline at end of file
+../core_brands/trafikverket
\ No newline at end of file
diff --git a/core_integrations/twilio b/core_integrations/twilio
new file mode 120000
index 00000000..45e7f8f6
--- /dev/null
+++ b/core_integrations/twilio
@@ -0,0 +1 @@
+../core_brands/twilio
\ No newline at end of file
diff --git a/core_integrations/twilio_call b/core_integrations/twilio_call
index 1e2071a3..45e7f8f6 120000
--- a/core_integrations/twilio_call
+++ b/core_integrations/twilio_call
@@ -1 +1 @@
-twilio
\ No newline at end of file
+../core_brands/twilio
\ No newline at end of file
diff --git a/core_integrations/twilio_sms b/core_integrations/twilio_sms
index 1e2071a3..45e7f8f6 120000
--- a/core_integrations/twilio_sms
+++ b/core_integrations/twilio_sms
@@ -1 +1 @@
-twilio
\ No newline at end of file
+../core_brands/twilio
\ No newline at end of file
diff --git a/core_integrations/ubus b/core_integrations/ubus
new file mode 120000
index 00000000..83cc2656
--- /dev/null
+++ b/core_integrations/ubus
@@ -0,0 +1 @@
+../core_brands/openwrt
\ No newline at end of file
diff --git a/core_integrations/vlc b/core_integrations/vlc
new file mode 120000
index 00000000..d0c1af5a
--- /dev/null
+++ b/core_integrations/vlc
@@ -0,0 +1 @@
+../core_brands/vlc
\ No newline at end of file
diff --git a/core_integrations/vlc_telnet b/core_integrations/vlc_telnet
index af7836d9..d0c1af5a 120000
--- a/core_integrations/vlc_telnet
+++ b/core_integrations/vlc_telnet
@@ -1 +1 @@
-vlc
\ No newline at end of file
+../core_brands/vlc
\ No newline at end of file
diff --git a/core_integrations/xiaomi b/core_integrations/xiaomi
new file mode 120000
index 00000000..1c38392b
--- /dev/null
+++ b/core_integrations/xiaomi
@@ -0,0 +1 @@
+../core_brands/xiaomi
\ No newline at end of file
diff --git a/core_integrations/xiaomi_aqara b/core_integrations/xiaomi_aqara
index 031953b3..1c38392b 120000
--- a/core_integrations/xiaomi_aqara
+++ b/core_integrations/xiaomi_aqara
@@ -1 +1 @@
-xiaomi
\ No newline at end of file
+../core_brands/xiaomi
\ No newline at end of file
diff --git a/core_integrations/xiaomi_ble b/core_integrations/xiaomi_ble
index 031953b3..1c38392b 120000
--- a/core_integrations/xiaomi_ble
+++ b/core_integrations/xiaomi_ble
@@ -1 +1 @@
-xiaomi
\ No newline at end of file
+../core_brands/xiaomi
\ No newline at end of file
diff --git a/core_integrations/xiaomi_miio b/core_integrations/xiaomi_miio
index 031953b3..1c38392b 120000
--- a/core_integrations/xiaomi_miio
+++ b/core_integrations/xiaomi_miio
@@ -1 +1 @@
-xiaomi
\ No newline at end of file
+../core_brands/xiaomi
\ No newline at end of file
diff --git a/core_integrations/xiaomi_tv b/core_integrations/xiaomi_tv
index 031953b3..1c38392b 120000
--- a/core_integrations/xiaomi_tv
+++ b/core_integrations/xiaomi_tv
@@ -1 +1 @@
-xiaomi
\ No newline at end of file
+../core_brands/xiaomi
\ No newline at end of file
diff --git a/core_integrations/yandex_transport b/core_integrations/yandex_transport
new file mode 120000
index 00000000..4e89c481
--- /dev/null
+++ b/core_integrations/yandex_transport
@@ -0,0 +1 @@
+../core_brands/yandex
\ No newline at end of file
diff --git a/core_integrations/yandex_transport/icon.png b/core_integrations/yandex_transport/icon.png
deleted file mode 100644
index 263d629c..00000000
Binary files a/core_integrations/yandex_transport/icon.png and /dev/null differ
diff --git a/core_integrations/yandex_transport/icon@2x.png b/core_integrations/yandex_transport/icon@2x.png
deleted file mode 100644
index 7edd9fcb..00000000
Binary files a/core_integrations/yandex_transport/icon@2x.png and /dev/null differ
diff --git a/core_integrations/yandextts b/core_integrations/yandextts
new file mode 120000
index 00000000..4e89c481
--- /dev/null
+++ b/core_integrations/yandextts
@@ -0,0 +1 @@
+../core_brands/yandex
\ No newline at end of file
diff --git a/core_integrations/yandextts/logo.png b/core_integrations/yandextts/logo.png
deleted file mode 100644
index 4fa58aa1..00000000
Binary files a/core_integrations/yandextts/logo.png and /dev/null differ
diff --git a/core_integrations/yandextts/logo@2x.png b/core_integrations/yandextts/logo@2x.png
deleted file mode 100644
index da948ebd..00000000
Binary files a/core_integrations/yandextts/logo@2x.png and /dev/null differ
diff --git a/core_integrations/yeelight b/core_integrations/yeelight
new file mode 120000
index 00000000..8e490120
--- /dev/null
+++ b/core_integrations/yeelight
@@ -0,0 +1 @@
+../core_brands/yeelight
\ No newline at end of file
diff --git a/core_integrations/yeelightsunflower b/core_integrations/yeelightsunflower
index 0733037b..8e490120 120000
--- a/core_integrations/yeelightsunflower
+++ b/core_integrations/yeelightsunflower
@@ -1 +1 @@
-yeelight
\ No newline at end of file
+../core_brands/yeelight
\ No newline at end of file