Refactor configuration files