Move audio and video recording to same package