Restructure media file inheritance

I think this is more idiomatic...