My system is to have one big texture and geometries runtime for all the new stuff, but I kept the old P4-7 folders unchanged. There is a bit of duplication but I figured it is easier when service releases come that expect things to live in the same place in the install directories.

I'll bite my tongue and won't say what I think about EF's wisdom on sticking with this system.