refactoring to move the configuration files for adequate place
Merge remote-tracking branch 'origin/master'