Move Playlist and PlaylistEntity models back to main app