Grid helper classes changed

Helper classes moved to the grid files to avoid being overridden.