Re-organize config.