Revert "Testing new media structure"

This reverts commit f23e74bc9c3ab0b9deb825834ec10ed6e18c8758.