testing fixes
fixes after folder restructure
Merge pull request #22 from hippagriff/testing

Testing