code import & reorg