Moved all media up into media/ and simplified classes