Fixed file paths to work with current file structure.
Merge branch 'c1moore_branch' into dev