BVAL-373 Move ConvertGroup to groups subpackage