split up and relocated configuration