Re-organize config file to be less crazy