config refactor
5 files changed