Refactoring.

Just refactoring Content so it's aligns with Media better.