Move configuration into the rigth files.