+1 for the separate MPI class. I can't find strong arguments for or against leaving it in Collage or moving it to Lunchbox. OpenMP and pthread is in Lunchbox, so it would more or less fit.