SOLVED:
I was running a mod from nexus that was just a file I put somewhere in the Main directory. I deleted that file and the new NPCs are where they're supposed to be.
Which mod was that? I'd ideally like to unlock the companions without rocketing back to vanilla
