diff --git a/common-tasks/browsing-the-web/images/firefox.jpg b/images/common-tasks/browsing-the-web/firefox.jpg
similarity index 100%
rename from common-tasks/browsing-the-web/images/firefox.jpg
rename to images/common-tasks/browsing-the-web/firefox.jpg
diff --git a/common-tasks/checking-email/images/thunderbird.jpg b/images/common-tasks/checking-email/thunderbird.jpg
similarity index 100%
rename from common-tasks/checking-email/images/thunderbird.jpg
rename to images/common-tasks/checking-email/thunderbird.jpg
diff --git a/common-tasks/installing-and-updating-software/images/solus-sc.jpg b/images/common-tasks/installing-and-updating-software/solus-sc.jpg
similarity index 100%
rename from common-tasks/installing-and-updating-software/images/solus-sc.jpg
rename to images/common-tasks/installing-and-updating-software/solus-sc.jpg
diff --git a/common-tasks/listening-to-music/images/rhythmbox.jpg b/images/common-tasks/listening-to-music/rhythmbox.jpg
similarity index 100%
rename from common-tasks/listening-to-music/images/rhythmbox.jpg
rename to images/common-tasks/listening-to-music/rhythmbox.jpg
diff --git a/common-tasks/managing-your-files/images/nautilus.jpg b/images/common-tasks/managing-your-files/nautilus.jpg
similarity index 100%
rename from common-tasks/managing-your-files/images/nautilus.jpg
rename to images/common-tasks/managing-your-files/nautilus.jpg
diff --git a/common-tasks/watching-videos/images/vlc.jpg b/images/common-tasks/watching-videos/vlc.jpg
similarity index 100%
rename from common-tasks/watching-videos/images/vlc.jpg
rename to images/common-tasks/watching-videos/vlc.jpg
diff --git a/configuration/changing-backgrounds/images/background-section.jpg b/images/configuration/changing-backgrounds/background-section.jpg
similarity index 100%
rename from configuration/changing-backgrounds/images/background-section.jpg
rename to images/configuration/changing-backgrounds/background-section.jpg
diff --git a/configuration/changing-backgrounds/images/background-selection.png b/images/configuration/changing-backgrounds/background-selection.png
similarity index 100%
rename from configuration/changing-backgrounds/images/background-selection.png
rename to images/configuration/changing-backgrounds/background-selection.png
diff --git a/configuration/configuring-date-and-time/images/configuring-date-and-time.jpg b/images/configuration/configuring-date-and-time/configuring-date-and-time.jpg
similarity index 100%
rename from configuration/configuring-date-and-time/images/configuring-date-and-time.jpg
rename to images/configuration/configuring-date-and-time/configuring-date-and-time.jpg
diff --git a/configuration/configuring-default-applications/images/configuring-default-applications.jpg b/images/configuration/configuring-default-applications/configuring-default-applications.jpg
similarity index 100%
rename from configuration/configuring-default-applications/images/configuring-default-applications.jpg
rename to images/configuration/configuring-default-applications/configuring-default-applications.jpg
diff --git a/configuration/configuring-displays/images/arrange-displays.png b/images/configuration/configuring-displays/arrange-displays.png
similarity index 100%
rename from configuration/configuring-displays/images/arrange-displays.png
rename to images/configuration/configuring-displays/arrange-displays.png
diff --git a/configuration/configuring-displays/images/displays-overview.jpg b/images/configuration/configuring-displays/displays-overview.jpg
similarity index 100%
rename from configuration/configuring-displays/images/displays-overview.jpg
rename to images/configuration/configuring-displays/displays-overview.jpg
diff --git a/configuration/configuring-displays/images/individual-display-settings.jpg b/images/configuration/configuring-displays/individual-display-settings.jpg
similarity index 100%
rename from configuration/configuring-displays/images/individual-display-settings.jpg
rename to images/configuration/configuring-displays/individual-display-settings.jpg
diff --git a/configuration/configuring-keyboard-layout/images/add-input-source.png b/images/configuration/configuring-keyboard-layout/add-input-source.png
similarity index 100%
rename from configuration/configuring-keyboard-layout/images/add-input-source.png
rename to images/configuration/configuring-keyboard-layout/add-input-source.png
diff --git a/configuration/configuring-keyboard-layout/images/region-and-languages-newlang.jpg b/images/configuration/configuring-keyboard-layout/region-and-languages-newlang.jpg
similarity index 100%
rename from configuration/configuring-keyboard-layout/images/region-and-languages-newlang.jpg
rename to images/configuration/configuring-keyboard-layout/region-and-languages-newlang.jpg
diff --git a/configuration/configuring-keyboard-layout/images/region-and-languages.jpg b/images/configuration/configuring-keyboard-layout/region-and-languages.jpg
similarity index 100%
rename from configuration/configuring-keyboard-layout/images/region-and-languages.jpg
rename to images/configuration/configuring-keyboard-layout/region-and-languages.jpg
diff --git a/configuration/configuring-language/images/region-and-languages.jpg b/images/configuration/configuring-language/region-and-languages.jpg
similarity index 100%
rename from configuration/configuring-language/images/region-and-languages.jpg
rename to images/configuration/configuring-language/region-and-languages.jpg
diff --git a/configuration/configuring-language/images/selecting-language-search.png b/images/configuration/configuring-language/selecting-language-search.png
similarity index 100%
rename from configuration/configuring-language/images/selecting-language-search.png
rename to images/configuration/configuring-language/selecting-language-search.png
diff --git a/configuration/configuring-language/images/selecting-language.png b/images/configuration/configuring-language/selecting-language.png
similarity index 100%
rename from configuration/configuring-language/images/selecting-language.png
rename to images/configuration/configuring-language/selecting-language.png
diff --git a/configuration/configuring-mouse-and-touchpad/images/mouse-settings.jpg b/images/configuration/configuring-mouse-and-touchpad/mouse-settings.jpg
similarity index 100%
rename from configuration/configuring-mouse-and-touchpad/images/mouse-settings.jpg
rename to images/configuration/configuring-mouse-and-touchpad/mouse-settings.jpg
diff --git a/configuration/configuring-mouse-and-touchpad/images/touchpad-settings.jpg b/images/configuration/configuring-mouse-and-touchpad/touchpad-settings.jpg
similarity index 100%
rename from configuration/configuring-mouse-and-touchpad/images/touchpad-settings.jpg
rename to images/configuration/configuring-mouse-and-touchpad/touchpad-settings.jpg
diff --git a/configuration/configuring-network/images/network-authentication.jpg b/images/configuration/configuring-network/network-authentication.jpg
similarity index 100%
rename from configuration/configuring-network/images/network-authentication.jpg
rename to images/configuration/configuring-network/network-authentication.jpg
diff --git a/configuration/configuring-network/images/network-hidden.jpg b/images/configuration/configuring-network/network-hidden.jpg
similarity index 100%
rename from configuration/configuring-network/images/network-hidden.jpg
rename to images/configuration/configuring-network/network-hidden.jpg
diff --git a/configuration/configuring-network/images/network-overview.jpg b/images/configuration/configuring-network/network-overview.jpg
similarity index 100%
rename from configuration/configuring-network/images/network-overview.jpg
rename to images/configuration/configuring-network/network-overview.jpg
diff --git a/configuration/configuring-sound-and-sound-devices/images/raven-sound-applet.jpg b/images/configuration/configuring-sound-and-sound-devices/raven-sound-applet.jpg
similarity index 100%
rename from configuration/configuring-sound-and-sound-devices/images/raven-sound-applet.jpg
rename to images/configuration/configuring-sound-and-sound-devices/raven-sound-applet.jpg
diff --git a/configuration/configuring-sound-and-sound-devices/images/sound-settings.jpg b/images/configuration/configuring-sound-and-sound-devices/sound-settings.jpg
similarity index 100%
rename from configuration/configuring-sound-and-sound-devices/images/sound-settings.jpg
rename to images/configuration/configuring-sound-and-sound-devices/sound-settings.jpg
diff --git a/configuration/enabling-desktop-icons/images/nautilus-desktop-folder.jpg b/images/configuration/enabling-desktop-icons/nautilus-desktop-folder.jpg
similarity index 100%
rename from configuration/enabling-desktop-icons/images/nautilus-desktop-folder.jpg
rename to images/configuration/enabling-desktop-icons/nautilus-desktop-folder.jpg
diff --git a/configuration/enabling-desktop-icons/images/raven-desktop-icons.jpg b/images/configuration/enabling-desktop-icons/raven-desktop-icons.jpg
similarity index 100%
rename from configuration/enabling-desktop-icons/images/raven-desktop-icons.jpg
rename to images/configuration/enabling-desktop-icons/raven-desktop-icons.jpg
diff --git a/configuration/managing-users/images/add-user-dialog.png b/images/configuration/managing-users/add-user-dialog.png
similarity index 100%
rename from configuration/managing-users/images/add-user-dialog.png
rename to images/configuration/managing-users/add-user-dialog.png
diff --git a/configuration/managing-users/images/keep-files-prompt.jpg b/images/configuration/managing-users/keep-files-prompt.jpg
similarity index 100%
rename from configuration/managing-users/images/keep-files-prompt.jpg
rename to images/configuration/managing-users/keep-files-prompt.jpg
diff --git a/configuration/managing-users/images/settings-users.jpg b/images/configuration/managing-users/settings-users.jpg
similarity index 100%
rename from configuration/managing-users/images/settings-users.jpg
rename to images/configuration/managing-users/settings-users.jpg
diff --git a/gaming/minecraft/images/minecraft.jpg b/images/gaming/minecraft/minecraft.jpg
similarity index 100%
rename from gaming/minecraft/images/minecraft.jpg
rename to images/gaming/minecraft/minecraft.jpg
diff --git a/hardware/proprietary-drivers/images/doflicky.jpg b/images/hardware/proprietary-drivers/doflicky.jpg
similarity index 100%
rename from hardware/proprietary-drivers/images/doflicky.jpg
rename to images/hardware/proprietary-drivers/doflicky.jpg
diff --git a/images/heart.png b/images/heart.png
deleted file mode 100755
index 7ee96ce..0000000
Binary files a/images/heart.png and /dev/null differ
diff --git a/installation/preparing-to-install/images/done.jpg b/images/installation/preparing-to-install/done.jpg
similarity index 100%
rename from installation/preparing-to-install/images/done.jpg
rename to images/installation/preparing-to-install/done.jpg
diff --git a/installation/preparing-to-install/images/rufus.jpg b/images/installation/preparing-to-install/rufus.jpg
similarity index 100%
rename from installation/preparing-to-install/images/rufus.jpg
rename to images/installation/preparing-to-install/rufus.jpg
diff --git a/installation/preparing-to-install/images/start.jpg b/images/installation/preparing-to-install/start.jpg
similarity index 100%
rename from installation/preparing-to-install/images/start.jpg
rename to images/installation/preparing-to-install/start.jpg
diff --git a/installation/preparing-to-install/images/writing.jpg b/images/installation/preparing-to-install/writing.jpg
similarity index 100%
rename from installation/preparing-to-install/images/writing.jpg
rename to images/installation/preparing-to-install/writing.jpg