Reorg source (issue #72)
Fix testkey path after reorg
path fixes post-reorg
Fix makefile paths
Merge pull request #73 from nonspecialist/master

Reorg source (issue #72)