Re-organize configuration.