Rearrange tool templates, add a new one without subcommand capability