Structure of classes should be quite flat

Meta
ffdf40b5-7c32-4192-b3dd-b60d033eb69c