Media bundle refactor changes
Merge pull request #1 from linestorm/media

Media bundle refactor changes