Structure of classes should be quite flat

Meta
305ead38-548c-4f66-bea9-812f1d0b1d7a