Merge "Reorganizing media code to follow recommended architecture" into main