6 - Refactor config files