New class structure

Feest!