Renamed files, added sound testing

Still untested