Code reorg
Merge pull request #3 from rcackerman/gh-pages

Code reorg