configs refactor