- change default config file location
- some refactoring