Rename Grid struct to Portion struct