some reorg
undo constructor change
build