More fixes.
Merge pull request #5 from arthurevans/reorg

More fixes.