Refactoring

Moved playlist to separate class.