slight refactor, config files added