refacturing directory layout