dir hierarchy restructured