The way I always imagined an M16 map would be a lot more along the lines of Casino, a fairly large non-linear map consisting of linear-ish pathways that lead through key areas from the movies, like Bond's office, M's office, the couple hallways seen in the film, Q's lab, etc.