Soundplayer refactoring / split