Install into the correct path

I hope that this is the right way to merge changes back into my branch.