add bitmap; reorg structure