Creating an independent structure alongside the Media plugin, and some enhancements