Refactor directory structure.