Added All Songs album for each artist, refactoring