More class structuring