Fixing puppet details

And moving scp'ed files to the correct user