reorg, refactor, cleanup