Massive revamp of users vs artist distinction