reorg

fix #72