Updated audio organization