refactoring a bit around audio handling and application class organization