encapsulate audio in a class, rename some files