Got rid of intermediate directory
Renamed test directory
Merge pull request #2 from gulley/minor

Minor