Restructured the TMDB Service.