Add playlist and seperate classes into files