Fixed and trimmed caudio dependencies in project solution
Changed static members to instance