Work on cleaning up the reorg/refactor