Merged some of the good stuff from an abandoned refactoring branch
remove pointless singletons
Use interaction index in body file name

Fixes #59
Fix duplicated headers
removed deprecated annotations that shouldn't be there
#59 zero pad filename index