Consolidating application level files for MPI_dev