Move to unified config file