Fix Grade scraping
Shift classes around