updated variable names and error messages related to new project structure
some more rewording and renaming
Merge pull request #441 from jayway/structure

Updates to file and folder location validation