Refactor audio
Refactor graphics