modularization of config options

modularization of config options