Made MediaFeature public, some refactoring
Started re-working URL parsing