Moved all media up into media/ and simplified classes
Merge pull request #3 from shakedown/maint/master/merge_media

Moved all media up into media/ and simplified classes