Change album and artist objets to directory object

It started failing without reason, so I changed it to directory object