reorg of config and object