- restructured directories