US641 - Refactor config files