Moving things into separate audio modules