Refactor configuration files.
Refactor configuration files