added folder for config, some refactoring