re-structure for audio or video only builds