Fixing commit for 1.6 update directory structure
Merge pull request #5 from pdogg/2014

Fixing commit for 1.6 update directory structure