Minor changes to directory structure

I moved the testing directory out to the top level of the project
hierarchy. I think it makes more sense that way.