Reorg, moving material to gh-pages
Major refactor to clean things up