Slight restructure of server/Playlist.java