diff --git a/source/images/components/alexa/account_linking.png b/source/images/integrations/alexa/account_linking.png
similarity index 100%
rename from source/images/components/alexa/account_linking.png
rename to source/images/integrations/alexa/account_linking.png
diff --git a/source/images/components/alexa/alexa-108x108.png b/source/images/integrations/alexa/alexa-108x108.png
similarity index 100%
rename from source/images/components/alexa/alexa-108x108.png
rename to source/images/integrations/alexa/alexa-108x108.png
diff --git a/source/images/components/alexa/alexa-512x512.png b/source/images/integrations/alexa/alexa-512x512.png
similarity index 100%
rename from source/images/components/alexa/alexa-512x512.png
rename to source/images/integrations/alexa/alexa-512x512.png
diff --git a/source/images/components/alexa/create_a_new_skill.png b/source/images/integrations/alexa/create_a_new_skill.png
similarity index 100%
rename from source/images/components/alexa/create_a_new_skill.png
rename to source/images/integrations/alexa/create_a_new_skill.png
diff --git a/source/images/components/alexa/create_iam_role_attach_permission.png b/source/images/integrations/alexa/create_iam_role_attach_permission.png
similarity index 100%
rename from source/images/components/alexa/create_iam_role_attach_permission.png
rename to source/images/integrations/alexa/create_iam_role_attach_permission.png
diff --git a/source/images/components/alexa/lambda_function_env_var.png b/source/images/integrations/alexa/lambda_function_env_var.png
similarity index 100%
rename from source/images/components/alexa/lambda_function_env_var.png
rename to source/images/integrations/alexa/lambda_function_env_var.png
diff --git a/source/images/components/alexa/scene_slot.png b/source/images/integrations/alexa/scene_slot.png
similarity index 100%
rename from source/images/components/alexa/scene_slot.png
rename to source/images/integrations/alexa/scene_slot.png
diff --git a/source/images/components/alexa/scene_slot_synonyms.png b/source/images/integrations/alexa/scene_slot_synonyms.png
similarity index 100%
rename from source/images/components/alexa/scene_slot_synonyms.png
rename to source/images/integrations/alexa/scene_slot_synonyms.png
diff --git a/source/images/components/alexa/script_slot.png b/source/images/integrations/alexa/script_slot.png
similarity index 100%
rename from source/images/components/alexa/script_slot.png
rename to source/images/integrations/alexa/script_slot.png
diff --git a/source/images/components/apple_tv/auth_pin.jpg b/source/images/integrations/apple_tv/auth_pin.jpg
similarity index 100%
rename from source/images/components/apple_tv/auth_pin.jpg
rename to source/images/integrations/apple_tv/auth_pin.jpg
diff --git a/source/images/components/apple_tv/auth_start.jpg b/source/images/integrations/apple_tv/auth_start.jpg
similarity index 100%
rename from source/images/components/apple_tv/auth_start.jpg
rename to source/images/integrations/apple_tv/auth_start.jpg
diff --git a/source/images/components/apple_tv/authenticate.png b/source/images/integrations/apple_tv/authenticate.png
similarity index 100%
rename from source/images/components/apple_tv/authenticate.png
rename to source/images/integrations/apple_tv/authenticate.png
diff --git a/source/images/components/apple_tv/credentials.png b/source/images/integrations/apple_tv/credentials.png
similarity index 100%
rename from source/images/components/apple_tv/credentials.png
rename to source/images/integrations/apple_tv/credentials.png
diff --git a/source/images/components/apple_tv/scan_result.jpg b/source/images/integrations/apple_tv/scan_result.jpg
similarity index 100%
rename from source/images/components/apple_tv/scan_result.jpg
rename to source/images/integrations/apple_tv/scan_result.jpg
diff --git a/source/images/components/apple_tv/scan_start.jpg b/source/images/integrations/apple_tv/scan_start.jpg
similarity index 100%
rename from source/images/components/apple_tv/scan_start.jpg
rename to source/images/integrations/apple_tv/scan_start.jpg
diff --git a/source/images/components/automation/logbook.png b/source/images/integrations/automation/logbook.png
similarity index 100%
rename from source/images/components/automation/logbook.png
rename to source/images/integrations/automation/logbook.png
diff --git a/source/images/components/calendar/todoist-108x108.png b/source/images/integrations/calendar/todoist-108x108.png
similarity index 100%
rename from source/images/components/calendar/todoist-108x108.png
rename to source/images/integrations/calendar/todoist-108x108.png
diff --git a/source/images/components/calendar/todoist-512x512.png b/source/images/integrations/calendar/todoist-512x512.png
similarity index 100%
rename from source/images/components/calendar/todoist-512x512.png
rename to source/images/integrations/calendar/todoist-512x512.png
diff --git a/source/images/components/camera/generic-google-maps.png b/source/images/integrations/camera/generic-google-maps.png
similarity index 100%
rename from source/images/components/camera/generic-google-maps.png
rename to source/images/integrations/camera/generic-google-maps.png
diff --git a/source/images/components/camera/preload-stream.png b/source/images/integrations/camera/preload-stream.png
similarity index 100%
rename from source/images/components/camera/preload-stream.png
rename to source/images/integrations/camera/preload-stream.png
diff --git a/source/images/components/cisco_webex_teams/rich_formatting.png b/source/images/integrations/cisco_webex_teams/rich_formatting.png
similarity index 100%
rename from source/images/components/cisco_webex_teams/rich_formatting.png
rename to source/images/integrations/cisco_webex_teams/rich_formatting.png
diff --git a/source/images/components/flock/flock-webhook.png b/source/images/integrations/flock/flock-webhook.png
similarity index 100%
rename from source/images/components/flock/flock-webhook.png
rename to source/images/integrations/flock/flock-webhook.png
diff --git a/source/images/components/flock/new-webhook.png b/source/images/integrations/flock/new-webhook.png
similarity index 100%
rename from source/images/components/flock/new-webhook.png
rename to source/images/integrations/flock/new-webhook.png
diff --git a/source/images/components/free_mobile/token.png b/source/images/integrations/free_mobile/token.png
similarity index 100%
rename from source/images/components/free_mobile/token.png
rename to source/images/integrations/free_mobile/token.png
diff --git a/source/images/components/garadget/cover_garadget_details.png b/source/images/integrations/garadget/cover_garadget_details.png
similarity index 100%
rename from source/images/components/garadget/cover_garadget_details.png
rename to source/images/integrations/garadget/cover_garadget_details.png
diff --git a/source/images/components/google_assistant/accountlinking.png b/source/images/integrations/google_assistant/accountlinking.png
similarity index 100%
rename from source/images/components/google_assistant/accountlinking.png
rename to source/images/integrations/google_assistant/accountlinking.png
diff --git a/source/images/components/gpslogger/custom-url.png b/source/images/integrations/gpslogger/custom-url.png
similarity index 100%
rename from source/images/components/gpslogger/custom-url.png
rename to source/images/integrations/gpslogger/custom-url.png
diff --git a/source/images/components/gpslogger/logging-details.png b/source/images/integrations/gpslogger/logging-details.png
similarity index 100%
rename from source/images/components/gpslogger/logging-details.png
rename to source/images/integrations/gpslogger/logging-details.png
diff --git a/source/images/components/gpslogger/performance.png b/source/images/integrations/gpslogger/performance.png
similarity index 100%
rename from source/images/components/gpslogger/performance.png
rename to source/images/integrations/gpslogger/performance.png
diff --git a/source/images/components/gpslogger/settings.png b/source/images/integrations/gpslogger/settings.png
similarity index 100%
rename from source/images/components/gpslogger/settings.png
rename to source/images/integrations/gpslogger/settings.png
diff --git a/source/images/components/haveibeenpwned/sensor.png b/source/images/integrations/haveibeenpwned/sensor.png
similarity index 100%
rename from source/images/components/haveibeenpwned/sensor.png
rename to source/images/integrations/haveibeenpwned/sensor.png
diff --git a/source/images/components/ifttt/IFTTT_manything_trigger.png b/source/images/integrations/ifttt/IFTTT_manything_trigger.png
similarity index 100%
rename from source/images/components/ifttt/IFTTT_manything_trigger.png
rename to source/images/integrations/ifttt/IFTTT_manything_trigger.png
diff --git a/source/images/components/ifttt/finding_key.png b/source/images/integrations/ifttt/finding_key.png
similarity index 100%
rename from source/images/components/ifttt/finding_key.png
rename to source/images/integrations/ifttt/finding_key.png
diff --git a/source/images/components/ifttt/setup_service.png b/source/images/integrations/ifttt/setup_service.png
similarity index 100%
rename from source/images/components/ifttt/setup_service.png
rename to source/images/integrations/ifttt/setup_service.png
diff --git a/source/images/components/ifttt/setup_trigger.png b/source/images/integrations/ifttt/setup_trigger.png
similarity index 100%
rename from source/images/components/ifttt/setup_trigger.png
rename to source/images/integrations/ifttt/setup_trigger.png
diff --git a/source/images/components/ifttt/testing_service.png b/source/images/integrations/ifttt/testing_service.png
similarity index 100%
rename from source/images/components/ifttt/testing_service.png
rename to source/images/integrations/ifttt/testing_service.png
diff --git a/source/images/components/light/group.png b/source/images/integrations/light/group.png
similarity index 100%
rename from source/images/components/light/group.png
rename to source/images/integrations/light/group.png
diff --git a/source/images/components/mystrom/switch-advanced.png b/source/images/integrations/mystrom/switch-advanced.png
similarity index 100%
rename from source/images/components/mystrom/switch-advanced.png
rename to source/images/integrations/mystrom/switch-advanced.png
diff --git a/source/images/components/netdata/details.png b/source/images/integrations/netdata/details.png
similarity index 100%
rename from source/images/components/netdata/details.png
rename to source/images/integrations/netdata/details.png
diff --git a/source/images/components/opengarage/cover_opengarage_details.jpg b/source/images/integrations/opengarage/cover_opengarage_details.jpg
similarity index 100%
rename from source/images/components/opengarage/cover_opengarage_details.jpg
rename to source/images/integrations/opengarage/cover_opengarage_details.jpg
diff --git a/source/images/components/pyload/pyload_speed.png b/source/images/integrations/pyload/pyload_speed.png
similarity index 100%
rename from source/images/components/pyload/pyload_speed.png
rename to source/images/integrations/pyload/pyload_speed.png
diff --git a/source/images/components/rfxtrx/sensor.png b/source/images/integrations/rfxtrx/sensor.png
similarity index 100%
rename from source/images/components/rfxtrx/sensor.png
rename to source/images/integrations/rfxtrx/sensor.png
diff --git a/source/images/components/rfxtrx/switch.png b/source/images/integrations/rfxtrx/switch.png
similarity index 100%
rename from source/images/components/rfxtrx/switch.png
rename to source/images/integrations/rfxtrx/switch.png
diff --git a/source/images/components/thethingsnetwork/access_key.png b/source/images/integrations/thethingsnetwork/access_key.png
similarity index 100%
rename from source/images/components/thethingsnetwork/access_key.png
rename to source/images/integrations/thethingsnetwork/access_key.png
diff --git a/source/images/components/thethingsnetwork/add_integration.png b/source/images/integrations/thethingsnetwork/add_integration.png
similarity index 100%
rename from source/images/components/thethingsnetwork/add_integration.png
rename to source/images/integrations/thethingsnetwork/add_integration.png
diff --git a/source/images/components/thethingsnetwork/applications.png b/source/images/integrations/thethingsnetwork/applications.png
similarity index 100%
rename from source/images/components/thethingsnetwork/applications.png
rename to source/images/integrations/thethingsnetwork/applications.png
diff --git a/source/images/components/thethingsnetwork/choose_integration.png b/source/images/integrations/thethingsnetwork/choose_integration.png
similarity index 100%
rename from source/images/components/thethingsnetwork/choose_integration.png
rename to source/images/integrations/thethingsnetwork/choose_integration.png
diff --git a/source/images/components/thethingsnetwork/confirm_integration.png b/source/images/integrations/thethingsnetwork/confirm_integration.png
similarity index 100%
rename from source/images/components/thethingsnetwork/confirm_integration.png
rename to source/images/integrations/thethingsnetwork/confirm_integration.png
diff --git a/source/images/components/thethingsnetwork/devices.png b/source/images/integrations/thethingsnetwork/devices.png
similarity index 100%
rename from source/images/components/thethingsnetwork/devices.png
rename to source/images/integrations/thethingsnetwork/devices.png
diff --git a/source/images/components/thethingsnetwork/storage_integration.png b/source/images/integrations/thethingsnetwork/storage_integration.png
similarity index 100%
rename from source/images/components/thethingsnetwork/storage_integration.png
rename to source/images/integrations/thethingsnetwork/storage_integration.png
diff --git a/source/images/components/transmission/transmission.png b/source/images/integrations/transmission/transmission.png
similarity index 100%
rename from source/images/components/transmission/transmission.png
rename to source/images/integrations/transmission/transmission.png
diff --git a/source/images/components/transmission/transmission_perf.png b/source/images/integrations/transmission/transmission_perf.png
similarity index 100%
rename from source/images/components/transmission/transmission_perf.png
rename to source/images/integrations/transmission/transmission_perf.png
diff --git a/source/images/components/zestimate/zestimateexample.png b/source/images/integrations/zestimate/zestimateexample.png
similarity index 100%
rename from source/images/components/zestimate/zestimateexample.png
rename to source/images/integrations/zestimate/zestimateexample.png