Reorganized the award step definitions, as their current organization wasn't so great.