Refactor directory structure