Refactor directory layout.