Refactor dir structure.