This gives us a better separation of concerns and it will make it a bit easier to move the sip independent media pieces out of the plugin in the mid to long term.
