Moved a bunch of files around
Merge branch 'master' of https://github.com/danshapero/sigma