Cleanup and splitting the config into multiple files