Reorganize configuration files