Makes managing decoding easier. Mac decoding moved to separate cvs module