[DF-1970] SoundSystem Refactoring