Change default root dir
Refactoring