test: first stab at reorg.