Merge pull request #524 from Maaack/update-project-paths