Changing the root path and refactoring