Refactor the directory structure.