Hmm, when I dragged the .edmx and .edmx.tt into the subfolder and ran code generation everything was put in the right place. Only if I delete the .edmx.tt file did it get regenerated in the wrong location.
I have filed a bug/feature request to generate the .edmx.tt file into the same physical location as the .edmx file.
Thanks for pointing this out.