Reorganizing directories around stacked classes