Added standings
Fixed classes / modules
Refactored some code