diff --git a/content/budgie/shortcuts/en.md b/budgie/shortcuts/en.md
similarity index 100%
rename from content/budgie/shortcuts/en.md
rename to budgie/shortcuts/en.md
diff --git a/content/common-tasks/browsing-the-web/en.md b/common-tasks/browsing-the-web/en.md
similarity index 100%
rename from content/common-tasks/browsing-the-web/en.md
rename to common-tasks/browsing-the-web/en.md
diff --git a/content/common-tasks/browsing-the-web/images/firefox.jpg b/common-tasks/browsing-the-web/images/firefox.jpg
similarity index 100%
rename from content/common-tasks/browsing-the-web/images/firefox.jpg
rename to common-tasks/browsing-the-web/images/firefox.jpg
diff --git a/content/common-tasks/checking-email/en.md b/common-tasks/checking-email/en.md
similarity index 100%
rename from content/common-tasks/checking-email/en.md
rename to common-tasks/checking-email/en.md
diff --git a/content/common-tasks/checking-email/images/thunderbird.jpg b/common-tasks/checking-email/images/thunderbird.jpg
similarity index 100%
rename from content/common-tasks/checking-email/images/thunderbird.jpg
rename to common-tasks/checking-email/images/thunderbird.jpg
diff --git a/content/common-tasks/installing-and-updating-software/en.md b/common-tasks/installing-and-updating-software/en.md
similarity index 100%
rename from content/common-tasks/installing-and-updating-software/en.md
rename to common-tasks/installing-and-updating-software/en.md
diff --git a/content/common-tasks/installing-and-updating-software/images/solus-sc.jpg b/common-tasks/installing-and-updating-software/images/solus-sc.jpg
similarity index 100%
rename from content/common-tasks/installing-and-updating-software/images/solus-sc.jpg
rename to common-tasks/installing-and-updating-software/images/solus-sc.jpg
diff --git a/content/common-tasks/listening-to-music/en.md b/common-tasks/listening-to-music/en.md
similarity index 100%
rename from content/common-tasks/listening-to-music/en.md
rename to common-tasks/listening-to-music/en.md
diff --git a/content/common-tasks/listening-to-music/images/rhythmbox.jpg b/common-tasks/listening-to-music/images/rhythmbox.jpg
similarity index 100%
rename from content/common-tasks/listening-to-music/images/rhythmbox.jpg
rename to common-tasks/listening-to-music/images/rhythmbox.jpg
diff --git a/content/common-tasks/managing-your-files/en.md b/common-tasks/managing-your-files/en.md
similarity index 100%
rename from content/common-tasks/managing-your-files/en.md
rename to common-tasks/managing-your-files/en.md
diff --git a/content/common-tasks/managing-your-files/images/nautilus.jpg b/common-tasks/managing-your-files/images/nautilus.jpg
similarity index 100%
rename from content/common-tasks/managing-your-files/images/nautilus.jpg
rename to common-tasks/managing-your-files/images/nautilus.jpg
diff --git a/content/common-tasks/watching-videos/en.md b/common-tasks/watching-videos/en.md
similarity index 100%
rename from content/common-tasks/watching-videos/en.md
rename to common-tasks/watching-videos/en.md
diff --git a/content/common-tasks/watching-videos/images/vlc.jpg b/common-tasks/watching-videos/images/vlc.jpg
similarity index 100%
rename from content/common-tasks/watching-videos/images/vlc.jpg
rename to common-tasks/watching-videos/images/vlc.jpg
diff --git a/content/configuration/changing-backgrounds/en.md b/configuration/changing-backgrounds/en.md
similarity index 100%
rename from content/configuration/changing-backgrounds/en.md
rename to configuration/changing-backgrounds/en.md
diff --git a/content/configuration/changing-backgrounds/images/background-section.jpg b/configuration/changing-backgrounds/images/background-section.jpg
similarity index 100%
rename from content/configuration/changing-backgrounds/images/background-section.jpg
rename to configuration/changing-backgrounds/images/background-section.jpg
diff --git a/content/configuration/changing-backgrounds/images/background-selection.png b/configuration/changing-backgrounds/images/background-selection.png
similarity index 100%
rename from content/configuration/changing-backgrounds/images/background-selection.png
rename to configuration/changing-backgrounds/images/background-selection.png
diff --git a/content/configuration/configuring-date-and-time/en.md b/configuration/configuring-date-and-time/en.md
similarity index 100%
rename from content/configuration/configuring-date-and-time/en.md
rename to configuration/configuring-date-and-time/en.md
diff --git a/content/configuration/configuring-date-and-time/images/configuring-date-and-time.jpg b/configuration/configuring-date-and-time/images/configuring-date-and-time.jpg
similarity index 100%
rename from content/configuration/configuring-date-and-time/images/configuring-date-and-time.jpg
rename to configuration/configuring-date-and-time/images/configuring-date-and-time.jpg
diff --git a/content/configuration/configuring-default-applications/en.md b/configuration/configuring-default-applications/en.md
similarity index 100%
rename from content/configuration/configuring-default-applications/en.md
rename to configuration/configuring-default-applications/en.md
diff --git a/content/configuration/configuring-default-applications/images/configuring-default-applications.jpg b/configuration/configuring-default-applications/images/configuring-default-applications.jpg
similarity index 100%
rename from content/configuration/configuring-default-applications/images/configuring-default-applications.jpg
rename to configuration/configuring-default-applications/images/configuring-default-applications.jpg
diff --git a/content/configuration/configuring-displays/en.md b/configuration/configuring-displays/en.md
similarity index 100%
rename from content/configuration/configuring-displays/en.md
rename to configuration/configuring-displays/en.md
diff --git a/content/configuration/configuring-displays/images/arrange-displays.png b/configuration/configuring-displays/images/arrange-displays.png
similarity index 100%
rename from content/configuration/configuring-displays/images/arrange-displays.png
rename to configuration/configuring-displays/images/arrange-displays.png
diff --git a/content/configuration/configuring-displays/images/displays-overview.jpg b/configuration/configuring-displays/images/displays-overview.jpg
similarity index 100%
rename from content/configuration/configuring-displays/images/displays-overview.jpg
rename to configuration/configuring-displays/images/displays-overview.jpg
diff --git a/content/configuration/configuring-displays/images/individual-display-settings.jpg b/configuration/configuring-displays/images/individual-display-settings.jpg
similarity index 100%
rename from content/configuration/configuring-displays/images/individual-display-settings.jpg
rename to configuration/configuring-displays/images/individual-display-settings.jpg
diff --git a/content/configuration/configuring-keyboard-layout/en.md b/configuration/configuring-keyboard-layout/en.md
similarity index 100%
rename from content/configuration/configuring-keyboard-layout/en.md
rename to configuration/configuring-keyboard-layout/en.md
diff --git a/content/configuration/configuring-keyboard-layout/images/add-input-source.png b/configuration/configuring-keyboard-layout/images/add-input-source.png
similarity index 100%
rename from content/configuration/configuring-keyboard-layout/images/add-input-source.png
rename to configuration/configuring-keyboard-layout/images/add-input-source.png
diff --git a/content/configuration/configuring-keyboard-layout/images/region-and-languages-newlang.jpg b/configuration/configuring-keyboard-layout/images/region-and-languages-newlang.jpg
similarity index 100%
rename from content/configuration/configuring-keyboard-layout/images/region-and-languages-newlang.jpg
rename to configuration/configuring-keyboard-layout/images/region-and-languages-newlang.jpg
diff --git a/content/configuration/configuring-keyboard-layout/images/region-and-languages.jpg b/configuration/configuring-keyboard-layout/images/region-and-languages.jpg
similarity index 100%
rename from content/configuration/configuring-keyboard-layout/images/region-and-languages.jpg
rename to configuration/configuring-keyboard-layout/images/region-and-languages.jpg
diff --git a/content/configuration/configuring-language/en.md b/configuration/configuring-language/en.md
similarity index 100%
rename from content/configuration/configuring-language/en.md
rename to configuration/configuring-language/en.md
diff --git a/content/configuration/configuring-language/images/region-and-languages.jpg b/configuration/configuring-language/images/region-and-languages.jpg
similarity index 100%
rename from content/configuration/configuring-language/images/region-and-languages.jpg
rename to configuration/configuring-language/images/region-and-languages.jpg
diff --git a/content/configuration/configuring-language/images/selecting-language-search.png b/configuration/configuring-language/images/selecting-language-search.png
similarity index 100%
rename from content/configuration/configuring-language/images/selecting-language-search.png
rename to configuration/configuring-language/images/selecting-language-search.png
diff --git a/content/configuration/configuring-language/images/selecting-language.png b/configuration/configuring-language/images/selecting-language.png
similarity index 100%
rename from content/configuration/configuring-language/images/selecting-language.png
rename to configuration/configuring-language/images/selecting-language.png
diff --git a/content/configuration/configuring-mouse-and-touchpad/en.md b/configuration/configuring-mouse-and-touchpad/en.md
similarity index 100%
rename from content/configuration/configuring-mouse-and-touchpad/en.md
rename to configuration/configuring-mouse-and-touchpad/en.md
diff --git a/content/configuration/configuring-mouse-and-touchpad/images/mouse-settings.jpg b/configuration/configuring-mouse-and-touchpad/images/mouse-settings.jpg
similarity index 100%
rename from content/configuration/configuring-mouse-and-touchpad/images/mouse-settings.jpg
rename to configuration/configuring-mouse-and-touchpad/images/mouse-settings.jpg
diff --git a/content/configuration/configuring-mouse-and-touchpad/images/touchpad-settings.jpg b/configuration/configuring-mouse-and-touchpad/images/touchpad-settings.jpg
similarity index 100%
rename from content/configuration/configuring-mouse-and-touchpad/images/touchpad-settings.jpg
rename to configuration/configuring-mouse-and-touchpad/images/touchpad-settings.jpg
diff --git a/content/configuration/configuring-network/en.md b/configuration/configuring-network/en.md
similarity index 100%
rename from content/configuration/configuring-network/en.md
rename to configuration/configuring-network/en.md
diff --git a/content/configuration/configuring-network/images/network-authentication.jpg b/configuration/configuring-network/images/network-authentication.jpg
similarity index 100%
rename from content/configuration/configuring-network/images/network-authentication.jpg
rename to configuration/configuring-network/images/network-authentication.jpg
diff --git a/content/configuration/configuring-network/images/network-hidden.jpg b/configuration/configuring-network/images/network-hidden.jpg
similarity index 100%
rename from content/configuration/configuring-network/images/network-hidden.jpg
rename to configuration/configuring-network/images/network-hidden.jpg
diff --git a/content/configuration/configuring-network/images/network-overview.jpg b/configuration/configuring-network/images/network-overview.jpg
similarity index 100%
rename from content/configuration/configuring-network/images/network-overview.jpg
rename to configuration/configuring-network/images/network-overview.jpg
diff --git a/content/configuration/configuring-sound-and-sound-devices/en.md b/configuration/configuring-sound-and-sound-devices/en.md
similarity index 100%
rename from content/configuration/configuring-sound-and-sound-devices/en.md
rename to configuration/configuring-sound-and-sound-devices/en.md
diff --git a/content/configuration/configuring-sound-and-sound-devices/images/raven-sound-applet.jpg b/configuration/configuring-sound-and-sound-devices/images/raven-sound-applet.jpg
similarity index 100%
rename from content/configuration/configuring-sound-and-sound-devices/images/raven-sound-applet.jpg
rename to configuration/configuring-sound-and-sound-devices/images/raven-sound-applet.jpg
diff --git a/content/configuration/configuring-sound-and-sound-devices/images/sound-settings.jpg b/configuration/configuring-sound-and-sound-devices/images/sound-settings.jpg
similarity index 100%
rename from content/configuration/configuring-sound-and-sound-devices/images/sound-settings.jpg
rename to configuration/configuring-sound-and-sound-devices/images/sound-settings.jpg
diff --git a/content/configuration/enabling-desktop-icons/en.md b/configuration/enabling-desktop-icons/en.md
similarity index 100%
rename from content/configuration/enabling-desktop-icons/en.md
rename to configuration/enabling-desktop-icons/en.md
diff --git a/content/configuration/enabling-desktop-icons/images/nautilus-desktop-folder.jpg b/configuration/enabling-desktop-icons/images/nautilus-desktop-folder.jpg
similarity index 100%
rename from content/configuration/enabling-desktop-icons/images/nautilus-desktop-folder.jpg
rename to configuration/enabling-desktop-icons/images/nautilus-desktop-folder.jpg
diff --git a/content/configuration/enabling-desktop-icons/images/raven-desktop-icons.jpg b/configuration/enabling-desktop-icons/images/raven-desktop-icons.jpg
similarity index 100%
rename from content/configuration/enabling-desktop-icons/images/raven-desktop-icons.jpg
rename to configuration/enabling-desktop-icons/images/raven-desktop-icons.jpg
diff --git a/content/configuration/managing-users/en.md b/configuration/managing-users/en.md
similarity index 100%
rename from content/configuration/managing-users/en.md
rename to configuration/managing-users/en.md
diff --git a/content/configuration/managing-users/images/add-user-dialog.png b/configuration/managing-users/images/add-user-dialog.png
similarity index 100%
rename from content/configuration/managing-users/images/add-user-dialog.png
rename to configuration/managing-users/images/add-user-dialog.png
diff --git a/content/configuration/managing-users/images/keep-files-prompt.jpg b/configuration/managing-users/images/keep-files-prompt.jpg
similarity index 100%
rename from content/configuration/managing-users/images/keep-files-prompt.jpg
rename to configuration/managing-users/images/keep-files-prompt.jpg
diff --git a/content/configuration/managing-users/images/settings-users.jpg b/configuration/managing-users/images/settings-users.jpg
similarity index 100%
rename from content/configuration/managing-users/images/settings-users.jpg
rename to configuration/managing-users/images/settings-users.jpg
diff --git a/content/configuration/modifying-grub/en.md b/configuration/modifying-grub/en.md
similarity index 100%
rename from content/configuration/modifying-grub/en.md
rename to configuration/modifying-grub/en.md
diff --git a/content/contributing/community-guidelines/en.md b/contributing/community-guidelines/en.md
similarity index 100%
rename from content/contributing/community-guidelines/en.md
rename to contributing/community-guidelines/en.md
diff --git a/content/contributing/getting-involved/en.md b/contributing/getting-involved/en.md
similarity index 100%
rename from content/contributing/getting-involved/en.md
rename to contributing/getting-involved/en.md
diff --git a/content/gaming/heroes-of-newerth/en.md b/gaming/heroes-of-newerth/en.md
similarity index 100%
rename from content/gaming/heroes-of-newerth/en.md
rename to gaming/heroes-of-newerth/en.md
diff --git a/content/gaming/minecraft/en.md b/gaming/minecraft/en.md
similarity index 100%
rename from content/gaming/minecraft/en.md
rename to gaming/minecraft/en.md
diff --git a/content/gaming/minecraft/images/minecraft.jpg b/gaming/minecraft/images/minecraft.jpg
similarity index 100%
rename from content/gaming/minecraft/images/minecraft.jpg
rename to gaming/minecraft/images/minecraft.jpg
diff --git a/content/gaming/steam/en.md b/gaming/steam/en.md
similarity index 100%
rename from content/gaming/steam/en.md
rename to gaming/steam/en.md
diff --git a/content/hardware/ios-support/en.md b/hardware/ios-support/en.md
similarity index 100%
rename from content/hardware/ios-support/en.md
rename to hardware/ios-support/en.md
diff --git a/content/hardware/laptops/en.md b/hardware/laptops/en.md
similarity index 100%
rename from content/hardware/laptops/en.md
rename to hardware/laptops/en.md
diff --git a/content/hardware/proprietary-drivers/en.md b/hardware/proprietary-drivers/en.md
similarity index 100%
rename from content/hardware/proprietary-drivers/en.md
rename to hardware/proprietary-drivers/en.md
diff --git a/content/hardware/proprietary-drivers/images/doflicky.jpg b/hardware/proprietary-drivers/images/doflicky.jpg
similarity index 100%
rename from content/hardware/proprietary-drivers/images/doflicky.jpg
rename to hardware/proprietary-drivers/images/doflicky.jpg
diff --git a/content/hardware/wireless-chipsets/en.md b/hardware/wireless-chipsets/en.md
similarity index 100%
rename from content/hardware/wireless-chipsets/en.md
rename to hardware/wireless-chipsets/en.md
diff --git a/content/images/heart.png b/images/heart.png
similarity index 100%
rename from content/images/heart.png
rename to images/heart.png
diff --git a/content/installation/disks/en.md b/installation/disks/en.md
similarity index 100%
rename from content/installation/disks/en.md
rename to installation/disks/en.md
diff --git a/content/installation/preparing-to-install/en.md b/installation/preparing-to-install/en.md
similarity index 100%
rename from content/installation/preparing-to-install/en.md
rename to installation/preparing-to-install/en.md
diff --git a/content/installation/preparing-to-install/images/done.jpg b/installation/preparing-to-install/images/done.jpg
similarity index 100%
rename from content/installation/preparing-to-install/images/done.jpg
rename to installation/preparing-to-install/images/done.jpg
diff --git a/content/installation/preparing-to-install/images/rufus.jpg b/installation/preparing-to-install/images/rufus.jpg
similarity index 100%
rename from content/installation/preparing-to-install/images/rufus.jpg
rename to installation/preparing-to-install/images/rufus.jpg
diff --git a/content/installation/preparing-to-install/images/start.jpg b/installation/preparing-to-install/images/start.jpg
similarity index 100%
rename from content/installation/preparing-to-install/images/start.jpg
rename to installation/preparing-to-install/images/start.jpg
diff --git a/content/installation/preparing-to-install/images/writing.jpg b/installation/preparing-to-install/images/writing.jpg
similarity index 100%
rename from content/installation/preparing-to-install/images/writing.jpg
rename to installation/preparing-to-install/images/writing.jpg
diff --git a/content/package-management/basics/en.md b/package-management/basics/en.md
similarity index 100%
rename from content/package-management/basics/en.md
rename to package-management/basics/en.md
diff --git a/content/package-management/history-and-rollback/en.md b/package-management/history-and-rollback/en.md
similarity index 100%
rename from content/package-management/history-and-rollback/en.md
rename to package-management/history-and-rollback/en.md
diff --git a/content/package-management/repo-management/en.md b/package-management/repo-management/en.md
similarity index 100%
rename from content/package-management/repo-management/en.md
rename to package-management/repo-management/en.md
diff --git a/content/packaging/building-a-package/en.md b/packaging/building-a-package/en.md
similarity index 100%
rename from content/packaging/building-a-package/en.md
rename to packaging/building-a-package/en.md
diff --git a/content/packaging/guide/en.md b/packaging/guide/en.md
similarity index 100%
rename from content/packaging/guide/en.md
rename to packaging/guide/en.md
diff --git a/content/packaging/package.yml/en.md b/packaging/package.yml/en.md
similarity index 100%
rename from content/packaging/package.yml/en.md
rename to packaging/package.yml/en.md
diff --git a/content/packaging/packaging-practices/en.md b/packaging/packaging-practices/en.md
similarity index 100%
rename from content/packaging/packaging-practices/en.md
rename to packaging/packaging-practices/en.md
diff --git a/content/packaging/request-a-package/en.md b/packaging/request-a-package/en.md
similarity index 100%
rename from content/packaging/request-a-package/en.md
rename to packaging/request-a-package/en.md
diff --git a/content/packaging/submitting-a-package/en.md b/packaging/submitting-a-package/en.md
similarity index 100%
rename from content/packaging/submitting-a-package/en.md
rename to packaging/submitting-a-package/en.md
diff --git a/content/software/gnome-shell/en.md b/software/gnome-shell/en.md
similarity index 100%
rename from content/software/gnome-shell/en.md
rename to software/gnome-shell/en.md
diff --git a/content/software/java/en.md b/software/java/en.md
similarity index 100%
rename from content/software/java/en.md
rename to software/java/en.md
diff --git a/content/software/powerline-shell-prompt/en.md b/software/powerline-shell-prompt/en.md
similarity index 100%
rename from content/software/powerline-shell-prompt/en.md
rename to software/powerline-shell-prompt/en.md
diff --git a/content/software/third-party/en.md b/software/third-party/en.md
similarity index 100%
rename from content/software/third-party/en.md
rename to software/third-party/en.md
diff --git a/content/software/vagrant/en.md b/software/vagrant/en.md
similarity index 100%
rename from content/software/vagrant/en.md
rename to software/vagrant/en.md
diff --git a/content/software/virtualbox/en.md b/software/virtualbox/en.md
similarity index 100%
rename from content/software/virtualbox/en.md
rename to software/virtualbox/en.md