Finalized basic audio classes
Merged