Fix up some broken paths

We don't want to put stuff in NON-STANDARD place, now, do we private?

Of c-c-course not, sir!
Always make clean

Doesn't hurt, but makes testing a bit easier.