Refactor directory tree in project
Refactor directory tree in project