Started reorganizing config options.