minor: re-organized tool sections to keep them in alphabetical order