Add grunt-cli and reorganize by alpha order