Structure of classes should be quite flat

Meta
38338135-64ba-4b2f-8f49-2deada23d02d