diff --git a/ompi/mca/io/romio/Makefile.am b/ompi/mca/io/romio/Makefile.am index 4465ad7d90..6df1ba298a 100644 --- a/ompi/mca/io/romio/Makefile.am +++ b/ompi/mca/io/romio/Makefile.am @@ -21,7 +21,7 @@ include $(top_ompi_srcdir)/config/Makefile.options sources = include src/Makefile.extra -SUBDIRS = romio-dist +SUBDIRS = romio # Make the output library in this directory, and name it either # mca__.la (for DSO builds) or libmca__.la @@ -39,7 +39,7 @@ component = component_sources = endif -libs = romio-dist/libromio_dist.la +libs = romio/libromio_dist.la mcacomponentdir = $(libdir)/openmpi mcacomponent_LTLIBRARIES = $(component) diff --git a/ompi/mca/io/romio/autogen.subdirs b/ompi/mca/io/romio/autogen.subdirs index 010debedaa..4366870c93 100644 --- a/ompi/mca/io/romio/autogen.subdirs +++ b/ompi/mca/io/romio/autogen.subdirs @@ -1 +1 @@ -romio-dist +romio diff --git a/ompi/mca/io/romio/configure.m4 b/ompi/mca/io/romio/configure.m4 index 6ad3f49614..bfdf7b72ba 100644 --- a/ompi/mca/io/romio/configure.m4 +++ b/ompi/mca/io/romio/configure.m4 @@ -54,7 +54,7 @@ AC_DEFUN([MCA_io_romio_CONFIG],[ AC_CHECK_LIB(aio, main) ompi_show_subtitle "Configuring ROMIO distribution" - OMPI_CONFIG_SUBDIR([ompi/mca/io/romio/romio-dist], + OMPI_CONFIG_SUBDIR([ompi/mca/io/romio/romio], [$io_romio_flags], [io_romio_happy=1], [io_romio_happy=0]) diff --git a/ompi/mca/io/romio/romio-dist/.config_params b/ompi/mca/io/romio/romio/.config_params similarity index 100% rename from ompi/mca/io/romio/romio-dist/.config_params rename to ompi/mca/io/romio/romio/.config_params diff --git a/ompi/mca/io/romio/romio-dist/COPYRIGHT b/ompi/mca/io/romio/romio/COPYRIGHT similarity index 100% rename from ompi/mca/io/romio/romio-dist/COPYRIGHT rename to ompi/mca/io/romio/romio/COPYRIGHT diff --git a/ompi/mca/io/romio/romio-dist/Makefile.am b/ompi/mca/io/romio/romio/Makefile.am similarity index 100% rename from ompi/mca/io/romio/romio-dist/Makefile.am rename to ompi/mca/io/romio/romio/Makefile.am diff --git a/ompi/mca/io/romio/romio-dist/README b/ompi/mca/io/romio/romio/README similarity index 100% rename from ompi/mca/io/romio/romio-dist/README rename to ompi/mca/io/romio/romio/README diff --git a/ompi/mca/io/romio/romio-dist/README_OMPI b/ompi/mca/io/romio/romio/README_OMPI similarity index 100% rename from ompi/mca/io/romio/romio-dist/README_OMPI rename to ompi/mca/io/romio/romio/README_OMPI diff --git a/ompi/mca/io/romio/romio-dist/acinclude.m4 b/ompi/mca/io/romio/romio/acinclude.m4 similarity index 100% rename from ompi/mca/io/romio/romio-dist/acinclude.m4 rename to ompi/mca/io/romio/romio/acinclude.m4 diff --git a/ompi/mca/io/romio/romio-dist/adio/Makefile.am b/ompi/mca/io/romio/romio/adio/Makefile.am similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/Makefile.am rename to ompi/mca/io/romio/romio/adio/Makefile.am diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_hfs/Makefile.am b/ompi/mca/io/romio/romio/adio/ad_hfs/Makefile.am similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_hfs/Makefile.am rename to ompi/mca/io/romio/romio/adio/ad_hfs/Makefile.am diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs.c b/ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs.c rename to ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs.h b/ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs.h similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs.h rename to ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs.h diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_close.c b/ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_close.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_close.c rename to ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_close.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_done.c b/ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_done.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_done.c rename to ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_done.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_fcntl.c b/ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_fcntl.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_fcntl.c rename to ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_fcntl.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_flush.c b/ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_flush.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_flush.c rename to ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_flush.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_hints.c b/ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_hints.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_hints.c rename to ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_hints.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_iread.c b/ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_iread.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_iread.c rename to ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_iread.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_iwrite.c b/ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_iwrite.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_iwrite.c rename to ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_iwrite.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_open.c b/ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_open.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_open.c rename to ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_open.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_rdcoll.c b/ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_rdcoll.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_rdcoll.c rename to ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_rdcoll.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_read.c b/ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_read.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_read.c rename to ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_read.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_resize.c b/ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_resize.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_resize.c rename to ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_resize.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_seek.c b/ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_seek.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_seek.c rename to ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_seek.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_wait.c b/ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_wait.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_wait.c rename to ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_wait.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_wrcoll.c b/ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_wrcoll.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_wrcoll.c rename to ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_wrcoll.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_write.c b/ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_write.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_write.c rename to ompi/mca/io/romio/romio/adio/ad_hfs/ad_hfs_write.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_nfs/Makefile.am b/ompi/mca/io/romio/romio/adio/ad_nfs/Makefile.am similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_nfs/Makefile.am rename to ompi/mca/io/romio/romio/adio/ad_nfs/Makefile.am diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs.c b/ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs.c rename to ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs.h b/ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs.h similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs.h rename to ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs.h diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_close.c b/ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_close.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_close.c rename to ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_close.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_done.c b/ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_done.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_done.c rename to ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_done.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_fcntl.c b/ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_fcntl.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_fcntl.c rename to ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_fcntl.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_flush.c b/ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_flush.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_flush.c rename to ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_flush.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_getsh.c b/ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_getsh.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_getsh.c rename to ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_getsh.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_hints.c b/ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_hints.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_hints.c rename to ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_hints.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_iread.c b/ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_iread.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_iread.c rename to ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_iread.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_iwrite.c b/ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_iwrite.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_iwrite.c rename to ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_iwrite.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_open.c b/ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_open.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_open.c rename to ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_open.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_rdcoll.c b/ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_rdcoll.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_rdcoll.c rename to ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_rdcoll.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_read.c b/ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_read.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_read.c rename to ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_read.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_resize.c b/ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_resize.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_resize.c rename to ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_resize.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_seek.c b/ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_seek.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_seek.c rename to ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_seek.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_setsh.c b/ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_setsh.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_setsh.c rename to ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_setsh.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_wait.c b/ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_wait.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_wait.c rename to ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_wait.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_wrcoll.c b/ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_wrcoll.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_wrcoll.c rename to ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_wrcoll.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_write.c b/ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_write.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_write.c rename to ompi/mca/io/romio/romio/adio/ad_nfs/ad_nfs_write.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/Makefile.am b/ompi/mca/io/romio/romio/adio/ad_ntfs/Makefile.am similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ntfs/Makefile.am rename to ompi/mca/io/romio/romio/adio/ad_ntfs/Makefile.am diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs.c b/ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs.c rename to ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs.h b/ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs.h similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs.h rename to ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs.h diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_close.c b/ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_close.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_close.c rename to ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_close.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_done.c b/ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_done.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_done.c rename to ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_done.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_fcntl.c b/ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_fcntl.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_fcntl.c rename to ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_fcntl.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_flush.c b/ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_flush.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_flush.c rename to ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_flush.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_hints.c b/ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_hints.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_hints.c rename to ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_hints.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_iread.c b/ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_iread.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_iread.c rename to ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_iread.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_iwrite.c b/ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_iwrite.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_iwrite.c rename to ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_iwrite.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_open.c b/ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_open.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_open.c rename to ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_open.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_rdcoll.c b/ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_rdcoll.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_rdcoll.c rename to ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_rdcoll.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_read.c b/ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_read.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_read.c rename to ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_read.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_resize.c b/ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_resize.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_resize.c rename to ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_resize.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_seek.c b/ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_seek.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_seek.c rename to ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_seek.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_wait.c b/ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_wait.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_wait.c rename to ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_wait.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_wrcoll.c b/ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_wrcoll.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_wrcoll.c rename to ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_wrcoll.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_write.c b/ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_write.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_write.c rename to ompi/mca/io/romio/romio/adio/ad_ntfs/ad_ntfs_write.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pfs/Makefile.am b/ompi/mca/io/romio/romio/adio/ad_pfs/Makefile.am similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pfs/Makefile.am rename to ompi/mca/io/romio/romio/adio/ad_pfs/Makefile.am diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs.c b/ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs.c rename to ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs.h b/ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs.h similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs.h rename to ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs.h diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_close.c b/ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_close.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_close.c rename to ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_close.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_done.c b/ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_done.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_done.c rename to ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_done.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_fcntl.c b/ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_fcntl.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_fcntl.c rename to ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_fcntl.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_flush.c b/ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_flush.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_flush.c rename to ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_flush.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_hints.c b/ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_hints.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_hints.c rename to ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_hints.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_iread.c b/ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_iread.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_iread.c rename to ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_iread.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_iwrite.c b/ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_iwrite.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_iwrite.c rename to ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_iwrite.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_open.c b/ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_open.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_open.c rename to ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_open.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_rdcoll.c b/ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_rdcoll.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_rdcoll.c rename to ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_rdcoll.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_read.c b/ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_read.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_read.c rename to ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_read.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_resize.c b/ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_resize.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_resize.c rename to ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_resize.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_seek.c b/ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_seek.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_seek.c rename to ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_seek.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_wait.c b/ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_wait.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_wait.c rename to ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_wait.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_wrcoll.c b/ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_wrcoll.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_wrcoll.c rename to ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_wrcoll.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_write.c b/ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_write.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_write.c rename to ompi/mca/io/romio/romio/adio/ad_pfs/ad_pfs_write.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_piofs/Makefile.am b/ompi/mca/io/romio/romio/adio/ad_piofs/Makefile.am similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_piofs/Makefile.am rename to ompi/mca/io/romio/romio/adio/ad_piofs/Makefile.am diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs.c b/ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs.c rename to ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs.h b/ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs.h similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs.h rename to ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs.h diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_close.c b/ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_close.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_close.c rename to ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_close.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_done.c b/ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_done.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_done.c rename to ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_done.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_fcntl.c b/ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_fcntl.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_fcntl.c rename to ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_fcntl.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_flush.c b/ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_flush.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_flush.c rename to ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_flush.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_hints.c b/ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_hints.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_hints.c rename to ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_hints.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_iread.c b/ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_iread.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_iread.c rename to ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_iread.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_iwrite.c b/ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_iwrite.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_iwrite.c rename to ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_iwrite.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_open.c b/ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_open.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_open.c rename to ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_open.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_rdcoll.c b/ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_rdcoll.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_rdcoll.c rename to ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_rdcoll.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_read.c b/ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_read.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_read.c rename to ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_read.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_resize.c b/ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_resize.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_resize.c rename to ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_resize.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_seek.c b/ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_seek.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_seek.c rename to ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_seek.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_wait.c b/ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_wait.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_wait.c rename to ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_wait.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_wrcoll.c b/ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_wrcoll.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_wrcoll.c rename to ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_wrcoll.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_write.c b/ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_write.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_write.c rename to ompi/mca/io/romio/romio/adio/ad_piofs/ad_piofs_write.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/Makefile.am b/ompi/mca/io/romio/romio/adio/ad_pvfs/Makefile.am similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pvfs/Makefile.am rename to ompi/mca/io/romio/romio/adio/ad_pvfs/Makefile.am diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs.c b/ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs.c rename to ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs.h b/ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs.h similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs.h rename to ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs.h diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_close.c b/ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_close.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_close.c rename to ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_close.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_delete.c b/ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_delete.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_delete.c rename to ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_delete.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_done.c b/ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_done.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_done.c rename to ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_done.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_fcntl.c b/ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_fcntl.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_fcntl.c rename to ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_fcntl.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_flush.c b/ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_flush.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_flush.c rename to ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_flush.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_hints.c b/ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_hints.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_hints.c rename to ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_hints.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_iread.c b/ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_iread.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_iread.c rename to ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_iread.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_iwrite.c b/ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_iwrite.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_iwrite.c rename to ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_iwrite.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_open.c b/ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_open.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_open.c rename to ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_open.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_rdcoll.c b/ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_rdcoll.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_rdcoll.c rename to ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_rdcoll.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_read.c b/ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_read.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_read.c rename to ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_read.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_resize.c b/ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_resize.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_resize.c rename to ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_resize.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_seek.c b/ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_seek.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_seek.c rename to ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_seek.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_wait.c b/ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_wait.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_wait.c rename to ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_wait.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_wrcoll.c b/ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_wrcoll.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_wrcoll.c rename to ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_wrcoll.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_write.c b/ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_write.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_write.c rename to ompi/mca/io/romio/romio/adio/ad_pvfs/ad_pvfs_write.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_sfs/Makefile.am b/ompi/mca/io/romio/romio/adio/ad_sfs/Makefile.am similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_sfs/Makefile.am rename to ompi/mca/io/romio/romio/adio/ad_sfs/Makefile.am diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs.c b/ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs.c rename to ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs.h b/ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs.h similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs.h rename to ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs.h diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_close.c b/ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_close.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_close.c rename to ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_close.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_done.c b/ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_done.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_done.c rename to ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_done.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_fcntl.c b/ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_fcntl.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_fcntl.c rename to ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_fcntl.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_flush.c b/ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_flush.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_flush.c rename to ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_flush.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_hints.c b/ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_hints.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_hints.c rename to ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_hints.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_iread.c b/ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_iread.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_iread.c rename to ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_iread.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_iwrite.c b/ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_iwrite.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_iwrite.c rename to ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_iwrite.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_open.c b/ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_open.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_open.c rename to ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_open.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_rdcoll.c b/ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_rdcoll.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_rdcoll.c rename to ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_rdcoll.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_read.c b/ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_read.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_read.c rename to ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_read.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_resize.c b/ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_resize.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_resize.c rename to ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_resize.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_seek.c b/ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_seek.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_seek.c rename to ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_seek.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_wait.c b/ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_wait.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_wait.c rename to ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_wait.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_wrcoll.c b/ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_wrcoll.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_wrcoll.c rename to ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_wrcoll.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_write.c b/ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_write.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_write.c rename to ompi/mca/io/romio/romio/adio/ad_sfs/ad_sfs_write.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_testfs/Makefile.am b/ompi/mca/io/romio/romio/adio/ad_testfs/Makefile.am similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_testfs/Makefile.am rename to ompi/mca/io/romio/romio/adio/ad_testfs/Makefile.am diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs.c b/ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs.c rename to ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs.h b/ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs.h similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs.h rename to ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs.h diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_close.c b/ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_close.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_close.c rename to ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_close.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_delete.c b/ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_delete.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_delete.c rename to ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_delete.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_done.c b/ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_done.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_done.c rename to ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_done.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_fcntl.c b/ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_fcntl.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_fcntl.c rename to ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_fcntl.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_flush.c b/ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_flush.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_flush.c rename to ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_flush.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_getsh.c b/ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_getsh.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_getsh.c rename to ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_getsh.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_hints.c b/ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_hints.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_hints.c rename to ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_hints.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_iread.c b/ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_iread.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_iread.c rename to ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_iread.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_iwrite.c b/ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_iwrite.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_iwrite.c rename to ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_iwrite.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_open.c b/ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_open.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_open.c rename to ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_open.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_rdcoll.c b/ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_rdcoll.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_rdcoll.c rename to ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_rdcoll.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_read.c b/ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_read.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_read.c rename to ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_read.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_resize.c b/ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_resize.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_resize.c rename to ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_resize.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_seek.c b/ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_seek.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_seek.c rename to ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_seek.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_setsh.c b/ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_setsh.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_setsh.c rename to ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_setsh.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_wait.c b/ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_wait.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_wait.c rename to ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_wait.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_wrcoll.c b/ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_wrcoll.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_wrcoll.c rename to ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_wrcoll.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_write.c b/ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_write.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_write.c rename to ompi/mca/io/romio/romio/adio/ad_testfs/ad_testfs_write.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ufs/Makefile.am b/ompi/mca/io/romio/romio/adio/ad_ufs/Makefile.am similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ufs/Makefile.am rename to ompi/mca/io/romio/romio/adio/ad_ufs/Makefile.am diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs.c b/ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs.c rename to ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs.h b/ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs.h similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs.h rename to ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs.h diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_close.c b/ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_close.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_close.c rename to ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_close.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_done.c b/ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_done.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_done.c rename to ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_done.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_fcntl.c b/ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_fcntl.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_fcntl.c rename to ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_fcntl.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_flush.c b/ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_flush.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_flush.c rename to ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_flush.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_hints.c b/ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_hints.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_hints.c rename to ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_hints.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_iread.c b/ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_iread.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_iread.c rename to ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_iread.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_iwrite.c b/ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_iwrite.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_iwrite.c rename to ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_iwrite.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_open.c b/ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_open.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_open.c rename to ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_open.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_rdcoll.c b/ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_rdcoll.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_rdcoll.c rename to ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_rdcoll.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_read.c b/ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_read.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_read.c rename to ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_read.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_resize.c b/ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_resize.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_resize.c rename to ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_resize.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_seek.c b/ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_seek.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_seek.c rename to ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_seek.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_wait.c b/ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_wait.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_wait.c rename to ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_wait.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_wrcoll.c b/ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_wrcoll.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_wrcoll.c rename to ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_wrcoll.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_write.c b/ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_write.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_write.c rename to ompi/mca/io/romio/romio/adio/ad_ufs/ad_ufs_write.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_xfs/Makefile.am b/ompi/mca/io/romio/romio/adio/ad_xfs/Makefile.am similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_xfs/Makefile.am rename to ompi/mca/io/romio/romio/adio/ad_xfs/Makefile.am diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs.c b/ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs.c rename to ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs.h b/ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs.h similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs.h rename to ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs.h diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_close.c b/ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_close.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_close.c rename to ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_close.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_done.c b/ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_done.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_done.c rename to ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_done.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_fcntl.c b/ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_fcntl.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_fcntl.c rename to ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_fcntl.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_flush.c b/ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_flush.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_flush.c rename to ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_flush.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_hints.c b/ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_hints.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_hints.c rename to ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_hints.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_iread.c b/ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_iread.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_iread.c rename to ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_iread.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_iwrite.c b/ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_iwrite.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_iwrite.c rename to ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_iwrite.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_open.c b/ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_open.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_open.c rename to ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_open.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_rdcoll.c b/ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_rdcoll.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_rdcoll.c rename to ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_rdcoll.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_read.c b/ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_read.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_read.c rename to ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_read.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_resize.c b/ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_resize.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_resize.c rename to ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_resize.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_seek.c b/ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_seek.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_seek.c rename to ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_seek.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_wait.c b/ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_wait.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_wait.c rename to ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_wait.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_wrcoll.c b/ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_wrcoll.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_wrcoll.c rename to ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_wrcoll.c diff --git a/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_write.c b/ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_write.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_write.c rename to ompi/mca/io/romio/romio/adio/ad_xfs/ad_xfs_write.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/Makefile.am b/ompi/mca/io/romio/romio/adio/common/Makefile.am similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/Makefile.am rename to ompi/mca/io/romio/romio/adio/common/Makefile.am diff --git a/ompi/mca/io/romio/romio-dist/adio/common/ad_aggregate.c b/ompi/mca/io/romio/romio/adio/common/ad_aggregate.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/ad_aggregate.c rename to ompi/mca/io/romio/romio/adio/common/ad_aggregate.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/ad_close.c b/ompi/mca/io/romio/romio/adio/common/ad_close.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/ad_close.c rename to ompi/mca/io/romio/romio/adio/common/ad_close.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/ad_delete.c b/ompi/mca/io/romio/romio/adio/common/ad_delete.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/ad_delete.c rename to ompi/mca/io/romio/romio/adio/common/ad_delete.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/ad_end.c b/ompi/mca/io/romio/romio/adio/common/ad_end.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/ad_end.c rename to ompi/mca/io/romio/romio/adio/common/ad_end.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/ad_flush.c b/ompi/mca/io/romio/romio/adio/common/ad_flush.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/ad_flush.c rename to ompi/mca/io/romio/romio/adio/common/ad_flush.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/ad_fstype.c b/ompi/mca/io/romio/romio/adio/common/ad_fstype.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/ad_fstype.c rename to ompi/mca/io/romio/romio/adio/common/ad_fstype.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/ad_get_sh_fp.c b/ompi/mca/io/romio/romio/adio/common/ad_get_sh_fp.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/ad_get_sh_fp.c rename to ompi/mca/io/romio/romio/adio/common/ad_get_sh_fp.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/ad_hints.c b/ompi/mca/io/romio/romio/adio/common/ad_hints.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/ad_hints.c rename to ompi/mca/io/romio/romio/adio/common/ad_hints.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/ad_init.c b/ompi/mca/io/romio/romio/adio/common/ad_init.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/ad_init.c rename to ompi/mca/io/romio/romio/adio/common/ad_init.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/ad_open.c b/ompi/mca/io/romio/romio/adio/common/ad_open.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/ad_open.c rename to ompi/mca/io/romio/romio/adio/common/ad_open.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/ad_read_coll.c b/ompi/mca/io/romio/romio/adio/common/ad_read_coll.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/ad_read_coll.c rename to ompi/mca/io/romio/romio/adio/common/ad_read_coll.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/ad_read_str.c b/ompi/mca/io/romio/romio/adio/common/ad_read_str.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/ad_read_str.c rename to ompi/mca/io/romio/romio/adio/common/ad_read_str.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/ad_read_str_naive.c b/ompi/mca/io/romio/romio/adio/common/ad_read_str_naive.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/ad_read_str_naive.c rename to ompi/mca/io/romio/romio/adio/common/ad_read_str_naive.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/ad_seek.c b/ompi/mca/io/romio/romio/adio/common/ad_seek.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/ad_seek.c rename to ompi/mca/io/romio/romio/adio/common/ad_seek.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/ad_set_sh_fp.c b/ompi/mca/io/romio/romio/adio/common/ad_set_sh_fp.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/ad_set_sh_fp.c rename to ompi/mca/io/romio/romio/adio/common/ad_set_sh_fp.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/ad_set_view.c b/ompi/mca/io/romio/romio/adio/common/ad_set_view.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/ad_set_view.c rename to ompi/mca/io/romio/romio/adio/common/ad_set_view.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/ad_write_coll.c b/ompi/mca/io/romio/romio/adio/common/ad_write_coll.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/ad_write_coll.c rename to ompi/mca/io/romio/romio/adio/common/ad_write_coll.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/ad_write_str.c b/ompi/mca/io/romio/romio/adio/common/ad_write_str.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/ad_write_str.c rename to ompi/mca/io/romio/romio/adio/common/ad_write_str.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/async_list.c b/ompi/mca/io/romio/romio/adio/common/async_list.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/async_list.c rename to ompi/mca/io/romio/romio/adio/common/async_list.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/byte_offset.c b/ompi/mca/io/romio/romio/adio/common/byte_offset.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/byte_offset.c rename to ompi/mca/io/romio/romio/adio/common/byte_offset.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/cb_config_list.c b/ompi/mca/io/romio/romio/adio/common/cb_config_list.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/cb_config_list.c rename to ompi/mca/io/romio/romio/adio/common/cb_config_list.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/eof_offset.c b/ompi/mca/io/romio/romio/adio/common/eof_offset.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/eof_offset.c rename to ompi/mca/io/romio/romio/adio/common/eof_offset.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/error.c b/ompi/mca/io/romio/romio/adio/common/error.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/error.c rename to ompi/mca/io/romio/romio/adio/common/error.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/flatten.c b/ompi/mca/io/romio/romio/adio/common/flatten.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/flatten.c rename to ompi/mca/io/romio/romio/adio/common/flatten.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/gencheck.c b/ompi/mca/io/romio/romio/adio/common/gencheck.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/gencheck.c rename to ompi/mca/io/romio/romio/adio/common/gencheck.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/get_fp_posn.c b/ompi/mca/io/romio/romio/adio/common/get_fp_posn.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/get_fp_posn.c rename to ompi/mca/io/romio/romio/adio/common/get_fp_posn.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/iscontig.c b/ompi/mca/io/romio/romio/adio/common/iscontig.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/iscontig.c rename to ompi/mca/io/romio/romio/adio/common/iscontig.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/lock.c b/ompi/mca/io/romio/romio/adio/common/lock.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/lock.c rename to ompi/mca/io/romio/romio/adio/common/lock.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/malloc.c b/ompi/mca/io/romio/romio/adio/common/malloc.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/malloc.c rename to ompi/mca/io/romio/romio/adio/common/malloc.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/req_malloc.c b/ompi/mca/io/romio/romio/adio/common/req_malloc.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/req_malloc.c rename to ompi/mca/io/romio/romio/adio/common/req_malloc.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/setfn.c b/ompi/mca/io/romio/romio/adio/common/setfn.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/setfn.c rename to ompi/mca/io/romio/romio/adio/common/setfn.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/shfp_fname.c b/ompi/mca/io/romio/romio/adio/common/shfp_fname.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/shfp_fname.c rename to ompi/mca/io/romio/romio/adio/common/shfp_fname.c diff --git a/ompi/mca/io/romio/romio-dist/adio/common/status_setb.c b/ompi/mca/io/romio/romio/adio/common/status_setb.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/common/status_setb.c rename to ompi/mca/io/romio/romio/adio/common/status_setb.c diff --git a/ompi/mca/io/romio/romio-dist/adio/include/BaseIOErrMsgs.msg b/ompi/mca/io/romio/romio/adio/include/BaseIOErrMsgs.msg similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/include/BaseIOErrMsgs.msg rename to ompi/mca/io/romio/romio/adio/include/BaseIOErrMsgs.msg diff --git a/ompi/mca/io/romio/romio-dist/adio/include/Makefile.am b/ompi/mca/io/romio/romio/adio/include/Makefile.am similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/include/Makefile.am rename to ompi/mca/io/romio/romio/adio/include/Makefile.am diff --git a/ompi/mca/io/romio/romio-dist/adio/include/adio.h b/ompi/mca/io/romio/romio/adio/include/adio.h similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/include/adio.h rename to ompi/mca/io/romio/romio/adio/include/adio.h diff --git a/ompi/mca/io/romio/romio-dist/adio/include/adio_cb_config_list.h b/ompi/mca/io/romio/romio/adio/include/adio_cb_config_list.h similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/include/adio_cb_config_list.h rename to ompi/mca/io/romio/romio/adio/include/adio_cb_config_list.h diff --git a/ompi/mca/io/romio/romio-dist/adio/include/adio_extern.h b/ompi/mca/io/romio/romio/adio/include/adio_extern.h similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/include/adio_extern.h rename to ompi/mca/io/romio/romio/adio/include/adio_extern.h diff --git a/ompi/mca/io/romio/romio-dist/adio/include/adioi.h b/ompi/mca/io/romio/romio/adio/include/adioi.h similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/include/adioi.h rename to ompi/mca/io/romio/romio/adio/include/adioi.h diff --git a/ompi/mca/io/romio/romio-dist/adio/include/adioi_errmsg.h b/ompi/mca/io/romio/romio/adio/include/adioi_errmsg.h similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/include/adioi_errmsg.h rename to ompi/mca/io/romio/romio/adio/include/adioi_errmsg.h diff --git a/ompi/mca/io/romio/romio-dist/adio/include/adioi_error.h b/ompi/mca/io/romio/romio/adio/include/adioi_error.h similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/include/adioi_error.h rename to ompi/mca/io/romio/romio/adio/include/adioi_error.h diff --git a/ompi/mca/io/romio/romio-dist/adio/include/adioi_fs_proto.h b/ompi/mca/io/romio/romio/adio/include/adioi_fs_proto.h similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/include/adioi_fs_proto.h rename to ompi/mca/io/romio/romio/adio/include/adioi_fs_proto.h diff --git a/ompi/mca/io/romio/romio-dist/adio/include/io_adio_conv.h b/ompi/mca/io/romio/romio/adio/include/io_adio_conv.h similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/include/io_adio_conv.h rename to ompi/mca/io/romio/romio/adio/include/io_adio_conv.h diff --git a/ompi/mca/io/romio/romio-dist/adio/include/mpio_error.h b/ompi/mca/io/romio/romio/adio/include/mpio_error.h similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/include/mpio_error.h rename to ompi/mca/io/romio/romio/adio/include/mpio_error.h diff --git a/ompi/mca/io/romio/romio-dist/adio/include/mpipr.h b/ompi/mca/io/romio/romio/adio/include/mpipr.h similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/include/mpipr.h rename to ompi/mca/io/romio/romio/adio/include/mpipr.h diff --git a/ompi/mca/io/romio/romio-dist/adio/include/mpisgi2.h b/ompi/mca/io/romio/romio/adio/include/mpisgi2.h similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/include/mpisgi2.h rename to ompi/mca/io/romio/romio/adio/include/mpisgi2.h diff --git a/ompi/mca/io/romio/romio-dist/adio/include/romioconf.h.in b/ompi/mca/io/romio/romio/adio/include/romioconf.h.in similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/include/romioconf.h.in rename to ompi/mca/io/romio/romio/adio/include/romioconf.h.in diff --git a/ompi/mca/io/romio/romio-dist/adio/sgi/mpi3.1/mpi.h b/ompi/mca/io/romio/romio/adio/sgi/mpi3.1/mpi.h similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/sgi/mpi3.1/mpi.h rename to ompi/mca/io/romio/romio/adio/sgi/mpi3.1/mpi.h diff --git a/ompi/mca/io/romio/romio-dist/adio/sgi/mpi3.1/mpif.h b/ompi/mca/io/romio/romio/adio/sgi/mpi3.1/mpif.h similarity index 100% rename from ompi/mca/io/romio/romio-dist/adio/sgi/mpi3.1/mpif.h rename to ompi/mca/io/romio/romio/adio/sgi/mpi3.1/mpif.h diff --git a/ompi/mca/io/romio/romio-dist/configure.in b/ompi/mca/io/romio/romio/configure.in similarity index 100% rename from ompi/mca/io/romio/romio-dist/configure.in rename to ompi/mca/io/romio/romio/configure.in diff --git a/ompi/mca/io/romio/romio-dist/configure2.in b/ompi/mca/io/romio/romio/configure2.in similarity index 100% rename from ompi/mca/io/romio/romio-dist/configure2.in rename to ompi/mca/io/romio/romio/configure2.in diff --git a/ompi/mca/io/romio/romio-dist/doc/Makefile.am b/ompi/mca/io/romio/romio/doc/Makefile.am similarity index 100% rename from ompi/mca/io/romio/romio-dist/doc/Makefile.am rename to ompi/mca/io/romio/romio/doc/Makefile.am diff --git a/ompi/mca/io/romio/romio-dist/doc/README b/ompi/mca/io/romio/romio/doc/README similarity index 100% rename from ompi/mca/io/romio/romio-dist/doc/README rename to ompi/mca/io/romio/romio/doc/README diff --git a/ompi/mca/io/romio/romio-dist/doc/users-guide.bbl b/ompi/mca/io/romio/romio/doc/users-guide.bbl similarity index 100% rename from ompi/mca/io/romio/romio-dist/doc/users-guide.bbl rename to ompi/mca/io/romio/romio/doc/users-guide.bbl diff --git a/ompi/mca/io/romio/romio-dist/doc/users-guide.ps.gz b/ompi/mca/io/romio/romio/doc/users-guide.ps.gz similarity index 100% rename from ompi/mca/io/romio/romio-dist/doc/users-guide.ps.gz rename to ompi/mca/io/romio/romio/doc/users-guide.ps.gz diff --git a/ompi/mca/io/romio/romio-dist/doc/users-guide.tex b/ompi/mca/io/romio/romio/doc/users-guide.tex similarity index 100% rename from ompi/mca/io/romio/romio-dist/doc/users-guide.tex rename to ompi/mca/io/romio/romio/doc/users-guide.tex diff --git a/ompi/mca/io/romio/romio-dist/include/Makefile.am b/ompi/mca/io/romio/romio/include/Makefile.am similarity index 100% rename from ompi/mca/io/romio/romio-dist/include/Makefile.am rename to ompi/mca/io/romio/romio/include/Makefile.am diff --git a/ompi/mca/io/romio/romio-dist/include/io_romio_conv.h b/ompi/mca/io/romio/romio/include/io_romio_conv.h similarity index 100% rename from ompi/mca/io/romio/romio-dist/include/io_romio_conv.h rename to ompi/mca/io/romio/romio/include/io_romio_conv.h diff --git a/ompi/mca/io/romio/romio-dist/include/mpio.h.in b/ompi/mca/io/romio/romio/include/mpio.h.in similarity index 100% rename from ompi/mca/io/romio/romio-dist/include/mpio.h.in rename to ompi/mca/io/romio/romio/include/mpio.h.in diff --git a/ompi/mca/io/romio/romio-dist/include/mpiof.h.in b/ompi/mca/io/romio/romio/include/mpiof.h.in similarity index 100% rename from ompi/mca/io/romio/romio-dist/include/mpiof.h.in rename to ompi/mca/io/romio/romio/include/mpiof.h.in diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPIO_Request_c2f.3 b/ompi/mca/io/romio/romio/man/man3/MPIO_Request_c2f.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPIO_Request_c2f.3 rename to ompi/mca/io/romio/romio/man/man3/MPIO_Request_c2f.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPIO_Request_f2c.3 b/ompi/mca/io/romio/romio/man/man3/MPIO_Request_f2c.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPIO_Request_f2c.3 rename to ompi/mca/io/romio/romio/man/man3/MPIO_Request_f2c.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPIO_Test.3 b/ompi/mca/io/romio/romio/man/man3/MPIO_Test.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPIO_Test.3 rename to ompi/mca/io/romio/romio/man/man3/MPIO_Test.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPIO_Wait.3 b/ompi/mca/io/romio/romio/man/man3/MPIO_Wait.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPIO_Wait.3 rename to ompi/mca/io/romio/romio/man/man3/MPIO_Wait.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_c2f.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_c2f.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_c2f.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_c2f.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_close.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_close.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_close.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_close.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_delete.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_delete.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_delete.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_delete.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_f2c.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_f2c.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_f2c.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_f2c.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_amode.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_get_amode.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_amode.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_get_amode.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_atomicity.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_get_atomicity.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_atomicity.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_get_atomicity.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_byte_offset.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_get_byte_offset.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_byte_offset.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_get_byte_offset.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_group.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_get_group.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_group.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_get_group.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_info.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_get_info.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_info.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_get_info.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_position.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_get_position.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_position.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_get_position.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_position_shared.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_get_position_shared.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_position_shared.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_get_position_shared.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_size.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_get_size.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_size.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_get_size.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_type_extent.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_get_type_extent.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_type_extent.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_get_type_extent.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_view.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_get_view.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_view.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_get_view.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_iread.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_iread.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_iread.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_iread.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_iread_at.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_iread_at.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_iread_at.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_iread_at.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_iread_shared.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_iread_shared.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_iread_shared.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_iread_shared.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_iwrite.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_iwrite.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_iwrite.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_iwrite.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_iwrite_at.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_iwrite_at.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_iwrite_at.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_iwrite_at.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_iwrite_shared.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_iwrite_shared.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_iwrite_shared.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_iwrite_shared.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_open.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_open.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_open.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_open.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_preallocate.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_preallocate.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_preallocate.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_preallocate.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_read.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_read.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_all.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_read_all.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_all.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_read_all.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_all_begin.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_read_all_begin.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_all_begin.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_read_all_begin.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_all_end.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_read_all_end.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_all_end.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_read_all_end.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_at.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_read_at.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_at.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_read_at.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_at_all.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_read_at_all.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_at_all.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_read_at_all.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_at_all_begin.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_read_at_all_begin.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_at_all_begin.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_read_at_all_begin.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_at_all_end.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_read_at_all_end.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_at_all_end.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_read_at_all_end.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_ordered.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_read_ordered.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_ordered.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_read_ordered.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_ordered_begin.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_read_ordered_begin.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_ordered_begin.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_read_ordered_begin.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_ordered_end.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_read_ordered_end.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_ordered_end.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_read_ordered_end.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_shared.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_read_shared.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_shared.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_read_shared.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_seek.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_seek.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_seek.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_seek.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_seek_shared.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_seek_shared.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_seek_shared.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_seek_shared.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_set_atomicity.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_set_atomicity.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_set_atomicity.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_set_atomicity.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_set_info.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_set_info.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_set_info.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_set_info.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_set_size.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_set_size.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_set_size.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_set_size.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_set_view.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_set_view.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_set_view.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_set_view.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_sync.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_sync.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_sync.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_sync.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_write.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_write.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_all.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_write_all.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_all.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_write_all.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_all_begin.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_write_all_begin.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_all_begin.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_write_all_begin.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_all_end.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_write_all_end.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_all_end.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_write_all_end.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_at.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_write_at.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_at.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_write_at.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_at_all.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_write_at_all.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_at_all.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_write_at_all.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_at_all_begin.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_write_at_all_begin.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_at_all_begin.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_write_at_all_begin.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_at_all_end.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_write_at_all_end.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_at_all_end.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_write_at_all_end.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_ordered.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_write_ordered.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_ordered.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_write_ordered.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_ordered_begin.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_write_ordered_begin.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_ordered_begin.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_write_ordered_begin.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_ordered_end.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_write_ordered_end.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_ordered_end.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_write_ordered_end.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_shared.3 b/ompi/mca/io/romio/romio/man/man3/MPI_File_write_shared.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_shared.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_File_write_shared.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_c2f.3 b/ompi/mca/io/romio/romio/man/man3/MPI_Info_c2f.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_c2f.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_Info_c2f.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_create.3 b/ompi/mca/io/romio/romio/man/man3/MPI_Info_create.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_create.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_Info_create.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_delete.3 b/ompi/mca/io/romio/romio/man/man3/MPI_Info_delete.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_delete.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_Info_delete.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_dup.3 b/ompi/mca/io/romio/romio/man/man3/MPI_Info_dup.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_dup.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_Info_dup.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_f2c.3 b/ompi/mca/io/romio/romio/man/man3/MPI_Info_f2c.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_f2c.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_Info_f2c.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_free.3 b/ompi/mca/io/romio/romio/man/man3/MPI_Info_free.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_free.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_Info_free.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_get.3 b/ompi/mca/io/romio/romio/man/man3/MPI_Info_get.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_get.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_Info_get.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_get_nkeys.3 b/ompi/mca/io/romio/romio/man/man3/MPI_Info_get_nkeys.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_get_nkeys.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_Info_get_nkeys.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_get_nthkey.3 b/ompi/mca/io/romio/romio/man/man3/MPI_Info_get_nthkey.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_get_nthkey.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_Info_get_nthkey.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_get_valuelen.3 b/ompi/mca/io/romio/romio/man/man3/MPI_Info_get_valuelen.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_get_valuelen.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_Info_get_valuelen.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_set.3 b/ompi/mca/io/romio/romio/man/man3/MPI_Info_set.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_set.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_Info_set.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_Type_create_darray.3 b/ompi/mca/io/romio/romio/man/man3/MPI_Type_create_darray.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_Type_create_darray.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_Type_create_darray.3 diff --git a/ompi/mca/io/romio/romio-dist/man/man3/MPI_Type_create_subarray.3 b/ompi/mca/io/romio/romio/man/man3/MPI_Type_create_subarray.3 similarity index 100% rename from ompi/mca/io/romio/romio-dist/man/man3/MPI_Type_create_subarray.3 rename to ompi/mca/io/romio/romio/man/man3/MPI_Type_create_subarray.3 diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/Makefile.am b/ompi/mca/io/romio/romio/mpi-io/Makefile.am similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/Makefile.am rename to ompi/mca/io/romio/romio/mpi-io/Makefile.am diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/close.c b/ompi/mca/io/romio/romio/mpi-io/close.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/close.c rename to ompi/mca/io/romio/romio/mpi-io/close.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/delete.c b/ompi/mca/io/romio/romio/mpi-io/delete.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/delete.c rename to ompi/mca/io/romio/romio/mpi-io/delete.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/file_c2f.c b/ompi/mca/io/romio/romio/mpi-io/file_c2f.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/file_c2f.c rename to ompi/mca/io/romio/romio/mpi-io/file_c2f.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/file_f2c.c b/ompi/mca/io/romio/romio/mpi-io/file_f2c.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/file_f2c.c rename to ompi/mca/io/romio/romio/mpi-io/file_f2c.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/Makefile.in b/ompi/mca/io/romio/romio/mpi-io/fortran/Makefile.in similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/Makefile.in rename to ompi/mca/io/romio/romio/mpi-io/fortran/Makefile.in diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/closef.c b/ompi/mca/io/romio/romio/mpi-io/fortran/closef.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/closef.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/closef.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/deletef.c b/ompi/mca/io/romio/romio/mpi-io/fortran/deletef.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/deletef.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/deletef.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/fsyncf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/fsyncf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/fsyncf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/fsyncf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_amodef.c b/ompi/mca/io/romio/romio/mpi-io/fortran/get_amodef.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_amodef.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/get_amodef.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_atomf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/get_atomf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_atomf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/get_atomf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_bytofff.c b/ompi/mca/io/romio/romio/mpi-io/fortran/get_bytofff.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_bytofff.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/get_bytofff.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_errhf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/get_errhf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_errhf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/get_errhf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_extentf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/get_extentf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_extentf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/get_extentf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_groupf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/get_groupf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_groupf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/get_groupf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_infof.c b/ompi/mca/io/romio/romio/mpi-io/fortran/get_infof.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_infof.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/get_infof.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_posn_shf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/get_posn_shf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_posn_shf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/get_posn_shf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_posnf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/get_posnf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_posnf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/get_posnf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_sizef.c b/ompi/mca/io/romio/romio/mpi-io/fortran/get_sizef.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_sizef.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/get_sizef.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_viewf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/get_viewf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_viewf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/get_viewf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/iotestf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/iotestf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/iotestf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/iotestf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/iowaitf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/iowaitf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/iowaitf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/iowaitf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/iread_atf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/iread_atf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/iread_atf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/iread_atf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/iread_shf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/iread_shf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/iread_shf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/iread_shf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/ireadf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/ireadf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/ireadf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/ireadf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/iwrite_atf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/iwrite_atf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/iwrite_atf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/iwrite_atf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/iwrite_shf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/iwrite_shf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/iwrite_shf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/iwrite_shf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/iwritef.c b/ompi/mca/io/romio/romio/mpi-io/fortran/iwritef.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/iwritef.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/iwritef.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/openf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/openf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/openf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/openf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/preallocf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/preallocf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/preallocf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/preallocf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/rd_atallbf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/rd_atallbf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/rd_atallbf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/rd_atallbf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/rd_atallef.c b/ompi/mca/io/romio/romio/mpi-io/fortran/rd_atallef.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/rd_atallef.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/rd_atallef.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_allbf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/read_allbf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_allbf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/read_allbf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_allef.c b/ompi/mca/io/romio/romio/mpi-io/fortran/read_allef.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_allef.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/read_allef.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_allf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/read_allf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_allf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/read_allf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_atallf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/read_atallf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_atallf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/read_atallf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_atf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/read_atf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_atf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/read_atf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_ordbf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/read_ordbf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_ordbf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/read_ordbf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_ordef.c b/ompi/mca/io/romio/romio/mpi-io/fortran/read_ordef.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_ordef.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/read_ordef.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_ordf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/read_ordf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_ordf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/read_ordf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_shf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/read_shf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_shf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/read_shf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/readf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/readf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/readf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/readf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/seek_shf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/seek_shf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/seek_shf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/seek_shf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/seekf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/seekf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/seekf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/seekf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/set_atomf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/set_atomf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/set_atomf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/set_atomf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/set_errhf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/set_errhf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/set_errhf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/set_errhf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/set_infof.c b/ompi/mca/io/romio/romio/mpi-io/fortran/set_infof.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/set_infof.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/set_infof.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/set_sizef.c b/ompi/mca/io/romio/romio/mpi-io/fortran/set_sizef.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/set_sizef.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/set_sizef.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/set_viewf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/set_viewf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/set_viewf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/set_viewf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/wr_atallbf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/wr_atallbf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/wr_atallbf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/wr_atallbf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/wr_atallef.c b/ompi/mca/io/romio/romio/mpi-io/fortran/wr_atallef.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/wr_atallef.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/wr_atallef.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_allbf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/write_allbf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_allbf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/write_allbf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_allef.c b/ompi/mca/io/romio/romio/mpi-io/fortran/write_allef.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_allef.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/write_allef.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_allf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/write_allf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_allf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/write_allf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_atallf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/write_atallf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_atallf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/write_atallf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_atf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/write_atf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_atf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/write_atf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_ordbf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/write_ordbf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_ordbf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/write_ordbf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_ordef.c b/ompi/mca/io/romio/romio/mpi-io/fortran/write_ordef.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_ordef.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/write_ordef.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_ordf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/write_ordf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_ordf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/write_ordf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_shf.c b/ompi/mca/io/romio/romio/mpi-io/fortran/write_shf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_shf.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/write_shf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fortran/writef.c b/ompi/mca/io/romio/romio/mpi-io/fortran/writef.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fortran/writef.c rename to ompi/mca/io/romio/romio/mpi-io/fortran/writef.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/fsync.c b/ompi/mca/io/romio/romio/mpi-io/fsync.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/fsync.c rename to ompi/mca/io/romio/romio/mpi-io/fsync.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/get_amode.c b/ompi/mca/io/romio/romio/mpi-io/get_amode.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/get_amode.c rename to ompi/mca/io/romio/romio/mpi-io/get_amode.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/get_atom.c b/ompi/mca/io/romio/romio/mpi-io/get_atom.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/get_atom.c rename to ompi/mca/io/romio/romio/mpi-io/get_atom.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/get_bytoff.c b/ompi/mca/io/romio/romio/mpi-io/get_bytoff.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/get_bytoff.c rename to ompi/mca/io/romio/romio/mpi-io/get_bytoff.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/get_errh.c b/ompi/mca/io/romio/romio/mpi-io/get_errh.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/get_errh.c rename to ompi/mca/io/romio/romio/mpi-io/get_errh.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/get_extent.c b/ompi/mca/io/romio/romio/mpi-io/get_extent.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/get_extent.c rename to ompi/mca/io/romio/romio/mpi-io/get_extent.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/get_group.c b/ompi/mca/io/romio/romio/mpi-io/get_group.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/get_group.c rename to ompi/mca/io/romio/romio/mpi-io/get_group.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/get_info.c b/ompi/mca/io/romio/romio/mpi-io/get_info.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/get_info.c rename to ompi/mca/io/romio/romio/mpi-io/get_info.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/get_posn.c b/ompi/mca/io/romio/romio/mpi-io/get_posn.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/get_posn.c rename to ompi/mca/io/romio/romio/mpi-io/get_posn.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/get_posn_sh.c b/ompi/mca/io/romio/romio/mpi-io/get_posn_sh.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/get_posn_sh.c rename to ompi/mca/io/romio/romio/mpi-io/get_posn_sh.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/get_size.c b/ompi/mca/io/romio/romio/mpi-io/get_size.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/get_size.c rename to ompi/mca/io/romio/romio/mpi-io/get_size.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/get_view.c b/ompi/mca/io/romio/romio/mpi-io/get_view.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/get_view.c rename to ompi/mca/io/romio/romio/mpi-io/get_view.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/ioreq_c2f.c b/ompi/mca/io/romio/romio/mpi-io/ioreq_c2f.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/ioreq_c2f.c rename to ompi/mca/io/romio/romio/mpi-io/ioreq_c2f.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/ioreq_f2c.c b/ompi/mca/io/romio/romio/mpi-io/ioreq_f2c.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/ioreq_f2c.c rename to ompi/mca/io/romio/romio/mpi-io/ioreq_f2c.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/iotest.c b/ompi/mca/io/romio/romio/mpi-io/iotest.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/iotest.c rename to ompi/mca/io/romio/romio/mpi-io/iotest.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/iowait.c b/ompi/mca/io/romio/romio/mpi-io/iowait.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/iowait.c rename to ompi/mca/io/romio/romio/mpi-io/iowait.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/iread.c b/ompi/mca/io/romio/romio/mpi-io/iread.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/iread.c rename to ompi/mca/io/romio/romio/mpi-io/iread.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/iread_at.c b/ompi/mca/io/romio/romio/mpi-io/iread_at.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/iread_at.c rename to ompi/mca/io/romio/romio/mpi-io/iread_at.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/iread_sh.c b/ompi/mca/io/romio/romio/mpi-io/iread_sh.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/iread_sh.c rename to ompi/mca/io/romio/romio/mpi-io/iread_sh.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/iwrite.c b/ompi/mca/io/romio/romio/mpi-io/iwrite.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/iwrite.c rename to ompi/mca/io/romio/romio/mpi-io/iwrite.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/iwrite_at.c b/ompi/mca/io/romio/romio/mpi-io/iwrite_at.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/iwrite_at.c rename to ompi/mca/io/romio/romio/mpi-io/iwrite_at.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/iwrite_sh.c b/ompi/mca/io/romio/romio/mpi-io/iwrite_sh.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/iwrite_sh.c rename to ompi/mca/io/romio/romio/mpi-io/iwrite_sh.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/mpioimpl.h b/ompi/mca/io/romio/romio/mpi-io/mpioimpl.h similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/mpioimpl.h rename to ompi/mca/io/romio/romio/mpi-io/mpioimpl.h diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/mpioprof.h b/ompi/mca/io/romio/romio/mpi-io/mpioprof.h similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/mpioprof.h rename to ompi/mca/io/romio/romio/mpi-io/mpioprof.h diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/open.c b/ompi/mca/io/romio/romio/mpi-io/open.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/open.c rename to ompi/mca/io/romio/romio/mpi-io/open.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/prealloc.c b/ompi/mca/io/romio/romio/mpi-io/prealloc.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/prealloc.c rename to ompi/mca/io/romio/romio/mpi-io/prealloc.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/rd_atallb.c b/ompi/mca/io/romio/romio/mpi-io/rd_atallb.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/rd_atallb.c rename to ompi/mca/io/romio/romio/mpi-io/rd_atallb.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/rd_atalle.c b/ompi/mca/io/romio/romio/mpi-io/rd_atalle.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/rd_atalle.c rename to ompi/mca/io/romio/romio/mpi-io/rd_atalle.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/read.c b/ompi/mca/io/romio/romio/mpi-io/read.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/read.c rename to ompi/mca/io/romio/romio/mpi-io/read.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/read_all.c b/ompi/mca/io/romio/romio/mpi-io/read_all.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/read_all.c rename to ompi/mca/io/romio/romio/mpi-io/read_all.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/read_allb.c b/ompi/mca/io/romio/romio/mpi-io/read_allb.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/read_allb.c rename to ompi/mca/io/romio/romio/mpi-io/read_allb.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/read_alle.c b/ompi/mca/io/romio/romio/mpi-io/read_alle.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/read_alle.c rename to ompi/mca/io/romio/romio/mpi-io/read_alle.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/read_at.c b/ompi/mca/io/romio/romio/mpi-io/read_at.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/read_at.c rename to ompi/mca/io/romio/romio/mpi-io/read_at.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/read_atall.c b/ompi/mca/io/romio/romio/mpi-io/read_atall.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/read_atall.c rename to ompi/mca/io/romio/romio/mpi-io/read_atall.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/read_ord.c b/ompi/mca/io/romio/romio/mpi-io/read_ord.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/read_ord.c rename to ompi/mca/io/romio/romio/mpi-io/read_ord.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/read_ordb.c b/ompi/mca/io/romio/romio/mpi-io/read_ordb.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/read_ordb.c rename to ompi/mca/io/romio/romio/mpi-io/read_ordb.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/read_orde.c b/ompi/mca/io/romio/romio/mpi-io/read_orde.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/read_orde.c rename to ompi/mca/io/romio/romio/mpi-io/read_orde.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/read_sh.c b/ompi/mca/io/romio/romio/mpi-io/read_sh.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/read_sh.c rename to ompi/mca/io/romio/romio/mpi-io/read_sh.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/seek.c b/ompi/mca/io/romio/romio/mpi-io/seek.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/seek.c rename to ompi/mca/io/romio/romio/mpi-io/seek.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/seek_sh.c b/ompi/mca/io/romio/romio/mpi-io/seek_sh.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/seek_sh.c rename to ompi/mca/io/romio/romio/mpi-io/seek_sh.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/set_atom.c b/ompi/mca/io/romio/romio/mpi-io/set_atom.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/set_atom.c rename to ompi/mca/io/romio/romio/mpi-io/set_atom.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/set_errh.c b/ompi/mca/io/romio/romio/mpi-io/set_errh.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/set_errh.c rename to ompi/mca/io/romio/romio/mpi-io/set_errh.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/set_info.c b/ompi/mca/io/romio/romio/mpi-io/set_info.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/set_info.c rename to ompi/mca/io/romio/romio/mpi-io/set_info.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/set_size.c b/ompi/mca/io/romio/romio/mpi-io/set_size.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/set_size.c rename to ompi/mca/io/romio/romio/mpi-io/set_size.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/set_view.c b/ompi/mca/io/romio/romio/mpi-io/set_view.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/set_view.c rename to ompi/mca/io/romio/romio/mpi-io/set_view.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/wr_atallb.c b/ompi/mca/io/romio/romio/mpi-io/wr_atallb.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/wr_atallb.c rename to ompi/mca/io/romio/romio/mpi-io/wr_atallb.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/wr_atalle.c b/ompi/mca/io/romio/romio/mpi-io/wr_atalle.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/wr_atalle.c rename to ompi/mca/io/romio/romio/mpi-io/wr_atalle.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/write.c b/ompi/mca/io/romio/romio/mpi-io/write.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/write.c rename to ompi/mca/io/romio/romio/mpi-io/write.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/write_all.c b/ompi/mca/io/romio/romio/mpi-io/write_all.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/write_all.c rename to ompi/mca/io/romio/romio/mpi-io/write_all.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/write_allb.c b/ompi/mca/io/romio/romio/mpi-io/write_allb.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/write_allb.c rename to ompi/mca/io/romio/romio/mpi-io/write_allb.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/write_alle.c b/ompi/mca/io/romio/romio/mpi-io/write_alle.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/write_alle.c rename to ompi/mca/io/romio/romio/mpi-io/write_alle.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/write_at.c b/ompi/mca/io/romio/romio/mpi-io/write_at.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/write_at.c rename to ompi/mca/io/romio/romio/mpi-io/write_at.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/write_atall.c b/ompi/mca/io/romio/romio/mpi-io/write_atall.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/write_atall.c rename to ompi/mca/io/romio/romio/mpi-io/write_atall.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/write_ord.c b/ompi/mca/io/romio/romio/mpi-io/write_ord.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/write_ord.c rename to ompi/mca/io/romio/romio/mpi-io/write_ord.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/write_ordb.c b/ompi/mca/io/romio/romio/mpi-io/write_ordb.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/write_ordb.c rename to ompi/mca/io/romio/romio/mpi-io/write_ordb.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/write_orde.c b/ompi/mca/io/romio/romio/mpi-io/write_orde.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/write_orde.c rename to ompi/mca/io/romio/romio/mpi-io/write_orde.c diff --git a/ompi/mca/io/romio/romio-dist/mpi-io/write_sh.c b/ompi/mca/io/romio/romio/mpi-io/write_sh.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi-io/write_sh.c rename to ompi/mca/io/romio/romio/mpi-io/write_sh.c diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/array/Makefile.in b/ompi/mca/io/romio/romio/mpi2-other/array/Makefile.in similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/array/Makefile.in rename to ompi/mca/io/romio/romio/mpi2-other/array/Makefile.in diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/array/darray.c b/ompi/mca/io/romio/romio/mpi2-other/array/darray.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/array/darray.c rename to ompi/mca/io/romio/romio/mpi2-other/array/darray.c diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/array/fortran/Makefile.in b/ompi/mca/io/romio/romio/mpi2-other/array/fortran/Makefile.in similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/array/fortran/Makefile.in rename to ompi/mca/io/romio/romio/mpi2-other/array/fortran/Makefile.in diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/array/fortran/darrayf.c b/ompi/mca/io/romio/romio/mpi2-other/array/fortran/darrayf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/array/fortran/darrayf.c rename to ompi/mca/io/romio/romio/mpi2-other/array/fortran/darrayf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/array/fortran/subarrayf.c b/ompi/mca/io/romio/romio/mpi2-other/array/fortran/subarrayf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/array/fortran/subarrayf.c rename to ompi/mca/io/romio/romio/mpi2-other/array/fortran/subarrayf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/array/subarray.c b/ompi/mca/io/romio/romio/mpi2-other/array/subarray.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/array/subarray.c rename to ompi/mca/io/romio/romio/mpi2-other/array/subarray.c diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/info/Makefile.in b/ompi/mca/io/romio/romio/mpi2-other/info/Makefile.in similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/info/Makefile.in rename to ompi/mca/io/romio/romio/mpi2-other/info/Makefile.in diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/Makefile.in b/ompi/mca/io/romio/romio/mpi2-other/info/fortran/Makefile.in similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/Makefile.in rename to ompi/mca/io/romio/romio/mpi2-other/info/fortran/Makefile.in diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_createf.c b/ompi/mca/io/romio/romio/mpi2-other/info/fortran/info_createf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_createf.c rename to ompi/mca/io/romio/romio/mpi2-other/info/fortran/info_createf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_deletef.c b/ompi/mca/io/romio/romio/mpi2-other/info/fortran/info_deletef.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_deletef.c rename to ompi/mca/io/romio/romio/mpi2-other/info/fortran/info_deletef.c diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_dupf.c b/ompi/mca/io/romio/romio/mpi2-other/info/fortran/info_dupf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_dupf.c rename to ompi/mca/io/romio/romio/mpi2-other/info/fortran/info_dupf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_freef.c b/ompi/mca/io/romio/romio/mpi2-other/info/fortran/info_freef.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_freef.c rename to ompi/mca/io/romio/romio/mpi2-other/info/fortran/info_freef.c diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_getf.c b/ompi/mca/io/romio/romio/mpi2-other/info/fortran/info_getf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_getf.c rename to ompi/mca/io/romio/romio/mpi2-other/info/fortran/info_getf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_getnksf.c b/ompi/mca/io/romio/romio/mpi2-other/info/fortran/info_getnksf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_getnksf.c rename to ompi/mca/io/romio/romio/mpi2-other/info/fortran/info_getnksf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_getnthf.c b/ompi/mca/io/romio/romio/mpi2-other/info/fortran/info_getnthf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_getnthf.c rename to ompi/mca/io/romio/romio/mpi2-other/info/fortran/info_getnthf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_getvlnf.c b/ompi/mca/io/romio/romio/mpi2-other/info/fortran/info_getvlnf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_getvlnf.c rename to ompi/mca/io/romio/romio/mpi2-other/info/fortran/info_getvlnf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_setf.c b/ompi/mca/io/romio/romio/mpi2-other/info/fortran/info_setf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_setf.c rename to ompi/mca/io/romio/romio/mpi2-other/info/fortran/info_setf.c diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/info/info_c2f.c b/ompi/mca/io/romio/romio/mpi2-other/info/info_c2f.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/info/info_c2f.c rename to ompi/mca/io/romio/romio/mpi2-other/info/info_c2f.c diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/info/info_create.c b/ompi/mca/io/romio/romio/mpi2-other/info/info_create.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/info/info_create.c rename to ompi/mca/io/romio/romio/mpi2-other/info/info_create.c diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/info/info_delete.c b/ompi/mca/io/romio/romio/mpi2-other/info/info_delete.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/info/info_delete.c rename to ompi/mca/io/romio/romio/mpi2-other/info/info_delete.c diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/info/info_dup.c b/ompi/mca/io/romio/romio/mpi2-other/info/info_dup.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/info/info_dup.c rename to ompi/mca/io/romio/romio/mpi2-other/info/info_dup.c diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/info/info_f2c.c b/ompi/mca/io/romio/romio/mpi2-other/info/info_f2c.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/info/info_f2c.c rename to ompi/mca/io/romio/romio/mpi2-other/info/info_f2c.c diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/info/info_free.c b/ompi/mca/io/romio/romio/mpi2-other/info/info_free.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/info/info_free.c rename to ompi/mca/io/romio/romio/mpi2-other/info/info_free.c diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/info/info_get.c b/ompi/mca/io/romio/romio/mpi2-other/info/info_get.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/info/info_get.c rename to ompi/mca/io/romio/romio/mpi2-other/info/info_get.c diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/info/info_getnks.c b/ompi/mca/io/romio/romio/mpi2-other/info/info_getnks.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/info/info_getnks.c rename to ompi/mca/io/romio/romio/mpi2-other/info/info_getnks.c diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/info/info_getnth.c b/ompi/mca/io/romio/romio/mpi2-other/info/info_getnth.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/info/info_getnth.c rename to ompi/mca/io/romio/romio/mpi2-other/info/info_getnth.c diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/info/info_getvln.c b/ompi/mca/io/romio/romio/mpi2-other/info/info_getvln.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/info/info_getvln.c rename to ompi/mca/io/romio/romio/mpi2-other/info/info_getvln.c diff --git a/ompi/mca/io/romio/romio-dist/mpi2-other/info/info_set.c b/ompi/mca/io/romio/romio/mpi2-other/info/info_set.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/mpi2-other/info/info_set.c rename to ompi/mca/io/romio/romio/mpi2-other/info/info_set.c diff --git a/ompi/mca/io/romio/romio-dist/test/Makefile.in b/ompi/mca/io/romio/romio/test/Makefile.in similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/Makefile.in rename to ompi/mca/io/romio/romio/test/Makefile.in diff --git a/ompi/mca/io/romio/romio-dist/test/README b/ompi/mca/io/romio/romio/test/README similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/README rename to ompi/mca/io/romio/romio/test/README diff --git a/ompi/mca/io/romio/romio-dist/test/async.c b/ompi/mca/io/romio/romio/test/async.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/async.c rename to ompi/mca/io/romio/romio/test/async.c diff --git a/ompi/mca/io/romio/romio-dist/test/atomicity.c b/ompi/mca/io/romio/romio/test/atomicity.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/atomicity.c rename to ompi/mca/io/romio/romio/test/atomicity.c diff --git a/ompi/mca/io/romio/romio-dist/test/coll_perf.c b/ompi/mca/io/romio/romio/test/coll_perf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/coll_perf.c rename to ompi/mca/io/romio/romio/test/coll_perf.c diff --git a/ompi/mca/io/romio/romio-dist/test/coll_test.c b/ompi/mca/io/romio/romio/test/coll_test.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/coll_test.c rename to ompi/mca/io/romio/romio/test/coll_test.c diff --git a/ompi/mca/io/romio/romio-dist/test/error.c b/ompi/mca/io/romio/romio/test/error.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/error.c rename to ompi/mca/io/romio/romio/test/error.c diff --git a/ompi/mca/io/romio/romio-dist/test/excl.c b/ompi/mca/io/romio/romio/test/excl.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/excl.c rename to ompi/mca/io/romio/romio/test/excl.c diff --git a/ompi/mca/io/romio/romio-dist/test/fcoll_test.f.in b/ompi/mca/io/romio/romio/test/fcoll_test.f.in similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/fcoll_test.f.in rename to ompi/mca/io/romio/romio/test/fcoll_test.f.in diff --git a/ompi/mca/io/romio/romio-dist/test/file_info.c b/ompi/mca/io/romio/romio/test/file_info.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/file_info.c rename to ompi/mca/io/romio/romio/test/file_info.c diff --git a/ompi/mca/io/romio/romio-dist/test/fmisc.f.in b/ompi/mca/io/romio/romio/test/fmisc.f.in similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/fmisc.f.in rename to ompi/mca/io/romio/romio/test/fmisc.f.in diff --git a/ompi/mca/io/romio/romio-dist/test/fperf.f.in b/ompi/mca/io/romio/romio/test/fperf.f.in similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/fperf.f.in rename to ompi/mca/io/romio/romio/test/fperf.f.in diff --git a/ompi/mca/io/romio/romio-dist/test/i_noncontig.c b/ompi/mca/io/romio/romio/test/i_noncontig.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/i_noncontig.c rename to ompi/mca/io/romio/romio/test/i_noncontig.c diff --git a/ompi/mca/io/romio/romio-dist/test/large_array.c b/ompi/mca/io/romio/romio/test/large_array.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/large_array.c rename to ompi/mca/io/romio/romio/test/large_array.c diff --git a/ompi/mca/io/romio/romio-dist/test/large_file.c.in b/ompi/mca/io/romio/romio/test/large_file.c.in similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/large_file.c.in rename to ompi/mca/io/romio/romio/test/large_file.c.in diff --git a/ompi/mca/io/romio/romio-dist/test/misc.c.in b/ompi/mca/io/romio/romio/test/misc.c.in similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/misc.c.in rename to ompi/mca/io/romio/romio/test/misc.c.in diff --git a/ompi/mca/io/romio/romio-dist/test/noncontig.c b/ompi/mca/io/romio/romio/test/noncontig.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/noncontig.c rename to ompi/mca/io/romio/romio/test/noncontig.c diff --git a/ompi/mca/io/romio/romio-dist/test/noncontig_coll.c b/ompi/mca/io/romio/romio/test/noncontig_coll.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/noncontig_coll.c rename to ompi/mca/io/romio/romio/test/noncontig_coll.c diff --git a/ompi/mca/io/romio/romio-dist/test/noncontig_coll2.c b/ompi/mca/io/romio/romio/test/noncontig_coll2.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/noncontig_coll2.c rename to ompi/mca/io/romio/romio/test/noncontig_coll2.c diff --git a/ompi/mca/io/romio/romio-dist/test/perf.c b/ompi/mca/io/romio/romio/test/perf.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/perf.c rename to ompi/mca/io/romio/romio/test/perf.c diff --git a/ompi/mca/io/romio/romio-dist/test/pfcoll_test.f.in b/ompi/mca/io/romio/romio/test/pfcoll_test.f.in similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/pfcoll_test.f.in rename to ompi/mca/io/romio/romio/test/pfcoll_test.f.in diff --git a/ompi/mca/io/romio/romio-dist/test/psimple.c b/ompi/mca/io/romio/romio/test/psimple.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/psimple.c rename to ompi/mca/io/romio/romio/test/psimple.c diff --git a/ompi/mca/io/romio/romio-dist/test/runtests.in b/ompi/mca/io/romio/romio/test/runtests.in similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/runtests.in rename to ompi/mca/io/romio/romio/test/runtests.in diff --git a/ompi/mca/io/romio/romio-dist/test/shared_fp.c b/ompi/mca/io/romio/romio/test/shared_fp.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/shared_fp.c rename to ompi/mca/io/romio/romio/test/shared_fp.c diff --git a/ompi/mca/io/romio/romio-dist/test/simple.c b/ompi/mca/io/romio/romio/test/simple.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/simple.c rename to ompi/mca/io/romio/romio/test/simple.c diff --git a/ompi/mca/io/romio/romio-dist/test/split_coll.c b/ompi/mca/io/romio/romio/test/split_coll.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/split_coll.c rename to ompi/mca/io/romio/romio/test/split_coll.c diff --git a/ompi/mca/io/romio/romio-dist/test/status.c b/ompi/mca/io/romio/romio/test/status.c similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/status.c rename to ompi/mca/io/romio/romio/test/status.c diff --git a/ompi/mca/io/romio/romio-dist/test/std/async.std b/ompi/mca/io/romio/romio/test/std/async.std similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/std/async.std rename to ompi/mca/io/romio/romio/test/std/async.std diff --git a/ompi/mca/io/romio/romio-dist/test/std/atomicity.std b/ompi/mca/io/romio/romio/test/std/atomicity.std similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/std/atomicity.std rename to ompi/mca/io/romio/romio/test/std/atomicity.std diff --git a/ompi/mca/io/romio/romio-dist/test/std/coll_test.std b/ompi/mca/io/romio/romio/test/std/coll_test.std similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/std/coll_test.std rename to ompi/mca/io/romio/romio/test/std/coll_test.std diff --git a/ompi/mca/io/romio/romio-dist/test/std/error.std b/ompi/mca/io/romio/romio/test/std/error.std similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/std/error.std rename to ompi/mca/io/romio/romio/test/std/error.std diff --git a/ompi/mca/io/romio/romio-dist/test/std/excl.std b/ompi/mca/io/romio/romio/test/std/excl.std similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/std/excl.std rename to ompi/mca/io/romio/romio/test/std/excl.std diff --git a/ompi/mca/io/romio/romio-dist/test/std/fcoll_test.std b/ompi/mca/io/romio/romio/test/std/fcoll_test.std similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/std/fcoll_test.std rename to ompi/mca/io/romio/romio/test/std/fcoll_test.std diff --git a/ompi/mca/io/romio/romio-dist/test/std/file_info.std b/ompi/mca/io/romio/romio/test/std/file_info.std similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/std/file_info.std rename to ompi/mca/io/romio/romio/test/std/file_info.std diff --git a/ompi/mca/io/romio/romio-dist/test/std/fmisc.std b/ompi/mca/io/romio/romio/test/std/fmisc.std similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/std/fmisc.std rename to ompi/mca/io/romio/romio/test/std/fmisc.std diff --git a/ompi/mca/io/romio/romio-dist/test/std/i_noncontig.std b/ompi/mca/io/romio/romio/test/std/i_noncontig.std similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/std/i_noncontig.std rename to ompi/mca/io/romio/romio/test/std/i_noncontig.std diff --git a/ompi/mca/io/romio/romio-dist/test/std/misc.std b/ompi/mca/io/romio/romio/test/std/misc.std similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/std/misc.std rename to ompi/mca/io/romio/romio/test/std/misc.std diff --git a/ompi/mca/io/romio/romio-dist/test/std/noncontig.std b/ompi/mca/io/romio/romio/test/std/noncontig.std similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/std/noncontig.std rename to ompi/mca/io/romio/romio/test/std/noncontig.std diff --git a/ompi/mca/io/romio/romio-dist/test/std/noncontig_coll.std b/ompi/mca/io/romio/romio/test/std/noncontig_coll.std similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/std/noncontig_coll.std rename to ompi/mca/io/romio/romio/test/std/noncontig_coll.std diff --git a/ompi/mca/io/romio/romio-dist/test/std/noncontig_coll2.std b/ompi/mca/io/romio/romio/test/std/noncontig_coll2.std similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/std/noncontig_coll2.std rename to ompi/mca/io/romio/romio/test/std/noncontig_coll2.std diff --git a/ompi/mca/io/romio/romio-dist/test/std/pfcoll_test.std b/ompi/mca/io/romio/romio/test/std/pfcoll_test.std similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/std/pfcoll_test.std rename to ompi/mca/io/romio/romio/test/std/pfcoll_test.std diff --git a/ompi/mca/io/romio/romio-dist/test/std/psimple.std b/ompi/mca/io/romio/romio/test/std/psimple.std similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/std/psimple.std rename to ompi/mca/io/romio/romio/test/std/psimple.std diff --git a/ompi/mca/io/romio/romio-dist/test/std/shared_fp.std b/ompi/mca/io/romio/romio/test/std/shared_fp.std similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/std/shared_fp.std rename to ompi/mca/io/romio/romio/test/std/shared_fp.std diff --git a/ompi/mca/io/romio/romio-dist/test/std/simple.std b/ompi/mca/io/romio/romio/test/std/simple.std similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/std/simple.std rename to ompi/mca/io/romio/romio/test/std/simple.std diff --git a/ompi/mca/io/romio/romio-dist/test/std/split_coll.std b/ompi/mca/io/romio/romio/test/std/split_coll.std similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/std/split_coll.std rename to ompi/mca/io/romio/romio/test/std/split_coll.std diff --git a/ompi/mca/io/romio/romio-dist/test/std/status.std b/ompi/mca/io/romio/romio/test/std/status.std similarity index 100% rename from ompi/mca/io/romio/romio-dist/test/std/status.std rename to ompi/mca/io/romio/romio/test/std/status.std diff --git a/ompi/mca/io/romio/romio-dist/util/Makefile.am b/ompi/mca/io/romio/romio/util/Makefile.am similarity index 100% rename from ompi/mca/io/romio/romio-dist/util/Makefile.am rename to ompi/mca/io/romio/romio/util/Makefile.am diff --git a/ompi/mca/io/romio/romio-dist/util/romioinstall.in b/ompi/mca/io/romio/romio/util/romioinstall.in similarity index 100% rename from ompi/mca/io/romio/romio-dist/util/romioinstall.in rename to ompi/mca/io/romio/romio/util/romioinstall.in diff --git a/ompi/mca/io/romio/romio-dist/util/tarch b/ompi/mca/io/romio/romio/util/tarch similarity index 100% rename from ompi/mca/io/romio/romio-dist/util/tarch rename to ompi/mca/io/romio/romio/util/tarch diff --git a/ompi/mca/io/romio/src/Makefile.extra b/ompi/mca/io/romio/src/Makefile.extra index 08d2941640..4b13ab1667 100644 --- a/ompi/mca/io/romio/src/Makefile.extra +++ b/ompi/mca/io/romio/src/Makefile.extra @@ -30,7 +30,7 @@ AM_CPPFLAGS = \ -I$(top_ompi_srcdir)/ompi \ -I$(top_ompi_srcdir)/ompi/include \ -I$(top_ompi_srcdir)/ompi/mca/io/romio \ - -I$(top_ompi_srcdir)/ompi/mca/io/romio/romio-dist/include \ + -I$(top_ompi_srcdir)/ompi/mca/io/romio/romio/include \ -I$(top_builddir) sources += \ diff --git a/ompi/mca/io/romio/src/io_romio.h b/ompi/mca/io/romio/src/io_romio.h index 36620e8078..11cd1c68ce 100644 --- a/ompi/mca/io/romio/src/io_romio.h +++ b/ompi/mca/io/romio/src/io_romio.h @@ -17,13 +17,13 @@ #ifndef MCA_IO_ROMIO_H #define MCA_IO_ROMIO_H -#include "request/request.h" -#include "file/file.h" #include "opal/threads/mutex.h" -#include "romio-dist/adio/include/romioconf.h" -#include "romio-dist/include/mpio.h" -#include "mca/io/io.h" -#include "mca/io/base/io_base_request.h" +#include "ompi/request/request.h" +#include "ompi/file/file.h" +#include "ompi/mca/io/io.h" +#include "ompi/mca/io/base/io_base_request.h" +#include "romio/adio/include/romioconf.h" +#include "romio/include/mpio.h" #if defined(c_plusplus) || defined(__cplusplus) diff --git a/ompi/mca/io/romio/src/io_romio_component.c b/ompi/mca/io/romio/src/io_romio_component.c index 990cdd61d3..4726f68ba3 100644 --- a/ompi/mca/io/romio/src/io_romio_component.c +++ b/ompi/mca/io/romio/src/io_romio_component.c @@ -18,8 +18,8 @@ #include "mpi.h" #include "opal/class/opal_list.h" #include "opal/threads/mutex.h" -#include "mca/base/base.h" -#include "mca/io/io.h" +#include "opal/mca/base/base.h" +#include "ompi/mca/io/io.h" #include "io_romio.h" diff --git a/ompi/mca/io/romio/src/io_romio_file_open.c b/ompi/mca/io/romio/src/io_romio_file_open.c index bc5baf71f8..5f9894df69 100644 --- a/ompi/mca/io/romio/src/io_romio_file_open.c +++ b/ompi/mca/io/romio/src/io_romio_file_open.c @@ -16,9 +16,9 @@ #include "ompi_config.h" -#include "communicator/communicator.h" -#include "info/info.h" -#include "file/file.h" +#include "ompi/communicator/communicator.h" +#include "ompi/info/info.h" +#include "ompi/file/file.h" #include "io_romio.h" diff --git a/ompi/mca/io/romio/src/io_romio_file_read.c b/ompi/mca/io/romio/src/io_romio_file_read.c index 12e5d6cfa3..4f80857d46 100644 --- a/ompi/mca/io/romio/src/io_romio_file_read.c +++ b/ompi/mca/io/romio/src/io_romio_file_read.c @@ -16,8 +16,8 @@ #include "ompi_config.h" #include "mpi.h" -#include "file/file.h" -#include "request/request.h" +#include "ompi/file/file.h" +#include "ompi/request/request.h" #include "io_romio.h" diff --git a/ompi/mca/io/romio/src/io_romio_file_write.c b/ompi/mca/io/romio/src/io_romio_file_write.c index b928863c4b..1465ec7f65 100644 --- a/ompi/mca/io/romio/src/io_romio_file_write.c +++ b/ompi/mca/io/romio/src/io_romio_file_write.c @@ -16,9 +16,9 @@ #include "ompi_config.h" #include "mpi.h" -#include "file/file.h" +#include "ompi/file/file.h" +#include "ompi/request/request.h" #include "io_romio.h" -#include "request/request.h" int diff --git a/ompi/mca/io/romio/src/io_romio_module.c b/ompi/mca/io/romio/src/io_romio_module.c index a2352e8d84..935cef8d82 100644 --- a/ompi/mca/io/romio/src/io_romio_module.c +++ b/ompi/mca/io/romio/src/io_romio_module.c @@ -17,7 +17,7 @@ #include "mpi.h" #include "opal/threads/mutex.h" -#include "mca/io/io.h" +#include "ompi/mca/io/io.h" #include "io_romio.h" diff --git a/ompi/mca/io/romio/src/io_romio_request.c b/ompi/mca/io/romio/src/io_romio_request.c index d13feb8003..769d5d7b4d 100644 --- a/ompi/mca/io/romio/src/io_romio_request.c +++ b/ompi/mca/io/romio/src/io_romio_request.c @@ -16,10 +16,10 @@ #include "ompi_config.h" #include "mpi.h" -#include "file/file.h" -#include "request/request.h" +#include "ompi/file/file.h" +#include "ompi/request/request.h" +#include "ompi/mca/io/base/io_base_request.h" #include "io_romio.h" -#include "mca/io/base/io_base_request.h" int mca_io_romio_request_fini(ompi_request_t **req)