I was thinking that each file storage instance should have the context_id of the folder it creates set to its parent in the site map.
This doesn't have any relationship to where it physically sits in the folder hierarchy.
File storage needs a little rethinking, the original version wasn't subsite aware at all ...