Refactor configuration files. No functional changes.