Structure of classes should be quite flat

Meta
37c3cf7d-91f9-4986-ab76-a31d6ffe6e5b