Added some src/ stuff to make distribution hopefully work
Merge branch 'master' into append-decays