I'm thinking option 3 above is the (eventual) way to go. As long as we never put a `media` folder inside the existing `media` folder, it should be doable. Option 1 sounds the safest, but requires more work/extra mental step when using the helpers. Agree that option 2 sounds messy, and would probably be over-engineered.

I'll add the suggestions to the bug (https://bugzilla.mozilla.org/show_bug.cgi?id=911255).