Make audio work
Includes some reorganization and cleanup