Structure of classes should be quite flat

Meta
3faed4bc-ed4c-4f9f-8cc4-abdfd54d0d6e