Refactor directories
Refactor directories