Organized classes into groups, added basic level scaling