Reorg'd and properly namespace'd.