Re-org so mods always goes first. Fixes #360