Renamed cli commands to make more sense, added better template