Revert "Relocate Puppet Rakefile and update paths to match relocation."

This reverts commit d2c0239308931ebd62e2cb4539ed78c0cbccf2a1.