Move Rdio.m code in their more appropriate places