Change default working directory
Refactor directory structure