config files refactor