Move around some stuff. To better support Plex.