Update validator for changes in directory structure
Merge pull request #50 from abought/validator

Update validator for changes in directory structure