Class structuring

Lots of classes, and a class diagram! How exciting!