Merge pull request #3 from rhyolight/site-reorg

Site reorg
Merge remote-tracking branch 'origin' into site-reorg