CLC-3339 Fold the Playlist and Youtube models into their proxy classes