Refactor directories