initial reorg, tests passing but possible cruft