code reorg & namespace change