added audio and cleaned up some code. moved into folder