reorg of config and object all files