Moved some stuff in the config around.