Code reorg
Merge branch 'master' of github.com:DMSwan/PIREstimators