reorganised dirs