restructured working directory