Add missing files back

I knew I screwed something up during that big merge. I lost
these three files.
Even more missing files
Another forgotten file and a missed rename