re-structured dirs