Reorder tools to match old releases and ease comparison