Small reorgnization to clean things up
Merge pull request #7 from dstufft/small-reorg

Small reorgnization to clean things up