directories restructured