Restructure; add fixaudio