Reorganize configuration thanks to config.include