Fixing hard-coded paths

This also removes a reference for Daniel Cid, I wanted to back that out to keep the PR clean, but it's too much of a bother and I want to get the paths issue corrected.