Reorg source (issue #72)

Trivial code changes to deal with test data being in different places now