Refactor directory structure
Refactor directory structure