Structure of classes should be quite flat

Meta
79fdccb9-0900-45cb-9730-52ca81708911