diff --git a/icons/apps/help-browser-symbolic.symbolic.svg b/icons/apps-symbolic/help-browser-symbolic.symbolic.svg
similarity index 100%
rename from icons/apps/help-browser-symbolic.symbolic.svg
rename to icons/apps-symbolic/help-browser-symbolic.symbolic.svg
diff --git a/icons/apps/network-server-symbolic.symbolic.svg b/icons/apps-symbolic/network-server-symbolic.symbolic.svg
similarity index 100%
rename from icons/apps/network-server-symbolic.symbolic.svg
rename to icons/apps-symbolic/network-server-symbolic.symbolic.svg
diff --git a/icons/apps/preferences-desktop-apps-symbolic.symbolic.svg b/icons/apps-symbolic/preferences-desktop-apps-symbolic.symbolic.svg
similarity index 100%
rename from icons/apps/preferences-desktop-apps-symbolic.symbolic.svg
rename to icons/apps-symbolic/preferences-desktop-apps-symbolic.symbolic.svg
diff --git a/icons/apps/preferences-desktop-display-symbolic.symbolic.svg b/icons/apps-symbolic/preferences-desktop-display-symbolic.symbolic.svg
similarity index 100%
rename from icons/apps/preferences-desktop-display-symbolic.symbolic.svg
rename to icons/apps-symbolic/preferences-desktop-display-symbolic.symbolic.svg
diff --git a/icons/apps/preferences-desktop-font-symbolic.symbolic.svg b/icons/apps-symbolic/preferences-desktop-font-symbolic.symbolic.svg
similarity index 100%
rename from icons/apps/preferences-desktop-font-symbolic.symbolic.svg
rename to icons/apps-symbolic/preferences-desktop-font-symbolic.symbolic.svg
diff --git a/icons/apps/preferences-desktop-keyboard-symbolic.symbolic.svg b/icons/apps-symbolic/preferences-desktop-keyboard-symbolic.symbolic.svg
similarity index 100%
rename from icons/apps/preferences-desktop-keyboard-symbolic.symbolic.svg
rename to icons/apps-symbolic/preferences-desktop-keyboard-symbolic.symbolic.svg
diff --git a/icons/apps/preferences-desktop-remote-desktop-symbolic.symbolic.svg b/icons/apps-symbolic/preferences-desktop-remote-desktop-symbolic.symbolic.svg
similarity index 100%
rename from icons/apps/preferences-desktop-remote-desktop-symbolic.symbolic.svg
rename to icons/apps-symbolic/preferences-desktop-remote-desktop-symbolic.symbolic.svg
diff --git a/icons/apps/preferences-desktop-wallpaper-symbolic.symbolic.svg b/icons/apps-symbolic/preferences-desktop-wallpaper-symbolic.symbolic.svg
similarity index 100%
rename from icons/apps/preferences-desktop-wallpaper-symbolic.symbolic.svg
rename to icons/apps-symbolic/preferences-desktop-wallpaper-symbolic.symbolic.svg
diff --git a/icons/apps/preferences-symbolic.symbolic.svg b/icons/apps-symbolic/preferences-symbolic.symbolic.svg
similarity index 100%
rename from icons/apps/preferences-symbolic.symbolic.svg
rename to icons/apps-symbolic/preferences-symbolic.symbolic.svg
diff --git a/icons/apps/preferences-system-notifications-symbolic.symbolic.svg b/icons/apps-symbolic/preferences-system-notifications-symbolic.symbolic.svg
similarity index 100%
rename from icons/apps/preferences-system-notifications-symbolic.symbolic.svg
rename to icons/apps-symbolic/preferences-system-notifications-symbolic.symbolic.svg
diff --git a/icons/apps/preferences-system-privacy-symbolic.symbolic.svg b/icons/apps-symbolic/preferences-system-privacy-symbolic.symbolic.svg
similarity index 100%
rename from icons/apps/preferences-system-privacy-symbolic.symbolic.svg
rename to icons/apps-symbolic/preferences-system-privacy-symbolic.symbolic.svg
diff --git a/icons/apps/preferences-system-time-symbolic.symbolic.svg b/icons/apps-symbolic/preferences-system-time-symbolic.symbolic.svg
similarity index 100%
rename from icons/apps/preferences-system-time-symbolic.symbolic.svg
rename to icons/apps-symbolic/preferences-system-time-symbolic.symbolic.svg
diff --git a/icons/templates/design.md b/new/templates/design.md
similarity index 100%
rename from icons/templates/design.md
rename to new/templates/design.md
diff --git a/icons/templates/folder.svg b/new/templates/folder.svg
similarity index 100%
rename from icons/templates/folder.svg
rename to new/templates/folder.svg
diff --git a/icons/templates/icon.svg b/new/templates/icon.svg
similarity index 100%
rename from icons/templates/icon.svg
rename to new/templates/icon.svg
diff --git a/icons/templates/mimetype.svg b/new/templates/mimetype.svg
similarity index 100%
rename from icons/templates/mimetype.svg
rename to new/templates/mimetype.svg
diff --git a/icons/templates/symbolic.svg b/new/templates/symbolic.svg
similarity index 100%
rename from icons/templates/symbolic.svg
rename to new/templates/symbolic.svg
diff --git a/icons/templates/template-symbolic presets/symbolic-with-error.svg b/new/templates/template-symbolic presets/symbolic-with-error.svg
similarity index 100%
rename from icons/templates/template-symbolic presets/symbolic-with-error.svg
rename to new/templates/template-symbolic presets/symbolic-with-error.svg
diff --git a/icons/templates/template-symbolic presets/symbolic-with-grid.svg b/new/templates/template-symbolic presets/symbolic-with-grid.svg
similarity index 100%
rename from icons/templates/template-symbolic presets/symbolic-with-grid.svg
rename to new/templates/template-symbolic presets/symbolic-with-grid.svg
diff --git a/icons/templates/template-symbolic presets/symbolic-with-negation.svg b/new/templates/template-symbolic presets/symbolic-with-negation.svg
similarity index 100%
rename from icons/templates/template-symbolic presets/symbolic-with-negation.svg
rename to new/templates/template-symbolic presets/symbolic-with-negation.svg
diff --git a/icons/templates/template-symbolic presets/symbolic-with-question.svg b/new/templates/template-symbolic presets/symbolic-with-question.svg
similarity index 100%
rename from icons/templates/template-symbolic presets/symbolic-with-question.svg
rename to new/templates/template-symbolic presets/symbolic-with-question.svg
diff --git a/icons/notdetermined/distributions/distribution-android.svg b/other/notdetermined/distributions/distribution-android.svg
similarity index 100%
rename from icons/notdetermined/distributions/distribution-android.svg
rename to other/notdetermined/distributions/distribution-android.svg
diff --git a/icons/notdetermined/distributions/distribution-arch.svg b/other/notdetermined/distributions/distribution-arch.svg
similarity index 100%
rename from icons/notdetermined/distributions/distribution-arch.svg
rename to other/notdetermined/distributions/distribution-arch.svg
diff --git a/icons/notdetermined/distributions/distribution-freebsd.svg b/other/notdetermined/distributions/distribution-freebsd.svg
similarity index 100%
rename from icons/notdetermined/distributions/distribution-freebsd.svg
rename to other/notdetermined/distributions/distribution-freebsd.svg
diff --git a/icons/notdetermined/distributions/distribution-manjaro.svg b/other/notdetermined/distributions/distribution-manjaro.svg
similarity index 100%
rename from icons/notdetermined/distributions/distribution-manjaro.svg
rename to other/notdetermined/distributions/distribution-manjaro.svg
diff --git a/icons/notdetermined/distributions/distribution-raspberrypi.svg b/other/notdetermined/distributions/distribution-raspberrypi.svg
similarity index 100%
rename from icons/notdetermined/distributions/distribution-raspberrypi.svg
rename to other/notdetermined/distributions/distribution-raspberrypi.svg
diff --git a/icons/notdetermined/examples/asteroid example.svg b/other/notdetermined/examples/asteroid example.svg
similarity index 100%
rename from icons/notdetermined/examples/asteroid example.svg
rename to other/notdetermined/examples/asteroid example.svg
diff --git a/icons/notdetermined/package2.svg b/other/notdetermined/package2.svg
similarity index 100%
rename from icons/notdetermined/package2.svg
rename to other/notdetermined/package2.svg
diff --git a/icons/notdetermined/pacman.svg b/other/notdetermined/pacman.svg
similarity index 100%
rename from icons/notdetermined/pacman.svg
rename to other/notdetermined/pacman.svg
diff --git a/icons/notdetermined/shatteredpixeldungeonsvg.svg b/other/notdetermined/shatteredpixeldungeonsvg.svg
similarity index 100%
rename from icons/notdetermined/shatteredpixeldungeonsvg.svg
rename to other/notdetermined/shatteredpixeldungeonsvg.svg