Merge pull request #8 from cwc/reorg

Stability/reorg work