Categorizing DJ's who remix other DJ's music?

So this is more of a "what would you do" kind of question, but if anyone happens to know an actual answer to this feel free to say! Basically I've got a ton of electronica music and when it comes to dj's who mix other dj's songs..I can't decide whether to put it in the original artists folder or into the dj's artist's folder. For example "Bob Sinclar - New New New (Avicci Remix)" would you put it under Bob Sinclar, or Avicci? (Like if I put it under Bob Sinclar I obviously would make a remixes folder).