diff --git a/src/Makefile.am b/ompi/Makefile.am
similarity index 100%
rename from src/Makefile.am
rename to ompi/Makefile.am
diff --git a/src/README.dox b/ompi/README.dox
similarity index 100%
rename from src/README.dox
rename to ompi/README.dox
diff --git a/src/attribute/Makefile.am b/ompi/attribute/Makefile.am
similarity index 100%
rename from src/attribute/Makefile.am
rename to ompi/attribute/Makefile.am
diff --git a/src/attribute/attribute.c b/ompi/attribute/attribute.c
similarity index 100%
rename from src/attribute/attribute.c
rename to ompi/attribute/attribute.c
diff --git a/src/attribute/attribute.h b/ompi/attribute/attribute.h
similarity index 100%
rename from src/attribute/attribute.h
rename to ompi/attribute/attribute.h
diff --git a/src/attribute/attribute_predefined.c b/ompi/attribute/attribute_predefined.c
similarity index 100%
rename from src/attribute/attribute_predefined.c
rename to ompi/attribute/attribute_predefined.c
diff --git a/src/communicator/Makefile.am b/ompi/communicator/Makefile.am
similarity index 100%
rename from src/communicator/Makefile.am
rename to ompi/communicator/Makefile.am
diff --git a/src/communicator/comm.c b/ompi/communicator/comm.c
similarity index 100%
rename from src/communicator/comm.c
rename to ompi/communicator/comm.c
diff --git a/src/communicator/comm_cid.c b/ompi/communicator/comm_cid.c
similarity index 100%
rename from src/communicator/comm_cid.c
rename to ompi/communicator/comm_cid.c
diff --git a/src/communicator/comm_dyn.c b/ompi/communicator/comm_dyn.c
similarity index 100%
rename from src/communicator/comm_dyn.c
rename to ompi/communicator/comm_dyn.c
diff --git a/src/communicator/comm_init.c b/ompi/communicator/comm_init.c
similarity index 100%
rename from src/communicator/comm_init.c
rename to ompi/communicator/comm_init.c
diff --git a/src/communicator/comm_publish.c b/ompi/communicator/comm_publish.c
similarity index 100%
rename from src/communicator/comm_publish.c
rename to ompi/communicator/comm_publish.c
diff --git a/src/communicator/communicator.h b/ompi/communicator/communicator.h
similarity index 100%
rename from src/communicator/communicator.h
rename to ompi/communicator/communicator.h
diff --git a/src/datatype/.compile_files b/ompi/datatype/.compile_files
similarity index 100%
rename from src/datatype/.compile_files
rename to ompi/datatype/.compile_files
diff --git a/src/datatype/Makefile.am b/ompi/datatype/Makefile.am
similarity index 100%
rename from src/datatype/Makefile.am
rename to ompi/datatype/Makefile.am
diff --git a/src/datatype/convertor.c b/ompi/datatype/convertor.c
similarity index 100%
rename from src/datatype/convertor.c
rename to ompi/datatype/convertor.c
diff --git a/src/datatype/convertor.h b/ompi/datatype/convertor.h
similarity index 100%
rename from src/datatype/convertor.h
rename to ompi/datatype/convertor.h
diff --git a/src/datatype/datatype.h b/ompi/datatype/datatype.h
similarity index 100%
rename from src/datatype/datatype.h
rename to ompi/datatype/datatype.h
diff --git a/src/datatype/datatype_internal.h b/ompi/datatype/datatype_internal.h
similarity index 100%
rename from src/datatype/datatype_internal.h
rename to ompi/datatype/datatype_internal.h
diff --git a/src/datatype/ddt_test.c b/ompi/datatype/ddt_test.c
similarity index 100%
rename from src/datatype/ddt_test.c
rename to ompi/datatype/ddt_test.c
diff --git a/src/datatype/dt_add.c b/ompi/datatype/dt_add.c
similarity index 100%
rename from src/datatype/dt_add.c
rename to ompi/datatype/dt_add.c
diff --git a/src/datatype/dt_arch.c b/ompi/datatype/dt_arch.c
similarity index 100%
rename from src/datatype/dt_arch.c
rename to ompi/datatype/dt_arch.c
diff --git a/src/datatype/dt_arch.h b/ompi/datatype/dt_arch.h
similarity index 100%
rename from src/datatype/dt_arch.h
rename to ompi/datatype/dt_arch.h
diff --git a/src/datatype/dt_args.c b/ompi/datatype/dt_args.c
similarity index 100%
rename from src/datatype/dt_args.c
rename to ompi/datatype/dt_args.c
diff --git a/src/datatype/dt_create.c b/ompi/datatype/dt_create.c
similarity index 100%
rename from src/datatype/dt_create.c
rename to ompi/datatype/dt_create.c
diff --git a/src/datatype/dt_create_array.c b/ompi/datatype/dt_create_array.c
similarity index 100%
rename from src/datatype/dt_create_array.c
rename to ompi/datatype/dt_create_array.c
diff --git a/src/datatype/dt_create_dup.c b/ompi/datatype/dt_create_dup.c
similarity index 100%
rename from src/datatype/dt_create_dup.c
rename to ompi/datatype/dt_create_dup.c
diff --git a/src/datatype/dt_create_indexed.c b/ompi/datatype/dt_create_indexed.c
similarity index 100%
rename from src/datatype/dt_create_indexed.c
rename to ompi/datatype/dt_create_indexed.c
diff --git a/src/datatype/dt_create_struct.c b/ompi/datatype/dt_create_struct.c
similarity index 100%
rename from src/datatype/dt_create_struct.c
rename to ompi/datatype/dt_create_struct.c
diff --git a/src/datatype/dt_create_vector.c b/ompi/datatype/dt_create_vector.c
similarity index 100%
rename from src/datatype/dt_create_vector.c
rename to ompi/datatype/dt_create_vector.c
diff --git a/src/datatype/dt_destroy.c b/ompi/datatype/dt_destroy.c
similarity index 100%
rename from src/datatype/dt_destroy.c
rename to ompi/datatype/dt_destroy.c
diff --git a/src/datatype/dt_external32.c b/ompi/datatype/dt_external32.c
similarity index 100%
rename from src/datatype/dt_external32.c
rename to ompi/datatype/dt_external32.c
diff --git a/src/datatype/dt_match_size.c b/ompi/datatype/dt_match_size.c
similarity index 100%
rename from src/datatype/dt_match_size.c
rename to ompi/datatype/dt_match_size.c
diff --git a/src/datatype/dt_module.c b/ompi/datatype/dt_module.c
similarity index 100%
rename from src/datatype/dt_module.c
rename to ompi/datatype/dt_module.c
diff --git a/src/datatype/dt_optimize.c b/ompi/datatype/dt_optimize.c
similarity index 100%
rename from src/datatype/dt_optimize.c
rename to ompi/datatype/dt_optimize.c
diff --git a/src/datatype/dt_pack.c b/ompi/datatype/dt_pack.c
similarity index 100%
rename from src/datatype/dt_pack.c
rename to ompi/datatype/dt_pack.c
diff --git a/src/datatype/dt_sndrcv.c b/ompi/datatype/dt_sndrcv.c
similarity index 100%
rename from src/datatype/dt_sndrcv.c
rename to ompi/datatype/dt_sndrcv.c
diff --git a/src/datatype/dt_unpack.c b/ompi/datatype/dt_unpack.c
similarity index 100%
rename from src/datatype/dt_unpack.c
rename to ompi/datatype/dt_unpack.c
diff --git a/src/datatype/fake_stack.c b/ompi/datatype/fake_stack.c
similarity index 100%
rename from src/datatype/fake_stack.c
rename to ompi/datatype/fake_stack.c
diff --git a/src/datatype/new_pack.c b/ompi/datatype/new_pack.c
similarity index 100%
rename from src/datatype/new_pack.c
rename to ompi/datatype/new_pack.c
diff --git a/src/dynamic-mca/Makefile.am b/ompi/dynamic-mca/Makefile.am
similarity index 100%
rename from src/dynamic-mca/Makefile.am
rename to ompi/dynamic-mca/Makefile.am
diff --git a/src/dynamic-mca/btl/Makefile.am b/ompi/dynamic-mca/btl/Makefile.am
similarity index 100%
rename from src/dynamic-mca/btl/Makefile.am
rename to ompi/dynamic-mca/btl/Makefile.am
diff --git a/src/dynamic-mca/coll/Makefile.am b/ompi/dynamic-mca/coll/Makefile.am
similarity index 100%
rename from src/dynamic-mca/coll/Makefile.am
rename to ompi/dynamic-mca/coll/Makefile.am
diff --git a/src/dynamic-mca/common/Makefile.am b/ompi/dynamic-mca/common/Makefile.am
similarity index 100%
rename from src/dynamic-mca/common/Makefile.am
rename to ompi/dynamic-mca/common/Makefile.am
diff --git a/src/dynamic-mca/io/Makefile.am b/ompi/dynamic-mca/io/Makefile.am
similarity index 100%
rename from src/dynamic-mca/io/Makefile.am
rename to ompi/dynamic-mca/io/Makefile.am
diff --git a/src/dynamic-mca/pml/Makefile.am b/ompi/dynamic-mca/pml/Makefile.am
similarity index 100%
rename from src/dynamic-mca/pml/Makefile.am
rename to ompi/dynamic-mca/pml/Makefile.am
diff --git a/src/dynamic-mca/ptl/Makefile.am b/ompi/dynamic-mca/ptl/Makefile.am
similarity index 100%
rename from src/dynamic-mca/ptl/Makefile.am
rename to ompi/dynamic-mca/ptl/Makefile.am
diff --git a/src/dynamic-mca/rmgr/Makefile.am b/ompi/dynamic-mca/rmgr/Makefile.am
similarity index 100%
rename from src/dynamic-mca/rmgr/Makefile.am
rename to ompi/dynamic-mca/rmgr/Makefile.am
diff --git a/src/dynamic-mca/topo/Makefile.am b/ompi/dynamic-mca/topo/Makefile.am
similarity index 100%
rename from src/dynamic-mca/topo/Makefile.am
rename to ompi/dynamic-mca/topo/Makefile.am
diff --git a/src/errhandler/Makefile.am b/ompi/errhandler/Makefile.am
similarity index 100%
rename from src/errhandler/Makefile.am
rename to ompi/errhandler/Makefile.am
diff --git a/src/errhandler/errclass.c b/ompi/errhandler/errclass.c
similarity index 100%
rename from src/errhandler/errclass.c
rename to ompi/errhandler/errclass.c
diff --git a/src/errhandler/errclass.h b/ompi/errhandler/errclass.h
similarity index 100%
rename from src/errhandler/errclass.h
rename to ompi/errhandler/errclass.h
diff --git a/src/errhandler/errcode-internal.c b/ompi/errhandler/errcode-internal.c
similarity index 100%
rename from src/errhandler/errcode-internal.c
rename to ompi/errhandler/errcode-internal.c
diff --git a/src/errhandler/errcode-internal.h b/ompi/errhandler/errcode-internal.h
similarity index 100%
rename from src/errhandler/errcode-internal.h
rename to ompi/errhandler/errcode-internal.h
diff --git a/src/errhandler/errcode.c b/ompi/errhandler/errcode.c
similarity index 100%
rename from src/errhandler/errcode.c
rename to ompi/errhandler/errcode.c
diff --git a/src/errhandler/errcode.h b/ompi/errhandler/errcode.h
similarity index 100%
rename from src/errhandler/errcode.h
rename to ompi/errhandler/errcode.h
diff --git a/src/errhandler/errhandler.c b/ompi/errhandler/errhandler.c
similarity index 100%
rename from src/errhandler/errhandler.c
rename to ompi/errhandler/errhandler.c
diff --git a/src/errhandler/errhandler.h b/ompi/errhandler/errhandler.h
similarity index 100%
rename from src/errhandler/errhandler.h
rename to ompi/errhandler/errhandler.h
diff --git a/src/errhandler/errhandler_invoke.c b/ompi/errhandler/errhandler_invoke.c
similarity index 100%
rename from src/errhandler/errhandler_invoke.c
rename to ompi/errhandler/errhandler_invoke.c
diff --git a/src/errhandler/errhandler_predefined.c b/ompi/errhandler/errhandler_predefined.c
similarity index 100%
rename from src/errhandler/errhandler_predefined.c
rename to ompi/errhandler/errhandler_predefined.c
diff --git a/src/errhandler/errhandler_predefined.h b/ompi/errhandler/errhandler_predefined.h
similarity index 100%
rename from src/errhandler/errhandler_predefined.h
rename to ompi/errhandler/errhandler_predefined.h
diff --git a/src/file/Makefile.am b/ompi/file/Makefile.am
similarity index 100%
rename from src/file/Makefile.am
rename to ompi/file/Makefile.am
diff --git a/src/file/file.c b/ompi/file/file.c
similarity index 100%
rename from src/file/file.c
rename to ompi/file/file.c
diff --git a/src/file/file.h b/ompi/file/file.h
similarity index 100%
rename from src/file/file.h
rename to ompi/file/file.h
diff --git a/src/group/Makefile.am b/ompi/group/Makefile.am
similarity index 100%
rename from src/group/Makefile.am
rename to ompi/group/Makefile.am
diff --git a/src/group/group.c b/ompi/group/group.c
similarity index 100%
rename from src/group/group.c
rename to ompi/group/group.c
diff --git a/src/group/group.h b/ompi/group/group.h
similarity index 100%
rename from src/group/group.h
rename to ompi/group/group.h
diff --git a/src/group/mpi_group_init.c b/ompi/group/mpi_group_init.c
similarity index 100%
rename from src/group/mpi_group_init.c
rename to ompi/group/mpi_group_init.c
diff --git a/src/group/mpi_set_group_rank.c b/ompi/group/mpi_set_group_rank.c
similarity index 100%
rename from src/group/mpi_set_group_rank.c
rename to ompi/group/mpi_set_group_rank.c
diff --git a/src/include/Makefile.am b/ompi/include/Makefile.am
similarity index 100%
rename from src/include/Makefile.am
rename to ompi/include/Makefile.am
diff --git a/src/include/constants.h b/ompi/include/constants.h
similarity index 100%
rename from src/include/constants.h
rename to ompi/include/constants.h
diff --git a/src/include/ompi_socket_errno.h b/ompi/include/ompi_socket_errno.h
similarity index 100%
rename from src/include/ompi_socket_errno.h
rename to ompi/include/ompi_socket_errno.h
diff --git a/src/include/totalview.h b/ompi/include/totalview.h
similarity index 100%
rename from src/include/totalview.h
rename to ompi/include/totalview.h
diff --git a/src/include/types.h b/ompi/include/types.h
similarity index 100%
rename from src/include/types.h
rename to ompi/include/types.h
diff --git a/src/info/Makefile.am b/ompi/info/Makefile.am
similarity index 100%
rename from src/info/Makefile.am
rename to ompi/info/Makefile.am
diff --git a/src/info/info.c b/ompi/info/info.c
similarity index 100%
rename from src/info/info.c
rename to ompi/info/info.c
diff --git a/src/info/info.h b/ompi/info/info.h
similarity index 100%
rename from src/info/info.h
rename to ompi/info/info.h
diff --git a/src/mca/Makefile.am b/ompi/mca/Makefile.am
similarity index 100%
rename from src/mca/Makefile.am
rename to ompi/mca/Makefile.am
diff --git a/src/mca/btl/Makefile.am b/ompi/mca/btl/Makefile.am
similarity index 100%
rename from src/mca/btl/Makefile.am
rename to ompi/mca/btl/Makefile.am
diff --git a/src/mca/btl/base/Makefile.am b/ompi/mca/btl/base/Makefile.am
similarity index 100%
rename from src/mca/btl/base/Makefile.am
rename to ompi/mca/btl/base/Makefile.am
diff --git a/src/mca/btl/base/base.h b/ompi/mca/btl/base/base.h
similarity index 100%
rename from src/mca/btl/base/base.h
rename to ompi/mca/btl/base/base.h
diff --git a/src/mca/btl/base/btl_base_close.c b/ompi/mca/btl/base/btl_base_close.c
similarity index 100%
rename from src/mca/btl/base/btl_base_close.c
rename to ompi/mca/btl/base/btl_base_close.c
diff --git a/src/mca/btl/base/btl_base_open.c b/ompi/mca/btl/base/btl_base_open.c
similarity index 100%
rename from src/mca/btl/base/btl_base_open.c
rename to ompi/mca/btl/base/btl_base_open.c
diff --git a/src/mca/btl/base/btl_base_select.c b/ompi/mca/btl/base/btl_base_select.c
similarity index 100%
rename from src/mca/btl/base/btl_base_select.c
rename to ompi/mca/btl/base/btl_base_select.c
diff --git a/src/mca/btl/btl.h b/ompi/mca/btl/btl.h
similarity index 100%
rename from src/mca/btl/btl.h
rename to ompi/mca/btl/btl.h
diff --git a/src/mca/btl/gm/.ompi_ignore b/ompi/mca/btl/gm/.ompi_ignore
similarity index 100%
rename from src/mca/btl/gm/.ompi_ignore
rename to ompi/mca/btl/gm/.ompi_ignore
diff --git a/src/mca/btl/gm/.ompi_unignore b/ompi/mca/btl/gm/.ompi_unignore
similarity index 100%
rename from src/mca/btl/gm/.ompi_unignore
rename to ompi/mca/btl/gm/.ompi_unignore
diff --git a/src/mca/btl/gm/Makefile.am b/ompi/mca/btl/gm/Makefile.am
similarity index 100%
rename from src/mca/btl/gm/Makefile.am
rename to ompi/mca/btl/gm/Makefile.am
diff --git a/src/mca/btl/gm/btl_gm.c b/ompi/mca/btl/gm/btl_gm.c
similarity index 100%
rename from src/mca/btl/gm/btl_gm.c
rename to ompi/mca/btl/gm/btl_gm.c
diff --git a/src/mca/btl/gm/btl_gm.h b/ompi/mca/btl/gm/btl_gm.h
similarity index 100%
rename from src/mca/btl/gm/btl_gm.h
rename to ompi/mca/btl/gm/btl_gm.h
diff --git a/src/mca/btl/gm/btl_gm_component.c b/ompi/mca/btl/gm/btl_gm_component.c
similarity index 100%
rename from src/mca/btl/gm/btl_gm_component.c
rename to ompi/mca/btl/gm/btl_gm_component.c
diff --git a/src/mca/btl/gm/btl_gm_endpoint.c b/ompi/mca/btl/gm/btl_gm_endpoint.c
similarity index 100%
rename from src/mca/btl/gm/btl_gm_endpoint.c
rename to ompi/mca/btl/gm/btl_gm_endpoint.c
diff --git a/src/mca/btl/gm/btl_gm_endpoint.h b/ompi/mca/btl/gm/btl_gm_endpoint.h
similarity index 100%
rename from src/mca/btl/gm/btl_gm_endpoint.h
rename to ompi/mca/btl/gm/btl_gm_endpoint.h
diff --git a/src/mca/btl/gm/btl_gm_frag.c b/ompi/mca/btl/gm/btl_gm_frag.c
similarity index 100%
rename from src/mca/btl/gm/btl_gm_frag.c
rename to ompi/mca/btl/gm/btl_gm_frag.c
diff --git a/src/mca/btl/gm/btl_gm_frag.h b/ompi/mca/btl/gm/btl_gm_frag.h
similarity index 100%
rename from src/mca/btl/gm/btl_gm_frag.h
rename to ompi/mca/btl/gm/btl_gm_frag.h
diff --git a/src/mca/btl/gm/btl_gm_proc.c b/ompi/mca/btl/gm/btl_gm_proc.c
similarity index 100%
rename from src/mca/btl/gm/btl_gm_proc.c
rename to ompi/mca/btl/gm/btl_gm_proc.c
diff --git a/src/mca/btl/gm/btl_gm_proc.h b/ompi/mca/btl/gm/btl_gm_proc.h
similarity index 100%
rename from src/mca/btl/gm/btl_gm_proc.h
rename to ompi/mca/btl/gm/btl_gm_proc.h
diff --git a/src/mca/btl/gm/configure.params b/ompi/mca/btl/gm/configure.params
similarity index 100%
rename from src/mca/btl/gm/configure.params
rename to ompi/mca/btl/gm/configure.params
diff --git a/src/mca/btl/gm/configure.stub b/ompi/mca/btl/gm/configure.stub
similarity index 100%
rename from src/mca/btl/gm/configure.stub
rename to ompi/mca/btl/gm/configure.stub
diff --git a/src/mca/btl/gm/gm_config.h b/ompi/mca/btl/gm/gm_config.h
similarity index 100%
rename from src/mca/btl/gm/gm_config.h
rename to ompi/mca/btl/gm/gm_config.h
diff --git a/src/mca/btl/mvapi/.ompi_ignore b/ompi/mca/btl/mvapi/.ompi_ignore
similarity index 100%
rename from src/mca/btl/mvapi/.ompi_ignore
rename to ompi/mca/btl/mvapi/.ompi_ignore
diff --git a/src/mca/btl/mvapi/.ompi_unignore b/ompi/mca/btl/mvapi/.ompi_unignore
similarity index 100%
rename from src/mca/btl/mvapi/.ompi_unignore
rename to ompi/mca/btl/mvapi/.ompi_unignore
diff --git a/src/mca/btl/mvapi/Makefile.am b/ompi/mca/btl/mvapi/Makefile.am
similarity index 100%
rename from src/mca/btl/mvapi/Makefile.am
rename to ompi/mca/btl/mvapi/Makefile.am
diff --git a/src/mca/btl/mvapi/btl_mvapi.c b/ompi/mca/btl/mvapi/btl_mvapi.c
similarity index 100%
rename from src/mca/btl/mvapi/btl_mvapi.c
rename to ompi/mca/btl/mvapi/btl_mvapi.c
diff --git a/src/mca/btl/mvapi/btl_mvapi.h b/ompi/mca/btl/mvapi/btl_mvapi.h
similarity index 100%
rename from src/mca/btl/mvapi/btl_mvapi.h
rename to ompi/mca/btl/mvapi/btl_mvapi.h
diff --git a/src/mca/btl/mvapi/btl_mvapi_component.c b/ompi/mca/btl/mvapi/btl_mvapi_component.c
similarity index 100%
rename from src/mca/btl/mvapi/btl_mvapi_component.c
rename to ompi/mca/btl/mvapi/btl_mvapi_component.c
diff --git a/src/mca/btl/mvapi/btl_mvapi_endpoint.c b/ompi/mca/btl/mvapi/btl_mvapi_endpoint.c
similarity index 100%
rename from src/mca/btl/mvapi/btl_mvapi_endpoint.c
rename to ompi/mca/btl/mvapi/btl_mvapi_endpoint.c
diff --git a/src/mca/btl/mvapi/btl_mvapi_endpoint.h b/ompi/mca/btl/mvapi/btl_mvapi_endpoint.h
similarity index 100%
rename from src/mca/btl/mvapi/btl_mvapi_endpoint.h
rename to ompi/mca/btl/mvapi/btl_mvapi_endpoint.h
diff --git a/src/mca/btl/mvapi/btl_mvapi_error.h b/ompi/mca/btl/mvapi/btl_mvapi_error.h
similarity index 100%
rename from src/mca/btl/mvapi/btl_mvapi_error.h
rename to ompi/mca/btl/mvapi/btl_mvapi_error.h
diff --git a/src/mca/btl/mvapi/btl_mvapi_frag.c b/ompi/mca/btl/mvapi/btl_mvapi_frag.c
similarity index 100%
rename from src/mca/btl/mvapi/btl_mvapi_frag.c
rename to ompi/mca/btl/mvapi/btl_mvapi_frag.c
diff --git a/src/mca/btl/mvapi/btl_mvapi_frag.h b/ompi/mca/btl/mvapi/btl_mvapi_frag.h
similarity index 100%
rename from src/mca/btl/mvapi/btl_mvapi_frag.h
rename to ompi/mca/btl/mvapi/btl_mvapi_frag.h
diff --git a/src/mca/btl/mvapi/btl_mvapi_proc.c b/ompi/mca/btl/mvapi/btl_mvapi_proc.c
similarity index 100%
rename from src/mca/btl/mvapi/btl_mvapi_proc.c
rename to ompi/mca/btl/mvapi/btl_mvapi_proc.c
diff --git a/src/mca/btl/mvapi/btl_mvapi_proc.h b/ompi/mca/btl/mvapi/btl_mvapi_proc.h
similarity index 100%
rename from src/mca/btl/mvapi/btl_mvapi_proc.h
rename to ompi/mca/btl/mvapi/btl_mvapi_proc.h
diff --git a/src/mca/btl/mvapi/configure.params b/ompi/mca/btl/mvapi/configure.params
similarity index 100%
rename from src/mca/btl/mvapi/configure.params
rename to ompi/mca/btl/mvapi/configure.params
diff --git a/src/mca/btl/mvapi/configure.stub b/ompi/mca/btl/mvapi/configure.stub
similarity index 100%
rename from src/mca/btl/mvapi/configure.stub
rename to ompi/mca/btl/mvapi/configure.stub
diff --git a/src/mca/btl/openib/Makefile.am b/ompi/mca/btl/openib/Makefile.am
similarity index 100%
rename from src/mca/btl/openib/Makefile.am
rename to ompi/mca/btl/openib/Makefile.am
diff --git a/src/mca/btl/openib/btl_openib.c b/ompi/mca/btl/openib/btl_openib.c
similarity index 100%
rename from src/mca/btl/openib/btl_openib.c
rename to ompi/mca/btl/openib/btl_openib.c
diff --git a/src/mca/btl/openib/btl_openib.h b/ompi/mca/btl/openib/btl_openib.h
similarity index 100%
rename from src/mca/btl/openib/btl_openib.h
rename to ompi/mca/btl/openib/btl_openib.h
diff --git a/src/mca/btl/openib/btl_openib_component.c b/ompi/mca/btl/openib/btl_openib_component.c
similarity index 100%
rename from src/mca/btl/openib/btl_openib_component.c
rename to ompi/mca/btl/openib/btl_openib_component.c
diff --git a/src/mca/btl/openib/btl_openib_endpoint.c b/ompi/mca/btl/openib/btl_openib_endpoint.c
similarity index 100%
rename from src/mca/btl/openib/btl_openib_endpoint.c
rename to ompi/mca/btl/openib/btl_openib_endpoint.c
diff --git a/src/mca/btl/openib/btl_openib_endpoint.h b/ompi/mca/btl/openib/btl_openib_endpoint.h
similarity index 100%
rename from src/mca/btl/openib/btl_openib_endpoint.h
rename to ompi/mca/btl/openib/btl_openib_endpoint.h
diff --git a/src/mca/btl/openib/btl_openib_error.h b/ompi/mca/btl/openib/btl_openib_error.h
similarity index 100%
rename from src/mca/btl/openib/btl_openib_error.h
rename to ompi/mca/btl/openib/btl_openib_error.h
diff --git a/src/mca/btl/openib/btl_openib_frag.c b/ompi/mca/btl/openib/btl_openib_frag.c
similarity index 100%
rename from src/mca/btl/openib/btl_openib_frag.c
rename to ompi/mca/btl/openib/btl_openib_frag.c
diff --git a/src/mca/btl/openib/btl_openib_frag.h b/ompi/mca/btl/openib/btl_openib_frag.h
similarity index 100%
rename from src/mca/btl/openib/btl_openib_frag.h
rename to ompi/mca/btl/openib/btl_openib_frag.h
diff --git a/src/mca/btl/openib/btl_openib_proc.c b/ompi/mca/btl/openib/btl_openib_proc.c
similarity index 100%
rename from src/mca/btl/openib/btl_openib_proc.c
rename to ompi/mca/btl/openib/btl_openib_proc.c
diff --git a/src/mca/btl/openib/btl_openib_proc.h b/ompi/mca/btl/openib/btl_openib_proc.h
similarity index 100%
rename from src/mca/btl/openib/btl_openib_proc.h
rename to ompi/mca/btl/openib/btl_openib_proc.h
diff --git a/src/mca/btl/openib/configure.params b/ompi/mca/btl/openib/configure.params
similarity index 100%
rename from src/mca/btl/openib/configure.params
rename to ompi/mca/btl/openib/configure.params
diff --git a/src/mca/btl/openib/configure.stub b/ompi/mca/btl/openib/configure.stub
similarity index 100%
rename from src/mca/btl/openib/configure.stub
rename to ompi/mca/btl/openib/configure.stub
diff --git a/src/mca/btl/portals/.ompi_ignore b/ompi/mca/btl/portals/.ompi_ignore
similarity index 100%
rename from src/mca/btl/portals/.ompi_ignore
rename to ompi/mca/btl/portals/.ompi_ignore
diff --git a/src/mca/btl/portals/.ompi_unignore b/ompi/mca/btl/portals/.ompi_unignore
similarity index 100%
rename from src/mca/btl/portals/.ompi_unignore
rename to ompi/mca/btl/portals/.ompi_unignore
diff --git a/src/mca/btl/portals/Makefile.am b/ompi/mca/btl/portals/Makefile.am
similarity index 100%
rename from src/mca/btl/portals/Makefile.am
rename to ompi/mca/btl/portals/Makefile.am
diff --git a/src/mca/btl/portals/configure.params b/ompi/mca/btl/portals/configure.params
similarity index 100%
rename from src/mca/btl/portals/configure.params
rename to ompi/mca/btl/portals/configure.params
diff --git a/src/mca/btl/portals/configure.stub b/ompi/mca/btl/portals/configure.stub
similarity index 100%
rename from src/mca/btl/portals/configure.stub
rename to ompi/mca/btl/portals/configure.stub
diff --git a/src/mca/btl/portals/src/btl_portals.c b/ompi/mca/btl/portals/src/btl_portals.c
similarity index 100%
rename from src/mca/btl/portals/src/btl_portals.c
rename to ompi/mca/btl/portals/src/btl_portals.c
diff --git a/src/mca/btl/portals/src/btl_portals.h b/ompi/mca/btl/portals/src/btl_portals.h
similarity index 100%
rename from src/mca/btl/portals/src/btl_portals.h
rename to ompi/mca/btl/portals/src/btl_portals.h
diff --git a/src/mca/btl/portals/src/btl_portals_compat.h b/ompi/mca/btl/portals/src/btl_portals_compat.h
similarity index 100%
rename from src/mca/btl/portals/src/btl_portals_compat.h
rename to ompi/mca/btl/portals/src/btl_portals_compat.h
diff --git a/src/mca/btl/portals/src/btl_portals_compat_redstorm.c b/ompi/mca/btl/portals/src/btl_portals_compat_redstorm.c
similarity index 100%
rename from src/mca/btl/portals/src/btl_portals_compat_redstorm.c
rename to ompi/mca/btl/portals/src/btl_portals_compat_redstorm.c
diff --git a/src/mca/btl/portals/src/btl_portals_compat_utcp.c b/ompi/mca/btl/portals/src/btl_portals_compat_utcp.c
similarity index 100%
rename from src/mca/btl/portals/src/btl_portals_compat_utcp.c
rename to ompi/mca/btl/portals/src/btl_portals_compat_utcp.c
diff --git a/src/mca/btl/portals/src/btl_portals_component.c b/ompi/mca/btl/portals/src/btl_portals_component.c
similarity index 100%
rename from src/mca/btl/portals/src/btl_portals_component.c
rename to ompi/mca/btl/portals/src/btl_portals_component.c
diff --git a/src/mca/btl/portals/src/btl_portals_stubs.c b/ompi/mca/btl/portals/src/btl_portals_stubs.c
similarity index 100%
rename from src/mca/btl/portals/src/btl_portals_stubs.c
rename to ompi/mca/btl/portals/src/btl_portals_stubs.c
diff --git a/src/mca/btl/self/.ompi_ignore b/ompi/mca/btl/self/.ompi_ignore
similarity index 100%
rename from src/mca/btl/self/.ompi_ignore
rename to ompi/mca/btl/self/.ompi_ignore
diff --git a/src/mca/btl/self/.ompi_unignore b/ompi/mca/btl/self/.ompi_unignore
similarity index 100%
rename from src/mca/btl/self/.ompi_unignore
rename to ompi/mca/btl/self/.ompi_unignore
diff --git a/src/mca/btl/self/Makefile.am b/ompi/mca/btl/self/Makefile.am
similarity index 100%
rename from src/mca/btl/self/Makefile.am
rename to ompi/mca/btl/self/Makefile.am
diff --git a/src/mca/btl/self/btl_self.c b/ompi/mca/btl/self/btl_self.c
similarity index 100%
rename from src/mca/btl/self/btl_self.c
rename to ompi/mca/btl/self/btl_self.c
diff --git a/src/mca/btl/self/btl_self.h b/ompi/mca/btl/self/btl_self.h
similarity index 100%
rename from src/mca/btl/self/btl_self.h
rename to ompi/mca/btl/self/btl_self.h
diff --git a/src/mca/btl/self/btl_self_component.c b/ompi/mca/btl/self/btl_self_component.c
similarity index 100%
rename from src/mca/btl/self/btl_self_component.c
rename to ompi/mca/btl/self/btl_self_component.c
diff --git a/src/mca/btl/self/btl_self_frag.c b/ompi/mca/btl/self/btl_self_frag.c
similarity index 100%
rename from src/mca/btl/self/btl_self_frag.c
rename to ompi/mca/btl/self/btl_self_frag.c
diff --git a/src/mca/btl/self/btl_self_frag.h b/ompi/mca/btl/self/btl_self_frag.h
similarity index 100%
rename from src/mca/btl/self/btl_self_frag.h
rename to ompi/mca/btl/self/btl_self_frag.h
diff --git a/src/mca/btl/self/btl_sm_endpoint.h b/ompi/mca/btl/self/btl_sm_endpoint.h
similarity index 100%
rename from src/mca/btl/self/btl_sm_endpoint.h
rename to ompi/mca/btl/self/btl_sm_endpoint.h
diff --git a/src/mca/btl/self/configure.params b/ompi/mca/btl/self/configure.params
similarity index 100%
rename from src/mca/btl/self/configure.params
rename to ompi/mca/btl/self/configure.params
diff --git a/src/mca/btl/sm/.ompi_ignore b/ompi/mca/btl/sm/.ompi_ignore
similarity index 100%
rename from src/mca/btl/sm/.ompi_ignore
rename to ompi/mca/btl/sm/.ompi_ignore
diff --git a/src/mca/btl/sm/.ompi_unignore b/ompi/mca/btl/sm/.ompi_unignore
similarity index 100%
rename from src/mca/btl/sm/.ompi_unignore
rename to ompi/mca/btl/sm/.ompi_unignore
diff --git a/src/mca/btl/sm/Makefile.am b/ompi/mca/btl/sm/Makefile.am
similarity index 100%
rename from src/mca/btl/sm/Makefile.am
rename to ompi/mca/btl/sm/Makefile.am
diff --git a/src/mca/btl/sm/btl_sm.c b/ompi/mca/btl/sm/btl_sm.c
similarity index 100%
rename from src/mca/btl/sm/btl_sm.c
rename to ompi/mca/btl/sm/btl_sm.c
diff --git a/src/mca/btl/sm/btl_sm.h b/ompi/mca/btl/sm/btl_sm.h
similarity index 100%
rename from src/mca/btl/sm/btl_sm.h
rename to ompi/mca/btl/sm/btl_sm.h
diff --git a/src/mca/btl/sm/btl_sm_component.c b/ompi/mca/btl/sm/btl_sm_component.c
similarity index 100%
rename from src/mca/btl/sm/btl_sm_component.c
rename to ompi/mca/btl/sm/btl_sm_component.c
diff --git a/src/mca/btl/sm/btl_sm_endpoint.h b/ompi/mca/btl/sm/btl_sm_endpoint.h
similarity index 100%
rename from src/mca/btl/sm/btl_sm_endpoint.h
rename to ompi/mca/btl/sm/btl_sm_endpoint.h
diff --git a/src/mca/btl/sm/btl_sm_fifo.h b/ompi/mca/btl/sm/btl_sm_fifo.h
similarity index 100%
rename from src/mca/btl/sm/btl_sm_fifo.h
rename to ompi/mca/btl/sm/btl_sm_fifo.h
diff --git a/src/mca/btl/sm/btl_sm_frag.c b/ompi/mca/btl/sm/btl_sm_frag.c
similarity index 100%
rename from src/mca/btl/sm/btl_sm_frag.c
rename to ompi/mca/btl/sm/btl_sm_frag.c
diff --git a/src/mca/btl/sm/btl_sm_frag.h b/ompi/mca/btl/sm/btl_sm_frag.h
similarity index 100%
rename from src/mca/btl/sm/btl_sm_frag.h
rename to ompi/mca/btl/sm/btl_sm_frag.h
diff --git a/src/mca/btl/sm/configure.params b/ompi/mca/btl/sm/configure.params
similarity index 100%
rename from src/mca/btl/sm/configure.params
rename to ompi/mca/btl/sm/configure.params
diff --git a/src/mca/btl/template/.ompi_ignore b/ompi/mca/btl/template/.ompi_ignore
similarity index 100%
rename from src/mca/btl/template/.ompi_ignore
rename to ompi/mca/btl/template/.ompi_ignore
diff --git a/src/mca/btl/template/.ompi_unignore b/ompi/mca/btl/template/.ompi_unignore
similarity index 100%
rename from src/mca/btl/template/.ompi_unignore
rename to ompi/mca/btl/template/.ompi_unignore
diff --git a/src/mca/btl/template/Makefile.am b/ompi/mca/btl/template/Makefile.am
similarity index 100%
rename from src/mca/btl/template/Makefile.am
rename to ompi/mca/btl/template/Makefile.am
diff --git a/src/mca/btl/template/btl_template.c b/ompi/mca/btl/template/btl_template.c
similarity index 100%
rename from src/mca/btl/template/btl_template.c
rename to ompi/mca/btl/template/btl_template.c
diff --git a/src/mca/btl/template/btl_template.h b/ompi/mca/btl/template/btl_template.h
similarity index 100%
rename from src/mca/btl/template/btl_template.h
rename to ompi/mca/btl/template/btl_template.h
diff --git a/src/mca/btl/template/btl_template_component.c b/ompi/mca/btl/template/btl_template_component.c
similarity index 100%
rename from src/mca/btl/template/btl_template_component.c
rename to ompi/mca/btl/template/btl_template_component.c
diff --git a/src/mca/btl/template/btl_template_endpoint.c b/ompi/mca/btl/template/btl_template_endpoint.c
similarity index 100%
rename from src/mca/btl/template/btl_template_endpoint.c
rename to ompi/mca/btl/template/btl_template_endpoint.c
diff --git a/src/mca/btl/template/btl_template_endpoint.h b/ompi/mca/btl/template/btl_template_endpoint.h
similarity index 100%
rename from src/mca/btl/template/btl_template_endpoint.h
rename to ompi/mca/btl/template/btl_template_endpoint.h
diff --git a/src/mca/btl/template/btl_template_frag.c b/ompi/mca/btl/template/btl_template_frag.c
similarity index 100%
rename from src/mca/btl/template/btl_template_frag.c
rename to ompi/mca/btl/template/btl_template_frag.c
diff --git a/src/mca/btl/template/btl_template_frag.h b/ompi/mca/btl/template/btl_template_frag.h
similarity index 100%
rename from src/mca/btl/template/btl_template_frag.h
rename to ompi/mca/btl/template/btl_template_frag.h
diff --git a/src/mca/btl/template/btl_template_proc.c b/ompi/mca/btl/template/btl_template_proc.c
similarity index 100%
rename from src/mca/btl/template/btl_template_proc.c
rename to ompi/mca/btl/template/btl_template_proc.c
diff --git a/src/mca/btl/template/btl_template_proc.h b/ompi/mca/btl/template/btl_template_proc.h
similarity index 100%
rename from src/mca/btl/template/btl_template_proc.h
rename to ompi/mca/btl/template/btl_template_proc.h
diff --git a/src/mca/btl/template/configure.params b/ompi/mca/btl/template/configure.params
similarity index 100%
rename from src/mca/btl/template/configure.params
rename to ompi/mca/btl/template/configure.params
diff --git a/src/mca/coll/Makefile.am b/ompi/mca/coll/Makefile.am
similarity index 100%
rename from src/mca/coll/Makefile.am
rename to ompi/mca/coll/Makefile.am
diff --git a/src/mca/coll/base/Makefile.am b/ompi/mca/coll/base/Makefile.am
similarity index 100%
rename from src/mca/coll/base/Makefile.am
rename to ompi/mca/coll/base/Makefile.am
diff --git a/src/mca/coll/base/base.h b/ompi/mca/coll/base/base.h
similarity index 100%
rename from src/mca/coll/base/base.h
rename to ompi/mca/coll/base/base.h
diff --git a/src/mca/coll/base/coll_base_close.c b/ompi/mca/coll/base/coll_base_close.c
similarity index 100%
rename from src/mca/coll/base/coll_base_close.c
rename to ompi/mca/coll/base/coll_base_close.c
diff --git a/src/mca/coll/base/coll_base_comm_select.c b/ompi/mca/coll/base/coll_base_comm_select.c
similarity index 100%
rename from src/mca/coll/base/coll_base_comm_select.c
rename to ompi/mca/coll/base/coll_base_comm_select.c
diff --git a/src/mca/coll/base/coll_base_comm_unselect.c b/ompi/mca/coll/base/coll_base_comm_unselect.c
similarity index 100%
rename from src/mca/coll/base/coll_base_comm_unselect.c
rename to ompi/mca/coll/base/coll_base_comm_unselect.c
diff --git a/src/mca/coll/base/coll_base_find_available.c b/ompi/mca/coll/base/coll_base_find_available.c
similarity index 100%
rename from src/mca/coll/base/coll_base_find_available.c
rename to ompi/mca/coll/base/coll_base_find_available.c
diff --git a/src/mca/coll/base/coll_base_open.c b/ompi/mca/coll/base/coll_base_open.c
similarity index 100%
rename from src/mca/coll/base/coll_base_open.c
rename to ompi/mca/coll/base/coll_base_open.c
diff --git a/src/mca/coll/base/coll_tags.h b/ompi/mca/coll/base/coll_tags.h
similarity index 100%
rename from src/mca/coll/base/coll_tags.h
rename to ompi/mca/coll/base/coll_tags.h
diff --git a/src/mca/coll/base/help-mca-coll-base.txt b/ompi/mca/coll/base/help-mca-coll-base.txt
similarity index 100%
rename from src/mca/coll/base/help-mca-coll-base.txt
rename to ompi/mca/coll/base/help-mca-coll-base.txt
diff --git a/src/mca/coll/basic/Makefile.am b/ompi/mca/coll/basic/Makefile.am
similarity index 100%
rename from src/mca/coll/basic/Makefile.am
rename to ompi/mca/coll/basic/Makefile.am
diff --git a/src/mca/coll/basic/VERSION b/ompi/mca/coll/basic/VERSION
similarity index 100%
rename from src/mca/coll/basic/VERSION
rename to ompi/mca/coll/basic/VERSION
diff --git a/src/mca/coll/basic/coll_basic.h b/ompi/mca/coll/basic/coll_basic.h
similarity index 100%
rename from src/mca/coll/basic/coll_basic.h
rename to ompi/mca/coll/basic/coll_basic.h
diff --git a/src/mca/coll/basic/coll_basic_allgather.c b/ompi/mca/coll/basic/coll_basic_allgather.c
similarity index 100%
rename from src/mca/coll/basic/coll_basic_allgather.c
rename to ompi/mca/coll/basic/coll_basic_allgather.c
diff --git a/src/mca/coll/basic/coll_basic_allgatherv.c b/ompi/mca/coll/basic/coll_basic_allgatherv.c
similarity index 100%
rename from src/mca/coll/basic/coll_basic_allgatherv.c
rename to ompi/mca/coll/basic/coll_basic_allgatherv.c
diff --git a/src/mca/coll/basic/coll_basic_allreduce.c b/ompi/mca/coll/basic/coll_basic_allreduce.c
similarity index 100%
rename from src/mca/coll/basic/coll_basic_allreduce.c
rename to ompi/mca/coll/basic/coll_basic_allreduce.c
diff --git a/src/mca/coll/basic/coll_basic_alltoall.c b/ompi/mca/coll/basic/coll_basic_alltoall.c
similarity index 100%
rename from src/mca/coll/basic/coll_basic_alltoall.c
rename to ompi/mca/coll/basic/coll_basic_alltoall.c
diff --git a/src/mca/coll/basic/coll_basic_alltoallv.c b/ompi/mca/coll/basic/coll_basic_alltoallv.c
similarity index 100%
rename from src/mca/coll/basic/coll_basic_alltoallv.c
rename to ompi/mca/coll/basic/coll_basic_alltoallv.c
diff --git a/src/mca/coll/basic/coll_basic_alltoallw.c b/ompi/mca/coll/basic/coll_basic_alltoallw.c
similarity index 100%
rename from src/mca/coll/basic/coll_basic_alltoallw.c
rename to ompi/mca/coll/basic/coll_basic_alltoallw.c
diff --git a/src/mca/coll/basic/coll_basic_barrier.c b/ompi/mca/coll/basic/coll_basic_barrier.c
similarity index 100%
rename from src/mca/coll/basic/coll_basic_barrier.c
rename to ompi/mca/coll/basic/coll_basic_barrier.c
diff --git a/src/mca/coll/basic/coll_basic_bcast.c b/ompi/mca/coll/basic/coll_basic_bcast.c
similarity index 100%
rename from src/mca/coll/basic/coll_basic_bcast.c
rename to ompi/mca/coll/basic/coll_basic_bcast.c
diff --git a/src/mca/coll/basic/coll_basic_component.c b/ompi/mca/coll/basic/coll_basic_component.c
similarity index 100%
rename from src/mca/coll/basic/coll_basic_component.c
rename to ompi/mca/coll/basic/coll_basic_component.c
diff --git a/src/mca/coll/basic/coll_basic_exscan.c b/ompi/mca/coll/basic/coll_basic_exscan.c
similarity index 100%
rename from src/mca/coll/basic/coll_basic_exscan.c
rename to ompi/mca/coll/basic/coll_basic_exscan.c
diff --git a/src/mca/coll/basic/coll_basic_gather.c b/ompi/mca/coll/basic/coll_basic_gather.c
similarity index 100%
rename from src/mca/coll/basic/coll_basic_gather.c
rename to ompi/mca/coll/basic/coll_basic_gather.c
diff --git a/src/mca/coll/basic/coll_basic_gatherv.c b/ompi/mca/coll/basic/coll_basic_gatherv.c
similarity index 100%
rename from src/mca/coll/basic/coll_basic_gatherv.c
rename to ompi/mca/coll/basic/coll_basic_gatherv.c
diff --git a/src/mca/coll/basic/coll_basic_module.c b/ompi/mca/coll/basic/coll_basic_module.c
similarity index 100%
rename from src/mca/coll/basic/coll_basic_module.c
rename to ompi/mca/coll/basic/coll_basic_module.c
diff --git a/src/mca/coll/basic/coll_basic_reduce.c b/ompi/mca/coll/basic/coll_basic_reduce.c
similarity index 100%
rename from src/mca/coll/basic/coll_basic_reduce.c
rename to ompi/mca/coll/basic/coll_basic_reduce.c
diff --git a/src/mca/coll/basic/coll_basic_reduce_scatter.c b/ompi/mca/coll/basic/coll_basic_reduce_scatter.c
similarity index 100%
rename from src/mca/coll/basic/coll_basic_reduce_scatter.c
rename to ompi/mca/coll/basic/coll_basic_reduce_scatter.c
diff --git a/src/mca/coll/basic/coll_basic_scan.c b/ompi/mca/coll/basic/coll_basic_scan.c
similarity index 100%
rename from src/mca/coll/basic/coll_basic_scan.c
rename to ompi/mca/coll/basic/coll_basic_scan.c
diff --git a/src/mca/coll/basic/coll_basic_scatter.c b/ompi/mca/coll/basic/coll_basic_scatter.c
similarity index 100%
rename from src/mca/coll/basic/coll_basic_scatter.c
rename to ompi/mca/coll/basic/coll_basic_scatter.c
diff --git a/src/mca/coll/basic/coll_basic_scatterv.c b/ompi/mca/coll/basic/coll_basic_scatterv.c
similarity index 100%
rename from src/mca/coll/basic/coll_basic_scatterv.c
rename to ompi/mca/coll/basic/coll_basic_scatterv.c
diff --git a/src/mca/coll/basic/configure.params b/ompi/mca/coll/basic/configure.params
similarity index 100%
rename from src/mca/coll/basic/configure.params
rename to ompi/mca/coll/basic/configure.params
diff --git a/src/mca/coll/coll.h b/ompi/mca/coll/coll.h
similarity index 100%
rename from src/mca/coll/coll.h
rename to ompi/mca/coll/coll.h
diff --git a/src/mca/coll/demo/.ompi_ignore b/ompi/mca/coll/demo/.ompi_ignore
similarity index 100%
rename from src/mca/coll/demo/.ompi_ignore
rename to ompi/mca/coll/demo/.ompi_ignore
diff --git a/src/mca/coll/demo/Makefile.am b/ompi/mca/coll/demo/Makefile.am
similarity index 100%
rename from src/mca/coll/demo/Makefile.am
rename to ompi/mca/coll/demo/Makefile.am
diff --git a/src/mca/coll/demo/VERSION b/ompi/mca/coll/demo/VERSION
similarity index 100%
rename from src/mca/coll/demo/VERSION
rename to ompi/mca/coll/demo/VERSION
diff --git a/src/mca/coll/demo/coll_demo.h b/ompi/mca/coll/demo/coll_demo.h
similarity index 100%
rename from src/mca/coll/demo/coll_demo.h
rename to ompi/mca/coll/demo/coll_demo.h
diff --git a/src/mca/coll/demo/coll_demo_allgather.c b/ompi/mca/coll/demo/coll_demo_allgather.c
similarity index 100%
rename from src/mca/coll/demo/coll_demo_allgather.c
rename to ompi/mca/coll/demo/coll_demo_allgather.c
diff --git a/src/mca/coll/demo/coll_demo_allgatherv.c b/ompi/mca/coll/demo/coll_demo_allgatherv.c
similarity index 100%
rename from src/mca/coll/demo/coll_demo_allgatherv.c
rename to ompi/mca/coll/demo/coll_demo_allgatherv.c
diff --git a/src/mca/coll/demo/coll_demo_allreduce.c b/ompi/mca/coll/demo/coll_demo_allreduce.c
similarity index 100%
rename from src/mca/coll/demo/coll_demo_allreduce.c
rename to ompi/mca/coll/demo/coll_demo_allreduce.c
diff --git a/src/mca/coll/demo/coll_demo_alltoall.c b/ompi/mca/coll/demo/coll_demo_alltoall.c
similarity index 100%
rename from src/mca/coll/demo/coll_demo_alltoall.c
rename to ompi/mca/coll/demo/coll_demo_alltoall.c
diff --git a/src/mca/coll/demo/coll_demo_alltoallv.c b/ompi/mca/coll/demo/coll_demo_alltoallv.c
similarity index 100%
rename from src/mca/coll/demo/coll_demo_alltoallv.c
rename to ompi/mca/coll/demo/coll_demo_alltoallv.c
diff --git a/src/mca/coll/demo/coll_demo_alltoallw.c b/ompi/mca/coll/demo/coll_demo_alltoallw.c
similarity index 100%
rename from src/mca/coll/demo/coll_demo_alltoallw.c
rename to ompi/mca/coll/demo/coll_demo_alltoallw.c
diff --git a/src/mca/coll/demo/coll_demo_barrier.c b/ompi/mca/coll/demo/coll_demo_barrier.c
similarity index 100%
rename from src/mca/coll/demo/coll_demo_barrier.c
rename to ompi/mca/coll/demo/coll_demo_barrier.c
diff --git a/src/mca/coll/demo/coll_demo_bcast.c b/ompi/mca/coll/demo/coll_demo_bcast.c
similarity index 100%
rename from src/mca/coll/demo/coll_demo_bcast.c
rename to ompi/mca/coll/demo/coll_demo_bcast.c
diff --git a/src/mca/coll/demo/coll_demo_component.c b/ompi/mca/coll/demo/coll_demo_component.c
similarity index 100%
rename from src/mca/coll/demo/coll_demo_component.c
rename to ompi/mca/coll/demo/coll_demo_component.c
diff --git a/src/mca/coll/demo/coll_demo_exscan.c b/ompi/mca/coll/demo/coll_demo_exscan.c
similarity index 100%
rename from src/mca/coll/demo/coll_demo_exscan.c
rename to ompi/mca/coll/demo/coll_demo_exscan.c
diff --git a/src/mca/coll/demo/coll_demo_gather.c b/ompi/mca/coll/demo/coll_demo_gather.c
similarity index 100%
rename from src/mca/coll/demo/coll_demo_gather.c
rename to ompi/mca/coll/demo/coll_demo_gather.c
diff --git a/src/mca/coll/demo/coll_demo_gatherv.c b/ompi/mca/coll/demo/coll_demo_gatherv.c
similarity index 100%
rename from src/mca/coll/demo/coll_demo_gatherv.c
rename to ompi/mca/coll/demo/coll_demo_gatherv.c
diff --git a/src/mca/coll/demo/coll_demo_module.c b/ompi/mca/coll/demo/coll_demo_module.c
similarity index 100%
rename from src/mca/coll/demo/coll_demo_module.c
rename to ompi/mca/coll/demo/coll_demo_module.c
diff --git a/src/mca/coll/demo/coll_demo_reduce.c b/ompi/mca/coll/demo/coll_demo_reduce.c
similarity index 100%
rename from src/mca/coll/demo/coll_demo_reduce.c
rename to ompi/mca/coll/demo/coll_demo_reduce.c
diff --git a/src/mca/coll/demo/coll_demo_reduce_scatter.c b/ompi/mca/coll/demo/coll_demo_reduce_scatter.c
similarity index 100%
rename from src/mca/coll/demo/coll_demo_reduce_scatter.c
rename to ompi/mca/coll/demo/coll_demo_reduce_scatter.c
diff --git a/src/mca/coll/demo/coll_demo_scan.c b/ompi/mca/coll/demo/coll_demo_scan.c
similarity index 100%
rename from src/mca/coll/demo/coll_demo_scan.c
rename to ompi/mca/coll/demo/coll_demo_scan.c
diff --git a/src/mca/coll/demo/coll_demo_scatter.c b/ompi/mca/coll/demo/coll_demo_scatter.c
similarity index 100%
rename from src/mca/coll/demo/coll_demo_scatter.c
rename to ompi/mca/coll/demo/coll_demo_scatter.c
diff --git a/src/mca/coll/demo/coll_demo_scatterv.c b/ompi/mca/coll/demo/coll_demo_scatterv.c
similarity index 100%
rename from src/mca/coll/demo/coll_demo_scatterv.c
rename to ompi/mca/coll/demo/coll_demo_scatterv.c
diff --git a/src/mca/coll/demo/configure.params b/ompi/mca/coll/demo/configure.params
similarity index 100%
rename from src/mca/coll/demo/configure.params
rename to ompi/mca/coll/demo/configure.params
diff --git a/src/mca/coll/demo/configure.stub b/ompi/mca/coll/demo/configure.stub
similarity index 100%
rename from src/mca/coll/demo/configure.stub
rename to ompi/mca/coll/demo/configure.stub
diff --git a/src/mca/coll/hierarch/.ompi_ignore b/ompi/mca/coll/hierarch/.ompi_ignore
similarity index 100%
rename from src/mca/coll/hierarch/.ompi_ignore
rename to ompi/mca/coll/hierarch/.ompi_ignore
diff --git a/src/mca/coll/hierarch/Makefile.am b/ompi/mca/coll/hierarch/Makefile.am
similarity index 100%
rename from src/mca/coll/hierarch/Makefile.am
rename to ompi/mca/coll/hierarch/Makefile.am
diff --git a/src/mca/coll/hierarch/VERSION b/ompi/mca/coll/hierarch/VERSION
similarity index 100%
rename from src/mca/coll/hierarch/VERSION
rename to ompi/mca/coll/hierarch/VERSION
diff --git a/src/mca/coll/hierarch/coll_hierarch.c b/ompi/mca/coll/hierarch/coll_hierarch.c
similarity index 100%
rename from src/mca/coll/hierarch/coll_hierarch.c
rename to ompi/mca/coll/hierarch/coll_hierarch.c
diff --git a/src/mca/coll/hierarch/coll_hierarch.h b/ompi/mca/coll/hierarch/coll_hierarch.h
similarity index 100%
rename from src/mca/coll/hierarch/coll_hierarch.h
rename to ompi/mca/coll/hierarch/coll_hierarch.h
diff --git a/src/mca/coll/hierarch/coll_hierarch_barrier.c b/ompi/mca/coll/hierarch/coll_hierarch_barrier.c
similarity index 100%
rename from src/mca/coll/hierarch/coll_hierarch_barrier.c
rename to ompi/mca/coll/hierarch/coll_hierarch_barrier.c
diff --git a/src/mca/coll/hierarch/coll_hierarch_bcast.c b/ompi/mca/coll/hierarch/coll_hierarch_bcast.c
similarity index 100%
rename from src/mca/coll/hierarch/coll_hierarch_bcast.c
rename to ompi/mca/coll/hierarch/coll_hierarch_bcast.c
diff --git a/src/mca/coll/hierarch/coll_hierarch_component.c b/ompi/mca/coll/hierarch/coll_hierarch_component.c
similarity index 100%
rename from src/mca/coll/hierarch/coll_hierarch_component.c
rename to ompi/mca/coll/hierarch/coll_hierarch_component.c
diff --git a/src/mca/coll/hierarch/coll_hierarch_reduce.c b/ompi/mca/coll/hierarch/coll_hierarch_reduce.c
similarity index 100%
rename from src/mca/coll/hierarch/coll_hierarch_reduce.c
rename to ompi/mca/coll/hierarch/coll_hierarch_reduce.c
diff --git a/src/mca/coll/hierarch/configure.params b/ompi/mca/coll/hierarch/configure.params
similarity index 100%
rename from src/mca/coll/hierarch/configure.params
rename to ompi/mca/coll/hierarch/configure.params
diff --git a/src/mca/coll/hierarch/configure.stub b/ompi/mca/coll/hierarch/configure.stub
similarity index 100%
rename from src/mca/coll/hierarch/configure.stub
rename to ompi/mca/coll/hierarch/configure.stub
diff --git a/src/mca/coll/self/Makefile.am b/ompi/mca/coll/self/Makefile.am
similarity index 100%
rename from src/mca/coll/self/Makefile.am
rename to ompi/mca/coll/self/Makefile.am
diff --git a/src/mca/coll/self/VERSION b/ompi/mca/coll/self/VERSION
similarity index 100%
rename from src/mca/coll/self/VERSION
rename to ompi/mca/coll/self/VERSION
diff --git a/src/mca/coll/self/coll_self.h b/ompi/mca/coll/self/coll_self.h
similarity index 100%
rename from src/mca/coll/self/coll_self.h
rename to ompi/mca/coll/self/coll_self.h
diff --git a/src/mca/coll/self/coll_self_allgather.c b/ompi/mca/coll/self/coll_self_allgather.c
similarity index 100%
rename from src/mca/coll/self/coll_self_allgather.c
rename to ompi/mca/coll/self/coll_self_allgather.c
diff --git a/src/mca/coll/self/coll_self_allgatherv.c b/ompi/mca/coll/self/coll_self_allgatherv.c
similarity index 100%
rename from src/mca/coll/self/coll_self_allgatherv.c
rename to ompi/mca/coll/self/coll_self_allgatherv.c
diff --git a/src/mca/coll/self/coll_self_allreduce.c b/ompi/mca/coll/self/coll_self_allreduce.c
similarity index 100%
rename from src/mca/coll/self/coll_self_allreduce.c
rename to ompi/mca/coll/self/coll_self_allreduce.c
diff --git a/src/mca/coll/self/coll_self_alltoall.c b/ompi/mca/coll/self/coll_self_alltoall.c
similarity index 100%
rename from src/mca/coll/self/coll_self_alltoall.c
rename to ompi/mca/coll/self/coll_self_alltoall.c
diff --git a/src/mca/coll/self/coll_self_alltoallv.c b/ompi/mca/coll/self/coll_self_alltoallv.c
similarity index 100%
rename from src/mca/coll/self/coll_self_alltoallv.c
rename to ompi/mca/coll/self/coll_self_alltoallv.c
diff --git a/src/mca/coll/self/coll_self_alltoallw.c b/ompi/mca/coll/self/coll_self_alltoallw.c
similarity index 100%
rename from src/mca/coll/self/coll_self_alltoallw.c
rename to ompi/mca/coll/self/coll_self_alltoallw.c
diff --git a/src/mca/coll/self/coll_self_barrier.c b/ompi/mca/coll/self/coll_self_barrier.c
similarity index 100%
rename from src/mca/coll/self/coll_self_barrier.c
rename to ompi/mca/coll/self/coll_self_barrier.c
diff --git a/src/mca/coll/self/coll_self_bcast.c b/ompi/mca/coll/self/coll_self_bcast.c
similarity index 100%
rename from src/mca/coll/self/coll_self_bcast.c
rename to ompi/mca/coll/self/coll_self_bcast.c
diff --git a/src/mca/coll/self/coll_self_component.c b/ompi/mca/coll/self/coll_self_component.c
similarity index 100%
rename from src/mca/coll/self/coll_self_component.c
rename to ompi/mca/coll/self/coll_self_component.c
diff --git a/src/mca/coll/self/coll_self_exscan.c b/ompi/mca/coll/self/coll_self_exscan.c
similarity index 100%
rename from src/mca/coll/self/coll_self_exscan.c
rename to ompi/mca/coll/self/coll_self_exscan.c
diff --git a/src/mca/coll/self/coll_self_gather.c b/ompi/mca/coll/self/coll_self_gather.c
similarity index 100%
rename from src/mca/coll/self/coll_self_gather.c
rename to ompi/mca/coll/self/coll_self_gather.c
diff --git a/src/mca/coll/self/coll_self_gatherv.c b/ompi/mca/coll/self/coll_self_gatherv.c
similarity index 100%
rename from src/mca/coll/self/coll_self_gatherv.c
rename to ompi/mca/coll/self/coll_self_gatherv.c
diff --git a/src/mca/coll/self/coll_self_module.c b/ompi/mca/coll/self/coll_self_module.c
similarity index 100%
rename from src/mca/coll/self/coll_self_module.c
rename to ompi/mca/coll/self/coll_self_module.c
diff --git a/src/mca/coll/self/coll_self_reduce.c b/ompi/mca/coll/self/coll_self_reduce.c
similarity index 100%
rename from src/mca/coll/self/coll_self_reduce.c
rename to ompi/mca/coll/self/coll_self_reduce.c
diff --git a/src/mca/coll/self/coll_self_reduce_scatter.c b/ompi/mca/coll/self/coll_self_reduce_scatter.c
similarity index 100%
rename from src/mca/coll/self/coll_self_reduce_scatter.c
rename to ompi/mca/coll/self/coll_self_reduce_scatter.c
diff --git a/src/mca/coll/self/coll_self_scan.c b/ompi/mca/coll/self/coll_self_scan.c
similarity index 100%
rename from src/mca/coll/self/coll_self_scan.c
rename to ompi/mca/coll/self/coll_self_scan.c
diff --git a/src/mca/coll/self/coll_self_scatter.c b/ompi/mca/coll/self/coll_self_scatter.c
similarity index 100%
rename from src/mca/coll/self/coll_self_scatter.c
rename to ompi/mca/coll/self/coll_self_scatter.c
diff --git a/src/mca/coll/self/coll_self_scatterv.c b/ompi/mca/coll/self/coll_self_scatterv.c
similarity index 100%
rename from src/mca/coll/self/coll_self_scatterv.c
rename to ompi/mca/coll/self/coll_self_scatterv.c
diff --git a/src/mca/coll/self/configure.params b/ompi/mca/coll/self/configure.params
similarity index 100%
rename from src/mca/coll/self/configure.params
rename to ompi/mca/coll/self/configure.params
diff --git a/src/mca/coll/sm/.ompi_ignore b/ompi/mca/coll/sm/.ompi_ignore
similarity index 100%
rename from src/mca/coll/sm/.ompi_ignore
rename to ompi/mca/coll/sm/.ompi_ignore
diff --git a/src/mca/coll/sm/.ompi_unignore b/ompi/mca/coll/sm/.ompi_unignore
similarity index 100%
rename from src/mca/coll/sm/.ompi_unignore
rename to ompi/mca/coll/sm/.ompi_unignore
diff --git a/src/mca/coll/sm/Makefile.am b/ompi/mca/coll/sm/Makefile.am
similarity index 100%
rename from src/mca/coll/sm/Makefile.am
rename to ompi/mca/coll/sm/Makefile.am
diff --git a/src/mca/coll/sm/VERSION b/ompi/mca/coll/sm/VERSION
similarity index 100%
rename from src/mca/coll/sm/VERSION
rename to ompi/mca/coll/sm/VERSION
diff --git a/src/mca/coll/sm/coll_sm.h b/ompi/mca/coll/sm/coll_sm.h
similarity index 100%
rename from src/mca/coll/sm/coll_sm.h
rename to ompi/mca/coll/sm/coll_sm.h
diff --git a/src/mca/coll/sm/coll_sm_allgather.c b/ompi/mca/coll/sm/coll_sm_allgather.c
similarity index 100%
rename from src/mca/coll/sm/coll_sm_allgather.c
rename to ompi/mca/coll/sm/coll_sm_allgather.c
diff --git a/src/mca/coll/sm/coll_sm_allgatherv.c b/ompi/mca/coll/sm/coll_sm_allgatherv.c
similarity index 100%
rename from src/mca/coll/sm/coll_sm_allgatherv.c
rename to ompi/mca/coll/sm/coll_sm_allgatherv.c
diff --git a/src/mca/coll/sm/coll_sm_allreduce.c b/ompi/mca/coll/sm/coll_sm_allreduce.c
similarity index 100%
rename from src/mca/coll/sm/coll_sm_allreduce.c
rename to ompi/mca/coll/sm/coll_sm_allreduce.c
diff --git a/src/mca/coll/sm/coll_sm_alltoall.c b/ompi/mca/coll/sm/coll_sm_alltoall.c
similarity index 100%
rename from src/mca/coll/sm/coll_sm_alltoall.c
rename to ompi/mca/coll/sm/coll_sm_alltoall.c
diff --git a/src/mca/coll/sm/coll_sm_alltoallv.c b/ompi/mca/coll/sm/coll_sm_alltoallv.c
similarity index 100%
rename from src/mca/coll/sm/coll_sm_alltoallv.c
rename to ompi/mca/coll/sm/coll_sm_alltoallv.c
diff --git a/src/mca/coll/sm/coll_sm_alltoallw.c b/ompi/mca/coll/sm/coll_sm_alltoallw.c
similarity index 100%
rename from src/mca/coll/sm/coll_sm_alltoallw.c
rename to ompi/mca/coll/sm/coll_sm_alltoallw.c
diff --git a/src/mca/coll/sm/coll_sm_barrier.c b/ompi/mca/coll/sm/coll_sm_barrier.c
similarity index 100%
rename from src/mca/coll/sm/coll_sm_barrier.c
rename to ompi/mca/coll/sm/coll_sm_barrier.c
diff --git a/src/mca/coll/sm/coll_sm_bcast.c b/ompi/mca/coll/sm/coll_sm_bcast.c
similarity index 100%
rename from src/mca/coll/sm/coll_sm_bcast.c
rename to ompi/mca/coll/sm/coll_sm_bcast.c
diff --git a/src/mca/coll/sm/coll_sm_component.c b/ompi/mca/coll/sm/coll_sm_component.c
similarity index 100%
rename from src/mca/coll/sm/coll_sm_component.c
rename to ompi/mca/coll/sm/coll_sm_component.c
diff --git a/src/mca/coll/sm/coll_sm_exscan.c b/ompi/mca/coll/sm/coll_sm_exscan.c
similarity index 100%
rename from src/mca/coll/sm/coll_sm_exscan.c
rename to ompi/mca/coll/sm/coll_sm_exscan.c
diff --git a/src/mca/coll/sm/coll_sm_gather.c b/ompi/mca/coll/sm/coll_sm_gather.c
similarity index 100%
rename from src/mca/coll/sm/coll_sm_gather.c
rename to ompi/mca/coll/sm/coll_sm_gather.c
diff --git a/src/mca/coll/sm/coll_sm_gatherv.c b/ompi/mca/coll/sm/coll_sm_gatherv.c
similarity index 100%
rename from src/mca/coll/sm/coll_sm_gatherv.c
rename to ompi/mca/coll/sm/coll_sm_gatherv.c
diff --git a/src/mca/coll/sm/coll_sm_module.c b/ompi/mca/coll/sm/coll_sm_module.c
similarity index 100%
rename from src/mca/coll/sm/coll_sm_module.c
rename to ompi/mca/coll/sm/coll_sm_module.c
diff --git a/src/mca/coll/sm/coll_sm_reduce.c b/ompi/mca/coll/sm/coll_sm_reduce.c
similarity index 100%
rename from src/mca/coll/sm/coll_sm_reduce.c
rename to ompi/mca/coll/sm/coll_sm_reduce.c
diff --git a/src/mca/coll/sm/coll_sm_reduce_scatter.c b/ompi/mca/coll/sm/coll_sm_reduce_scatter.c
similarity index 100%
rename from src/mca/coll/sm/coll_sm_reduce_scatter.c
rename to ompi/mca/coll/sm/coll_sm_reduce_scatter.c
diff --git a/src/mca/coll/sm/coll_sm_scan.c b/ompi/mca/coll/sm/coll_sm_scan.c
similarity index 100%
rename from src/mca/coll/sm/coll_sm_scan.c
rename to ompi/mca/coll/sm/coll_sm_scan.c
diff --git a/src/mca/coll/sm/coll_sm_scatter.c b/ompi/mca/coll/sm/coll_sm_scatter.c
similarity index 100%
rename from src/mca/coll/sm/coll_sm_scatter.c
rename to ompi/mca/coll/sm/coll_sm_scatter.c
diff --git a/src/mca/coll/sm/coll_sm_scatterv.c b/ompi/mca/coll/sm/coll_sm_scatterv.c
similarity index 100%
rename from src/mca/coll/sm/coll_sm_scatterv.c
rename to ompi/mca/coll/sm/coll_sm_scatterv.c
diff --git a/src/mca/coll/sm/configure.params b/ompi/mca/coll/sm/configure.params
similarity index 100%
rename from src/mca/coll/sm/configure.params
rename to ompi/mca/coll/sm/configure.params
diff --git a/src/mca/common/Makefile.am b/ompi/mca/common/Makefile.am
similarity index 100%
rename from src/mca/common/Makefile.am
rename to ompi/mca/common/Makefile.am
diff --git a/src/mca/common/sm/Makefile.am b/ompi/mca/common/sm/Makefile.am
similarity index 100%
rename from src/mca/common/sm/Makefile.am
rename to ompi/mca/common/sm/Makefile.am
diff --git a/src/mca/common/sm/common_sm_mmap.c b/ompi/mca/common/sm/common_sm_mmap.c
similarity index 100%
rename from src/mca/common/sm/common_sm_mmap.c
rename to ompi/mca/common/sm/common_sm_mmap.c
diff --git a/src/mca/common/sm/common_sm_mmap.h b/ompi/mca/common/sm/common_sm_mmap.h
similarity index 100%
rename from src/mca/common/sm/common_sm_mmap.h
rename to ompi/mca/common/sm/common_sm_mmap.h
diff --git a/src/mca/common/sm/configure.params b/ompi/mca/common/sm/configure.params
similarity index 100%
rename from src/mca/common/sm/configure.params
rename to ompi/mca/common/sm/configure.params
diff --git a/src/mca/common/vapi/vapi_mem_reg.h b/ompi/mca/common/vapi/vapi_mem_reg.h
similarity index 100%
rename from src/mca/common/vapi/vapi_mem_reg.h
rename to ompi/mca/common/vapi/vapi_mem_reg.h
diff --git a/src/mca/io/Makefile.am b/ompi/mca/io/Makefile.am
similarity index 100%
rename from src/mca/io/Makefile.am
rename to ompi/mca/io/Makefile.am
diff --git a/src/mca/io/base/Makefile.am b/ompi/mca/io/base/Makefile.am
similarity index 100%
rename from src/mca/io/base/Makefile.am
rename to ompi/mca/io/base/Makefile.am
diff --git a/src/mca/io/base/base.h b/ompi/mca/io/base/base.h
similarity index 100%
rename from src/mca/io/base/base.h
rename to ompi/mca/io/base/base.h
diff --git a/src/mca/io/base/io_base_close.c b/ompi/mca/io/base/io_base_close.c
similarity index 100%
rename from src/mca/io/base/io_base_close.c
rename to ompi/mca/io/base/io_base_close.c
diff --git a/src/mca/io/base/io_base_component_list.c b/ompi/mca/io/base/io_base_component_list.c
similarity index 100%
rename from src/mca/io/base/io_base_component_list.c
rename to ompi/mca/io/base/io_base_component_list.c
diff --git a/src/mca/io/base/io_base_delete.c b/ompi/mca/io/base/io_base_delete.c
similarity index 100%
rename from src/mca/io/base/io_base_delete.c
rename to ompi/mca/io/base/io_base_delete.c
diff --git a/src/mca/io/base/io_base_file_select.c b/ompi/mca/io/base/io_base_file_select.c
similarity index 100%
rename from src/mca/io/base/io_base_file_select.c
rename to ompi/mca/io/base/io_base_file_select.c
diff --git a/src/mca/io/base/io_base_find_available.c b/ompi/mca/io/base/io_base_find_available.c
similarity index 100%
rename from src/mca/io/base/io_base_find_available.c
rename to ompi/mca/io/base/io_base_find_available.c
diff --git a/src/mca/io/base/io_base_open.c b/ompi/mca/io/base/io_base_open.c
similarity index 100%
rename from src/mca/io/base/io_base_open.c
rename to ompi/mca/io/base/io_base_open.c
diff --git a/src/mca/io/base/io_base_request.c b/ompi/mca/io/base/io_base_request.c
similarity index 100%
rename from src/mca/io/base/io_base_request.c
rename to ompi/mca/io/base/io_base_request.c
diff --git a/src/mca/io/base/io_base_request.h b/ompi/mca/io/base/io_base_request.h
similarity index 100%
rename from src/mca/io/base/io_base_request.h
rename to ompi/mca/io/base/io_base_request.h
diff --git a/src/mca/io/io.h b/ompi/mca/io/io.h
similarity index 100%
rename from src/mca/io/io.h
rename to ompi/mca/io/io.h
diff --git a/src/mca/io/romio/Makefile.am b/ompi/mca/io/romio/Makefile.am
similarity index 100%
rename from src/mca/io/romio/Makefile.am
rename to ompi/mca/io/romio/Makefile.am
diff --git a/src/mca/io/romio/VERSION b/ompi/mca/io/romio/VERSION
similarity index 100%
rename from src/mca/io/romio/VERSION
rename to ompi/mca/io/romio/VERSION
diff --git a/src/mca/io/romio/autogen.subdirs b/ompi/mca/io/romio/autogen.subdirs
similarity index 100%
rename from src/mca/io/romio/autogen.subdirs
rename to ompi/mca/io/romio/autogen.subdirs
diff --git a/src/mca/io/romio/configure.params b/ompi/mca/io/romio/configure.params
similarity index 100%
rename from src/mca/io/romio/configure.params
rename to ompi/mca/io/romio/configure.params
diff --git a/src/mca/io/romio/configure.stub b/ompi/mca/io/romio/configure.stub
similarity index 100%
rename from src/mca/io/romio/configure.stub
rename to ompi/mca/io/romio/configure.stub
diff --git a/src/mca/io/romio/romio-dist/.config_params b/ompi/mca/io/romio/romio-dist/.config_params
similarity index 100%
rename from src/mca/io/romio/romio-dist/.config_params
rename to ompi/mca/io/romio/romio-dist/.config_params
diff --git a/src/mca/io/romio/romio-dist/COPYRIGHT b/ompi/mca/io/romio/romio-dist/COPYRIGHT
similarity index 100%
rename from src/mca/io/romio/romio-dist/COPYRIGHT
rename to ompi/mca/io/romio/romio-dist/COPYRIGHT
diff --git a/src/mca/io/romio/romio-dist/Makefile.am b/ompi/mca/io/romio/romio-dist/Makefile.am
similarity index 100%
rename from src/mca/io/romio/romio-dist/Makefile.am
rename to ompi/mca/io/romio/romio-dist/Makefile.am
diff --git a/src/mca/io/romio/romio-dist/README b/ompi/mca/io/romio/romio-dist/README
similarity index 100%
rename from src/mca/io/romio/romio-dist/README
rename to ompi/mca/io/romio/romio-dist/README
diff --git a/src/mca/io/romio/romio-dist/README_OMPI b/ompi/mca/io/romio/romio-dist/README_OMPI
similarity index 100%
rename from src/mca/io/romio/romio-dist/README_OMPI
rename to ompi/mca/io/romio/romio-dist/README_OMPI
diff --git a/src/mca/io/romio/romio-dist/acinclude.m4 b/ompi/mca/io/romio/romio-dist/acinclude.m4
similarity index 100%
rename from src/mca/io/romio/romio-dist/acinclude.m4
rename to ompi/mca/io/romio/romio-dist/acinclude.m4
diff --git a/src/mca/io/romio/romio-dist/adio/Makefile.am b/ompi/mca/io/romio/romio-dist/adio/Makefile.am
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/Makefile.am
rename to ompi/mca/io/romio/romio-dist/adio/Makefile.am
diff --git a/src/mca/io/romio/romio-dist/adio/ad_hfs/Makefile.am b/ompi/mca/io/romio/romio-dist/adio/ad_hfs/Makefile.am
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_hfs/Makefile.am
rename to ompi/mca/io/romio/romio-dist/adio/ad_hfs/Makefile.am
diff --git a/src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs.c b/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs.h b/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs.h
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs.h
rename to ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs.h
diff --git a/src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_close.c b/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_close.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_close.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_close.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_done.c b/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_done.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_done.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_done.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_fcntl.c b/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_fcntl.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_fcntl.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_fcntl.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_flush.c b/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_flush.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_flush.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_flush.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_hints.c b/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_hints.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_hints.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_hints.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_iread.c b/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_iread.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_iread.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_iread.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_iwrite.c b/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_iwrite.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_iwrite.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_iwrite.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_open.c b/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_open.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_open.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_open.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_rdcoll.c b/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_rdcoll.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_rdcoll.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_rdcoll.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_read.c b/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_read.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_read.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_read.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_resize.c b/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_resize.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_resize.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_resize.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_seek.c b/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_seek.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_seek.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_seek.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_wait.c b/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_wait.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_wait.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_wait.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_wrcoll.c b/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_wrcoll.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_wrcoll.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_wrcoll.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_write.c b/ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_write.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_write.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_hfs/ad_hfs_write.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_nfs/Makefile.am b/ompi/mca/io/romio/romio-dist/adio/ad_nfs/Makefile.am
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_nfs/Makefile.am
rename to ompi/mca/io/romio/romio-dist/adio/ad_nfs/Makefile.am
diff --git a/src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs.c b/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs.h b/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs.h
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs.h
rename to ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs.h
diff --git a/src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_close.c b/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_close.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_close.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_close.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_done.c b/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_done.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_done.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_done.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_fcntl.c b/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_fcntl.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_fcntl.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_fcntl.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_flush.c b/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_flush.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_flush.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_flush.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_getsh.c b/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_getsh.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_getsh.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_getsh.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_hints.c b/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_hints.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_hints.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_hints.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_iread.c b/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_iread.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_iread.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_iread.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_iwrite.c b/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_iwrite.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_iwrite.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_iwrite.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_open.c b/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_open.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_open.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_open.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_rdcoll.c b/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_rdcoll.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_rdcoll.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_rdcoll.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_read.c b/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_read.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_read.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_read.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_resize.c b/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_resize.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_resize.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_resize.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_seek.c b/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_seek.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_seek.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_seek.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_setsh.c b/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_setsh.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_setsh.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_setsh.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_wait.c b/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_wait.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_wait.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_wait.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_wrcoll.c b/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_wrcoll.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_wrcoll.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_wrcoll.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_write.c b/ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_write.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_write.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_nfs/ad_nfs_write.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ntfs/Makefile.am b/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/Makefile.am
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ntfs/Makefile.am
rename to ompi/mca/io/romio/romio-dist/adio/ad_ntfs/Makefile.am
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs.c b/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs.h b/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs.h
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs.h
rename to ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs.h
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_close.c b/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_close.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_close.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_close.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_done.c b/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_done.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_done.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_done.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_fcntl.c b/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_fcntl.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_fcntl.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_fcntl.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_flush.c b/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_flush.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_flush.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_flush.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_hints.c b/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_hints.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_hints.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_hints.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_iread.c b/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_iread.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_iread.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_iread.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_iwrite.c b/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_iwrite.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_iwrite.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_iwrite.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_open.c b/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_open.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_open.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_open.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_rdcoll.c b/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_rdcoll.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_rdcoll.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_rdcoll.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_read.c b/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_read.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_read.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_read.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_resize.c b/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_resize.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_resize.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_resize.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_seek.c b/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_seek.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_seek.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_seek.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_wait.c b/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_wait.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_wait.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_wait.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_wrcoll.c b/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_wrcoll.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_wrcoll.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_wrcoll.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_write.c b/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_write.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_write.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ntfs/ad_ntfs_write.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pfs/Makefile.am b/ompi/mca/io/romio/romio-dist/adio/ad_pfs/Makefile.am
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pfs/Makefile.am
rename to ompi/mca/io/romio/romio-dist/adio/ad_pfs/Makefile.am
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs.c b/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs.h b/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs.h
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs.h
rename to ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs.h
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_close.c b/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_close.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_close.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_close.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_done.c b/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_done.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_done.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_done.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_fcntl.c b/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_fcntl.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_fcntl.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_fcntl.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_flush.c b/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_flush.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_flush.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_flush.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_hints.c b/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_hints.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_hints.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_hints.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_iread.c b/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_iread.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_iread.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_iread.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_iwrite.c b/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_iwrite.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_iwrite.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_iwrite.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_open.c b/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_open.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_open.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_open.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_rdcoll.c b/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_rdcoll.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_rdcoll.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_rdcoll.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_read.c b/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_read.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_read.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_read.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_resize.c b/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_resize.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_resize.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_resize.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_seek.c b/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_seek.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_seek.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_seek.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_wait.c b/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_wait.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_wait.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_wait.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_wrcoll.c b/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_wrcoll.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_wrcoll.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_wrcoll.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_write.c b/ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_write.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_write.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pfs/ad_pfs_write.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_piofs/Makefile.am b/ompi/mca/io/romio/romio-dist/adio/ad_piofs/Makefile.am
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_piofs/Makefile.am
rename to ompi/mca/io/romio/romio-dist/adio/ad_piofs/Makefile.am
diff --git a/src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs.c b/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs.h b/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs.h
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs.h
rename to ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs.h
diff --git a/src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_close.c b/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_close.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_close.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_close.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_done.c b/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_done.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_done.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_done.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_fcntl.c b/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_fcntl.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_fcntl.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_fcntl.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_flush.c b/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_flush.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_flush.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_flush.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_hints.c b/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_hints.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_hints.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_hints.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_iread.c b/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_iread.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_iread.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_iread.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_iwrite.c b/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_iwrite.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_iwrite.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_iwrite.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_open.c b/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_open.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_open.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_open.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_rdcoll.c b/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_rdcoll.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_rdcoll.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_rdcoll.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_read.c b/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_read.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_read.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_read.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_resize.c b/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_resize.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_resize.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_resize.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_seek.c b/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_seek.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_seek.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_seek.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_wait.c b/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_wait.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_wait.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_wait.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_wrcoll.c b/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_wrcoll.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_wrcoll.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_wrcoll.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_write.c b/ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_write.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_write.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_piofs/ad_piofs_write.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pvfs/Makefile.am b/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/Makefile.am
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pvfs/Makefile.am
rename to ompi/mca/io/romio/romio-dist/adio/ad_pvfs/Makefile.am
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs.c b/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs.h b/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs.h
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs.h
rename to ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs.h
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_close.c b/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_close.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_close.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_close.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_delete.c b/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_delete.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_delete.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_delete.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_done.c b/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_done.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_done.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_done.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_fcntl.c b/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_fcntl.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_fcntl.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_fcntl.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_flush.c b/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_flush.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_flush.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_flush.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_hints.c b/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_hints.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_hints.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_hints.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_iread.c b/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_iread.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_iread.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_iread.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_iwrite.c b/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_iwrite.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_iwrite.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_iwrite.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_open.c b/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_open.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_open.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_open.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_rdcoll.c b/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_rdcoll.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_rdcoll.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_rdcoll.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_read.c b/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_read.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_read.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_read.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_resize.c b/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_resize.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_resize.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_resize.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_seek.c b/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_seek.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_seek.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_seek.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_wait.c b/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_wait.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_wait.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_wait.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_wrcoll.c b/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_wrcoll.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_wrcoll.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_wrcoll.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_write.c b/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_write.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_write.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_pvfs/ad_pvfs_write.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_sfs/Makefile.am b/ompi/mca/io/romio/romio-dist/adio/ad_sfs/Makefile.am
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_sfs/Makefile.am
rename to ompi/mca/io/romio/romio-dist/adio/ad_sfs/Makefile.am
diff --git a/src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs.c b/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs.h b/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs.h
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs.h
rename to ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs.h
diff --git a/src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_close.c b/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_close.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_close.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_close.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_done.c b/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_done.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_done.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_done.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_fcntl.c b/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_fcntl.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_fcntl.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_fcntl.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_flush.c b/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_flush.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_flush.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_flush.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_hints.c b/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_hints.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_hints.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_hints.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_iread.c b/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_iread.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_iread.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_iread.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_iwrite.c b/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_iwrite.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_iwrite.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_iwrite.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_open.c b/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_open.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_open.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_open.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_rdcoll.c b/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_rdcoll.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_rdcoll.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_rdcoll.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_read.c b/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_read.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_read.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_read.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_resize.c b/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_resize.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_resize.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_resize.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_seek.c b/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_seek.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_seek.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_seek.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_wait.c b/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_wait.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_wait.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_wait.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_wrcoll.c b/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_wrcoll.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_wrcoll.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_wrcoll.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_write.c b/ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_write.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_write.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_sfs/ad_sfs_write.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_testfs/Makefile.am b/ompi/mca/io/romio/romio-dist/adio/ad_testfs/Makefile.am
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_testfs/Makefile.am
rename to ompi/mca/io/romio/romio-dist/adio/ad_testfs/Makefile.am
diff --git a/src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs.c b/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs.h b/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs.h
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs.h
rename to ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs.h
diff --git a/src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_close.c b/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_close.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_close.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_close.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_delete.c b/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_delete.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_delete.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_delete.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_done.c b/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_done.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_done.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_done.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_fcntl.c b/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_fcntl.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_fcntl.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_fcntl.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_flush.c b/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_flush.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_flush.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_flush.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_getsh.c b/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_getsh.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_getsh.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_getsh.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_hints.c b/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_hints.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_hints.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_hints.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_iread.c b/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_iread.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_iread.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_iread.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_iwrite.c b/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_iwrite.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_iwrite.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_iwrite.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_open.c b/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_open.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_open.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_open.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_rdcoll.c b/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_rdcoll.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_rdcoll.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_rdcoll.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_read.c b/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_read.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_read.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_read.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_resize.c b/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_resize.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_resize.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_resize.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_seek.c b/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_seek.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_seek.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_seek.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_setsh.c b/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_setsh.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_setsh.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_setsh.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_wait.c b/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_wait.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_wait.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_wait.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_wrcoll.c b/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_wrcoll.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_wrcoll.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_wrcoll.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_write.c b/ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_write.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_write.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_testfs/ad_testfs_write.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ufs/Makefile.am b/ompi/mca/io/romio/romio-dist/adio/ad_ufs/Makefile.am
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ufs/Makefile.am
rename to ompi/mca/io/romio/romio-dist/adio/ad_ufs/Makefile.am
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs.c b/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs.h b/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs.h
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs.h
rename to ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs.h
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_close.c b/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_close.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_close.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_close.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_done.c b/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_done.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_done.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_done.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_fcntl.c b/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_fcntl.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_fcntl.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_fcntl.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_flush.c b/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_flush.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_flush.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_flush.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_hints.c b/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_hints.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_hints.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_hints.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_iread.c b/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_iread.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_iread.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_iread.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_iwrite.c b/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_iwrite.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_iwrite.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_iwrite.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_open.c b/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_open.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_open.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_open.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_rdcoll.c b/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_rdcoll.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_rdcoll.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_rdcoll.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_read.c b/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_read.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_read.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_read.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_resize.c b/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_resize.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_resize.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_resize.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_seek.c b/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_seek.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_seek.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_seek.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_wait.c b/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_wait.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_wait.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_wait.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_wrcoll.c b/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_wrcoll.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_wrcoll.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_wrcoll.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_write.c b/ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_write.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_write.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_ufs/ad_ufs_write.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_xfs/Makefile.am b/ompi/mca/io/romio/romio-dist/adio/ad_xfs/Makefile.am
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_xfs/Makefile.am
rename to ompi/mca/io/romio/romio-dist/adio/ad_xfs/Makefile.am
diff --git a/src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs.c b/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs.h b/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs.h
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs.h
rename to ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs.h
diff --git a/src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_close.c b/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_close.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_close.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_close.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_done.c b/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_done.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_done.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_done.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_fcntl.c b/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_fcntl.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_fcntl.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_fcntl.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_flush.c b/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_flush.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_flush.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_flush.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_hints.c b/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_hints.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_hints.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_hints.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_iread.c b/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_iread.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_iread.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_iread.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_iwrite.c b/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_iwrite.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_iwrite.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_iwrite.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_open.c b/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_open.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_open.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_open.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_rdcoll.c b/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_rdcoll.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_rdcoll.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_rdcoll.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_read.c b/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_read.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_read.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_read.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_resize.c b/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_resize.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_resize.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_resize.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_seek.c b/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_seek.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_seek.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_seek.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_wait.c b/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_wait.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_wait.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_wait.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_wrcoll.c b/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_wrcoll.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_wrcoll.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_wrcoll.c
diff --git a/src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_write.c b/ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_write.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_write.c
rename to ompi/mca/io/romio/romio-dist/adio/ad_xfs/ad_xfs_write.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/Makefile.am b/ompi/mca/io/romio/romio-dist/adio/common/Makefile.am
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/Makefile.am
rename to ompi/mca/io/romio/romio-dist/adio/common/Makefile.am
diff --git a/src/mca/io/romio/romio-dist/adio/common/ad_aggregate.c b/ompi/mca/io/romio/romio-dist/adio/common/ad_aggregate.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/ad_aggregate.c
rename to ompi/mca/io/romio/romio-dist/adio/common/ad_aggregate.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/ad_close.c b/ompi/mca/io/romio/romio-dist/adio/common/ad_close.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/ad_close.c
rename to ompi/mca/io/romio/romio-dist/adio/common/ad_close.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/ad_delete.c b/ompi/mca/io/romio/romio-dist/adio/common/ad_delete.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/ad_delete.c
rename to ompi/mca/io/romio/romio-dist/adio/common/ad_delete.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/ad_end.c b/ompi/mca/io/romio/romio-dist/adio/common/ad_end.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/ad_end.c
rename to ompi/mca/io/romio/romio-dist/adio/common/ad_end.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/ad_flush.c b/ompi/mca/io/romio/romio-dist/adio/common/ad_flush.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/ad_flush.c
rename to ompi/mca/io/romio/romio-dist/adio/common/ad_flush.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/ad_fstype.c b/ompi/mca/io/romio/romio-dist/adio/common/ad_fstype.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/ad_fstype.c
rename to ompi/mca/io/romio/romio-dist/adio/common/ad_fstype.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/ad_get_sh_fp.c b/ompi/mca/io/romio/romio-dist/adio/common/ad_get_sh_fp.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/ad_get_sh_fp.c
rename to ompi/mca/io/romio/romio-dist/adio/common/ad_get_sh_fp.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/ad_hints.c b/ompi/mca/io/romio/romio-dist/adio/common/ad_hints.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/ad_hints.c
rename to ompi/mca/io/romio/romio-dist/adio/common/ad_hints.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/ad_init.c b/ompi/mca/io/romio/romio-dist/adio/common/ad_init.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/ad_init.c
rename to ompi/mca/io/romio/romio-dist/adio/common/ad_init.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/ad_open.c b/ompi/mca/io/romio/romio-dist/adio/common/ad_open.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/ad_open.c
rename to ompi/mca/io/romio/romio-dist/adio/common/ad_open.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/ad_read_coll.c b/ompi/mca/io/romio/romio-dist/adio/common/ad_read_coll.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/ad_read_coll.c
rename to ompi/mca/io/romio/romio-dist/adio/common/ad_read_coll.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/ad_read_str.c b/ompi/mca/io/romio/romio-dist/adio/common/ad_read_str.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/ad_read_str.c
rename to ompi/mca/io/romio/romio-dist/adio/common/ad_read_str.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/ad_read_str_naive.c b/ompi/mca/io/romio/romio-dist/adio/common/ad_read_str_naive.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/ad_read_str_naive.c
rename to ompi/mca/io/romio/romio-dist/adio/common/ad_read_str_naive.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/ad_seek.c b/ompi/mca/io/romio/romio-dist/adio/common/ad_seek.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/ad_seek.c
rename to ompi/mca/io/romio/romio-dist/adio/common/ad_seek.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/ad_set_sh_fp.c b/ompi/mca/io/romio/romio-dist/adio/common/ad_set_sh_fp.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/ad_set_sh_fp.c
rename to ompi/mca/io/romio/romio-dist/adio/common/ad_set_sh_fp.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/ad_set_view.c b/ompi/mca/io/romio/romio-dist/adio/common/ad_set_view.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/ad_set_view.c
rename to ompi/mca/io/romio/romio-dist/adio/common/ad_set_view.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/ad_write_coll.c b/ompi/mca/io/romio/romio-dist/adio/common/ad_write_coll.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/ad_write_coll.c
rename to ompi/mca/io/romio/romio-dist/adio/common/ad_write_coll.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/ad_write_str.c b/ompi/mca/io/romio/romio-dist/adio/common/ad_write_str.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/ad_write_str.c
rename to ompi/mca/io/romio/romio-dist/adio/common/ad_write_str.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/async_list.c b/ompi/mca/io/romio/romio-dist/adio/common/async_list.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/async_list.c
rename to ompi/mca/io/romio/romio-dist/adio/common/async_list.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/byte_offset.c b/ompi/mca/io/romio/romio-dist/adio/common/byte_offset.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/byte_offset.c
rename to ompi/mca/io/romio/romio-dist/adio/common/byte_offset.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/cb_config_list.c b/ompi/mca/io/romio/romio-dist/adio/common/cb_config_list.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/cb_config_list.c
rename to ompi/mca/io/romio/romio-dist/adio/common/cb_config_list.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/eof_offset.c b/ompi/mca/io/romio/romio-dist/adio/common/eof_offset.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/eof_offset.c
rename to ompi/mca/io/romio/romio-dist/adio/common/eof_offset.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/error.c b/ompi/mca/io/romio/romio-dist/adio/common/error.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/error.c
rename to ompi/mca/io/romio/romio-dist/adio/common/error.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/flatten.c b/ompi/mca/io/romio/romio-dist/adio/common/flatten.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/flatten.c
rename to ompi/mca/io/romio/romio-dist/adio/common/flatten.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/gencheck.c b/ompi/mca/io/romio/romio-dist/adio/common/gencheck.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/gencheck.c
rename to ompi/mca/io/romio/romio-dist/adio/common/gencheck.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/get_fp_posn.c b/ompi/mca/io/romio/romio-dist/adio/common/get_fp_posn.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/get_fp_posn.c
rename to ompi/mca/io/romio/romio-dist/adio/common/get_fp_posn.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/iscontig.c b/ompi/mca/io/romio/romio-dist/adio/common/iscontig.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/iscontig.c
rename to ompi/mca/io/romio/romio-dist/adio/common/iscontig.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/lock.c b/ompi/mca/io/romio/romio-dist/adio/common/lock.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/lock.c
rename to ompi/mca/io/romio/romio-dist/adio/common/lock.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/malloc.c b/ompi/mca/io/romio/romio-dist/adio/common/malloc.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/malloc.c
rename to ompi/mca/io/romio/romio-dist/adio/common/malloc.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/req_malloc.c b/ompi/mca/io/romio/romio-dist/adio/common/req_malloc.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/req_malloc.c
rename to ompi/mca/io/romio/romio-dist/adio/common/req_malloc.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/setfn.c b/ompi/mca/io/romio/romio-dist/adio/common/setfn.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/setfn.c
rename to ompi/mca/io/romio/romio-dist/adio/common/setfn.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/shfp_fname.c b/ompi/mca/io/romio/romio-dist/adio/common/shfp_fname.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/shfp_fname.c
rename to ompi/mca/io/romio/romio-dist/adio/common/shfp_fname.c
diff --git a/src/mca/io/romio/romio-dist/adio/common/status_setb.c b/ompi/mca/io/romio/romio-dist/adio/common/status_setb.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/common/status_setb.c
rename to ompi/mca/io/romio/romio-dist/adio/common/status_setb.c
diff --git a/src/mca/io/romio/romio-dist/adio/include/BaseIOErrMsgs.msg b/ompi/mca/io/romio/romio-dist/adio/include/BaseIOErrMsgs.msg
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/include/BaseIOErrMsgs.msg
rename to ompi/mca/io/romio/romio-dist/adio/include/BaseIOErrMsgs.msg
diff --git a/src/mca/io/romio/romio-dist/adio/include/Makefile.am b/ompi/mca/io/romio/romio-dist/adio/include/Makefile.am
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/include/Makefile.am
rename to ompi/mca/io/romio/romio-dist/adio/include/Makefile.am
diff --git a/src/mca/io/romio/romio-dist/adio/include/adio.h b/ompi/mca/io/romio/romio-dist/adio/include/adio.h
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/include/adio.h
rename to ompi/mca/io/romio/romio-dist/adio/include/adio.h
diff --git a/src/mca/io/romio/romio-dist/adio/include/adio_cb_config_list.h b/ompi/mca/io/romio/romio-dist/adio/include/adio_cb_config_list.h
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/include/adio_cb_config_list.h
rename to ompi/mca/io/romio/romio-dist/adio/include/adio_cb_config_list.h
diff --git a/src/mca/io/romio/romio-dist/adio/include/adio_extern.h b/ompi/mca/io/romio/romio-dist/adio/include/adio_extern.h
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/include/adio_extern.h
rename to ompi/mca/io/romio/romio-dist/adio/include/adio_extern.h
diff --git a/src/mca/io/romio/romio-dist/adio/include/adioi.h b/ompi/mca/io/romio/romio-dist/adio/include/adioi.h
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/include/adioi.h
rename to ompi/mca/io/romio/romio-dist/adio/include/adioi.h
diff --git a/src/mca/io/romio/romio-dist/adio/include/adioi_errmsg.h b/ompi/mca/io/romio/romio-dist/adio/include/adioi_errmsg.h
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/include/adioi_errmsg.h
rename to ompi/mca/io/romio/romio-dist/adio/include/adioi_errmsg.h
diff --git a/src/mca/io/romio/romio-dist/adio/include/adioi_error.h b/ompi/mca/io/romio/romio-dist/adio/include/adioi_error.h
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/include/adioi_error.h
rename to ompi/mca/io/romio/romio-dist/adio/include/adioi_error.h
diff --git a/src/mca/io/romio/romio-dist/adio/include/adioi_fs_proto.h b/ompi/mca/io/romio/romio-dist/adio/include/adioi_fs_proto.h
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/include/adioi_fs_proto.h
rename to ompi/mca/io/romio/romio-dist/adio/include/adioi_fs_proto.h
diff --git a/src/mca/io/romio/romio-dist/adio/include/io_adio_conv.h b/ompi/mca/io/romio/romio-dist/adio/include/io_adio_conv.h
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/include/io_adio_conv.h
rename to ompi/mca/io/romio/romio-dist/adio/include/io_adio_conv.h
diff --git a/src/mca/io/romio/romio-dist/adio/include/mpio_error.h b/ompi/mca/io/romio/romio-dist/adio/include/mpio_error.h
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/include/mpio_error.h
rename to ompi/mca/io/romio/romio-dist/adio/include/mpio_error.h
diff --git a/src/mca/io/romio/romio-dist/adio/include/mpipr.h b/ompi/mca/io/romio/romio-dist/adio/include/mpipr.h
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/include/mpipr.h
rename to ompi/mca/io/romio/romio-dist/adio/include/mpipr.h
diff --git a/src/mca/io/romio/romio-dist/adio/include/mpisgi2.h b/ompi/mca/io/romio/romio-dist/adio/include/mpisgi2.h
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/include/mpisgi2.h
rename to ompi/mca/io/romio/romio-dist/adio/include/mpisgi2.h
diff --git a/src/mca/io/romio/romio-dist/adio/include/romioconf.h.in b/ompi/mca/io/romio/romio-dist/adio/include/romioconf.h.in
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/include/romioconf.h.in
rename to ompi/mca/io/romio/romio-dist/adio/include/romioconf.h.in
diff --git a/src/mca/io/romio/romio-dist/adio/sgi/mpi3.1/mpi.h b/ompi/mca/io/romio/romio-dist/adio/sgi/mpi3.1/mpi.h
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/sgi/mpi3.1/mpi.h
rename to ompi/mca/io/romio/romio-dist/adio/sgi/mpi3.1/mpi.h
diff --git a/src/mca/io/romio/romio-dist/adio/sgi/mpi3.1/mpif.h b/ompi/mca/io/romio/romio-dist/adio/sgi/mpi3.1/mpif.h
similarity index 100%
rename from src/mca/io/romio/romio-dist/adio/sgi/mpi3.1/mpif.h
rename to ompi/mca/io/romio/romio-dist/adio/sgi/mpi3.1/mpif.h
diff --git a/src/mca/io/romio/romio-dist/configure.in b/ompi/mca/io/romio/romio-dist/configure.in
similarity index 100%
rename from src/mca/io/romio/romio-dist/configure.in
rename to ompi/mca/io/romio/romio-dist/configure.in
diff --git a/src/mca/io/romio/romio-dist/configure2.in b/ompi/mca/io/romio/romio-dist/configure2.in
similarity index 100%
rename from src/mca/io/romio/romio-dist/configure2.in
rename to ompi/mca/io/romio/romio-dist/configure2.in
diff --git a/src/mca/io/romio/romio-dist/doc/Makefile.am b/ompi/mca/io/romio/romio-dist/doc/Makefile.am
similarity index 100%
rename from src/mca/io/romio/romio-dist/doc/Makefile.am
rename to ompi/mca/io/romio/romio-dist/doc/Makefile.am
diff --git a/src/mca/io/romio/romio-dist/doc/README b/ompi/mca/io/romio/romio-dist/doc/README
similarity index 100%
rename from src/mca/io/romio/romio-dist/doc/README
rename to ompi/mca/io/romio/romio-dist/doc/README
diff --git a/src/mca/io/romio/romio-dist/doc/users-guide.bbl b/ompi/mca/io/romio/romio-dist/doc/users-guide.bbl
similarity index 100%
rename from src/mca/io/romio/romio-dist/doc/users-guide.bbl
rename to ompi/mca/io/romio/romio-dist/doc/users-guide.bbl
diff --git a/src/mca/io/romio/romio-dist/doc/users-guide.ps.gz b/ompi/mca/io/romio/romio-dist/doc/users-guide.ps.gz
similarity index 100%
rename from src/mca/io/romio/romio-dist/doc/users-guide.ps.gz
rename to ompi/mca/io/romio/romio-dist/doc/users-guide.ps.gz
diff --git a/src/mca/io/romio/romio-dist/doc/users-guide.tex b/ompi/mca/io/romio/romio-dist/doc/users-guide.tex
similarity index 100%
rename from src/mca/io/romio/romio-dist/doc/users-guide.tex
rename to ompi/mca/io/romio/romio-dist/doc/users-guide.tex
diff --git a/src/mca/io/romio/romio-dist/include/Makefile.am b/ompi/mca/io/romio/romio-dist/include/Makefile.am
similarity index 100%
rename from src/mca/io/romio/romio-dist/include/Makefile.am
rename to ompi/mca/io/romio/romio-dist/include/Makefile.am
diff --git a/src/mca/io/romio/romio-dist/include/io_romio_conv.h b/ompi/mca/io/romio/romio-dist/include/io_romio_conv.h
similarity index 100%
rename from src/mca/io/romio/romio-dist/include/io_romio_conv.h
rename to ompi/mca/io/romio/romio-dist/include/io_romio_conv.h
diff --git a/src/mca/io/romio/romio-dist/include/mpio.h.in b/ompi/mca/io/romio/romio-dist/include/mpio.h.in
similarity index 100%
rename from src/mca/io/romio/romio-dist/include/mpio.h.in
rename to ompi/mca/io/romio/romio-dist/include/mpio.h.in
diff --git a/src/mca/io/romio/romio-dist/include/mpiof.h.in b/ompi/mca/io/romio/romio-dist/include/mpiof.h.in
similarity index 100%
rename from src/mca/io/romio/romio-dist/include/mpiof.h.in
rename to ompi/mca/io/romio/romio-dist/include/mpiof.h.in
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPIO_Request_c2f.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPIO_Request_c2f.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPIO_Request_c2f.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPIO_Request_c2f.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPIO_Request_f2c.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPIO_Request_f2c.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPIO_Request_f2c.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPIO_Request_f2c.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPIO_Test.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPIO_Test.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPIO_Test.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPIO_Test.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPIO_Wait.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPIO_Wait.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPIO_Wait.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPIO_Wait.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_c2f.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_c2f.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_c2f.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_c2f.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_close.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_close.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_close.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_close.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_delete.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_delete.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_delete.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_delete.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_f2c.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_f2c.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_f2c.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_f2c.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_get_amode.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_amode.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_get_amode.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_amode.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_get_atomicity.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_atomicity.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_get_atomicity.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_atomicity.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_get_byte_offset.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_byte_offset.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_get_byte_offset.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_byte_offset.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_get_group.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_group.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_get_group.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_group.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_get_info.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_info.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_get_info.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_info.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_get_position.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_position.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_get_position.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_position.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_get_position_shared.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_position_shared.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_get_position_shared.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_position_shared.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_get_size.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_size.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_get_size.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_size.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_get_type_extent.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_type_extent.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_get_type_extent.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_type_extent.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_get_view.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_view.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_get_view.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_get_view.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_iread.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_iread.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_iread.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_iread.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_iread_at.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_iread_at.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_iread_at.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_iread_at.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_iread_shared.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_iread_shared.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_iread_shared.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_iread_shared.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_iwrite.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_iwrite.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_iwrite.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_iwrite.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_iwrite_at.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_iwrite_at.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_iwrite_at.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_iwrite_at.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_iwrite_shared.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_iwrite_shared.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_iwrite_shared.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_iwrite_shared.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_open.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_open.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_open.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_open.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_preallocate.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_preallocate.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_preallocate.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_preallocate.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_read.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_read.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_read_all.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_all.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_read_all.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_all.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_read_all_begin.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_all_begin.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_read_all_begin.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_all_begin.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_read_all_end.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_all_end.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_read_all_end.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_all_end.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_read_at.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_at.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_read_at.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_at.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_read_at_all.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_at_all.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_read_at_all.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_at_all.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_read_at_all_begin.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_at_all_begin.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_read_at_all_begin.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_at_all_begin.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_read_at_all_end.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_at_all_end.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_read_at_all_end.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_at_all_end.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_read_ordered.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_ordered.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_read_ordered.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_ordered.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_read_ordered_begin.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_ordered_begin.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_read_ordered_begin.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_ordered_begin.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_read_ordered_end.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_ordered_end.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_read_ordered_end.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_ordered_end.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_read_shared.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_shared.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_read_shared.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_read_shared.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_seek.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_seek.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_seek.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_seek.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_seek_shared.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_seek_shared.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_seek_shared.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_seek_shared.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_set_atomicity.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_set_atomicity.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_set_atomicity.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_set_atomicity.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_set_info.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_set_info.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_set_info.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_set_info.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_set_size.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_set_size.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_set_size.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_set_size.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_set_view.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_set_view.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_set_view.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_set_view.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_sync.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_sync.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_sync.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_sync.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_write.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_write.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_write_all.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_all.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_write_all.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_all.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_write_all_begin.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_all_begin.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_write_all_begin.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_all_begin.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_write_all_end.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_all_end.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_write_all_end.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_all_end.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_write_at.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_at.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_write_at.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_at.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_write_at_all.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_at_all.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_write_at_all.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_at_all.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_write_at_all_begin.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_at_all_begin.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_write_at_all_begin.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_at_all_begin.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_write_at_all_end.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_at_all_end.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_write_at_all_end.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_at_all_end.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_write_ordered.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_ordered.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_write_ordered.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_ordered.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_write_ordered_begin.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_ordered_begin.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_write_ordered_begin.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_ordered_begin.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_write_ordered_end.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_ordered_end.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_write_ordered_end.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_ordered_end.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_File_write_shared.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_shared.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_File_write_shared.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_File_write_shared.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_Info_c2f.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_c2f.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_Info_c2f.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_c2f.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_Info_create.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_create.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_Info_create.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_create.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_Info_delete.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_delete.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_Info_delete.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_delete.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_Info_dup.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_dup.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_Info_dup.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_dup.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_Info_f2c.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_f2c.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_Info_f2c.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_f2c.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_Info_free.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_free.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_Info_free.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_free.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_Info_get.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_get.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_Info_get.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_get.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_Info_get_nkeys.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_get_nkeys.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_Info_get_nkeys.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_get_nkeys.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_Info_get_nthkey.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_get_nthkey.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_Info_get_nthkey.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_get_nthkey.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_Info_get_valuelen.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_get_valuelen.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_Info_get_valuelen.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_get_valuelen.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_Info_set.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_set.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_Info_set.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_Info_set.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_Type_create_darray.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_Type_create_darray.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_Type_create_darray.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_Type_create_darray.3
diff --git a/src/mca/io/romio/romio-dist/man/man3/MPI_Type_create_subarray.3 b/ompi/mca/io/romio/romio-dist/man/man3/MPI_Type_create_subarray.3
similarity index 100%
rename from src/mca/io/romio/romio-dist/man/man3/MPI_Type_create_subarray.3
rename to ompi/mca/io/romio/romio-dist/man/man3/MPI_Type_create_subarray.3
diff --git a/src/mca/io/romio/romio-dist/mpi-io/Makefile.am b/ompi/mca/io/romio/romio-dist/mpi-io/Makefile.am
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/Makefile.am
rename to ompi/mca/io/romio/romio-dist/mpi-io/Makefile.am
diff --git a/src/mca/io/romio/romio-dist/mpi-io/close.c b/ompi/mca/io/romio/romio-dist/mpi-io/close.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/close.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/close.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/delete.c b/ompi/mca/io/romio/romio-dist/mpi-io/delete.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/delete.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/delete.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/file_c2f.c b/ompi/mca/io/romio/romio-dist/mpi-io/file_c2f.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/file_c2f.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/file_c2f.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/file_f2c.c b/ompi/mca/io/romio/romio-dist/mpi-io/file_f2c.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/file_f2c.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/file_f2c.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/Makefile.in b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/Makefile.in
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/Makefile.in
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/Makefile.in
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/closef.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/closef.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/closef.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/closef.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/deletef.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/deletef.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/deletef.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/deletef.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/fsyncf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/fsyncf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/fsyncf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/fsyncf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/get_amodef.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_amodef.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/get_amodef.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_amodef.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/get_atomf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_atomf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/get_atomf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_atomf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/get_bytofff.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_bytofff.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/get_bytofff.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_bytofff.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/get_errhf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_errhf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/get_errhf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_errhf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/get_extentf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_extentf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/get_extentf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_extentf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/get_groupf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_groupf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/get_groupf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_groupf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/get_infof.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_infof.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/get_infof.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_infof.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/get_posn_shf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_posn_shf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/get_posn_shf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_posn_shf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/get_posnf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_posnf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/get_posnf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_posnf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/get_sizef.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_sizef.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/get_sizef.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_sizef.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/get_viewf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_viewf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/get_viewf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/get_viewf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/iotestf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/iotestf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/iotestf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/iotestf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/iowaitf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/iowaitf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/iowaitf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/iowaitf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/iread_atf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/iread_atf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/iread_atf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/iread_atf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/iread_shf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/iread_shf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/iread_shf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/iread_shf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/ireadf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/ireadf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/ireadf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/ireadf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/iwrite_atf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/iwrite_atf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/iwrite_atf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/iwrite_atf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/iwrite_shf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/iwrite_shf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/iwrite_shf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/iwrite_shf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/iwritef.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/iwritef.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/iwritef.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/iwritef.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/openf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/openf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/openf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/openf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/preallocf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/preallocf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/preallocf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/preallocf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/rd_atallbf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/rd_atallbf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/rd_atallbf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/rd_atallbf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/rd_atallef.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/rd_atallef.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/rd_atallef.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/rd_atallef.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/read_allbf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_allbf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/read_allbf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_allbf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/read_allef.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_allef.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/read_allef.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_allef.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/read_allf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_allf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/read_allf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_allf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/read_atallf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_atallf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/read_atallf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_atallf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/read_atf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_atf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/read_atf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_atf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/read_ordbf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_ordbf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/read_ordbf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_ordbf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/read_ordef.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_ordef.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/read_ordef.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_ordef.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/read_ordf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_ordf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/read_ordf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_ordf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/read_shf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_shf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/read_shf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/read_shf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/readf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/readf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/readf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/readf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/seek_shf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/seek_shf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/seek_shf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/seek_shf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/seekf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/seekf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/seekf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/seekf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/set_atomf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/set_atomf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/set_atomf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/set_atomf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/set_errhf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/set_errhf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/set_errhf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/set_errhf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/set_infof.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/set_infof.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/set_infof.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/set_infof.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/set_sizef.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/set_sizef.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/set_sizef.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/set_sizef.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/set_viewf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/set_viewf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/set_viewf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/set_viewf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/wr_atallbf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/wr_atallbf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/wr_atallbf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/wr_atallbf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/wr_atallef.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/wr_atallef.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/wr_atallef.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/wr_atallef.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/write_allbf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_allbf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/write_allbf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_allbf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/write_allef.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_allef.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/write_allef.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_allef.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/write_allf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_allf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/write_allf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_allf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/write_atallf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_atallf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/write_atallf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_atallf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/write_atf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_atf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/write_atf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_atf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/write_ordbf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_ordbf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/write_ordbf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_ordbf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/write_ordef.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_ordef.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/write_ordef.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_ordef.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/write_ordf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_ordf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/write_ordf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_ordf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/write_shf.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_shf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/write_shf.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/write_shf.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fortran/writef.c b/ompi/mca/io/romio/romio-dist/mpi-io/fortran/writef.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fortran/writef.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fortran/writef.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/fsync.c b/ompi/mca/io/romio/romio-dist/mpi-io/fsync.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/fsync.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/fsync.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/get_amode.c b/ompi/mca/io/romio/romio-dist/mpi-io/get_amode.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/get_amode.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/get_amode.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/get_atom.c b/ompi/mca/io/romio/romio-dist/mpi-io/get_atom.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/get_atom.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/get_atom.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/get_bytoff.c b/ompi/mca/io/romio/romio-dist/mpi-io/get_bytoff.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/get_bytoff.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/get_bytoff.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/get_errh.c b/ompi/mca/io/romio/romio-dist/mpi-io/get_errh.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/get_errh.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/get_errh.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/get_extent.c b/ompi/mca/io/romio/romio-dist/mpi-io/get_extent.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/get_extent.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/get_extent.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/get_group.c b/ompi/mca/io/romio/romio-dist/mpi-io/get_group.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/get_group.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/get_group.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/get_info.c b/ompi/mca/io/romio/romio-dist/mpi-io/get_info.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/get_info.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/get_info.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/get_posn.c b/ompi/mca/io/romio/romio-dist/mpi-io/get_posn.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/get_posn.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/get_posn.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/get_posn_sh.c b/ompi/mca/io/romio/romio-dist/mpi-io/get_posn_sh.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/get_posn_sh.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/get_posn_sh.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/get_size.c b/ompi/mca/io/romio/romio-dist/mpi-io/get_size.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/get_size.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/get_size.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/get_view.c b/ompi/mca/io/romio/romio-dist/mpi-io/get_view.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/get_view.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/get_view.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/ioreq_c2f.c b/ompi/mca/io/romio/romio-dist/mpi-io/ioreq_c2f.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/ioreq_c2f.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/ioreq_c2f.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/ioreq_f2c.c b/ompi/mca/io/romio/romio-dist/mpi-io/ioreq_f2c.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/ioreq_f2c.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/ioreq_f2c.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/iotest.c b/ompi/mca/io/romio/romio-dist/mpi-io/iotest.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/iotest.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/iotest.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/iowait.c b/ompi/mca/io/romio/romio-dist/mpi-io/iowait.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/iowait.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/iowait.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/iread.c b/ompi/mca/io/romio/romio-dist/mpi-io/iread.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/iread.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/iread.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/iread_at.c b/ompi/mca/io/romio/romio-dist/mpi-io/iread_at.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/iread_at.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/iread_at.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/iread_sh.c b/ompi/mca/io/romio/romio-dist/mpi-io/iread_sh.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/iread_sh.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/iread_sh.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/iwrite.c b/ompi/mca/io/romio/romio-dist/mpi-io/iwrite.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/iwrite.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/iwrite.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/iwrite_at.c b/ompi/mca/io/romio/romio-dist/mpi-io/iwrite_at.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/iwrite_at.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/iwrite_at.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/iwrite_sh.c b/ompi/mca/io/romio/romio-dist/mpi-io/iwrite_sh.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/iwrite_sh.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/iwrite_sh.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/mpioimpl.h b/ompi/mca/io/romio/romio-dist/mpi-io/mpioimpl.h
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/mpioimpl.h
rename to ompi/mca/io/romio/romio-dist/mpi-io/mpioimpl.h
diff --git a/src/mca/io/romio/romio-dist/mpi-io/mpioprof.h b/ompi/mca/io/romio/romio-dist/mpi-io/mpioprof.h
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/mpioprof.h
rename to ompi/mca/io/romio/romio-dist/mpi-io/mpioprof.h
diff --git a/src/mca/io/romio/romio-dist/mpi-io/open.c b/ompi/mca/io/romio/romio-dist/mpi-io/open.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/open.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/open.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/prealloc.c b/ompi/mca/io/romio/romio-dist/mpi-io/prealloc.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/prealloc.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/prealloc.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/rd_atallb.c b/ompi/mca/io/romio/romio-dist/mpi-io/rd_atallb.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/rd_atallb.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/rd_atallb.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/rd_atalle.c b/ompi/mca/io/romio/romio-dist/mpi-io/rd_atalle.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/rd_atalle.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/rd_atalle.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/read.c b/ompi/mca/io/romio/romio-dist/mpi-io/read.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/read.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/read.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/read_all.c b/ompi/mca/io/romio/romio-dist/mpi-io/read_all.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/read_all.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/read_all.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/read_allb.c b/ompi/mca/io/romio/romio-dist/mpi-io/read_allb.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/read_allb.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/read_allb.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/read_alle.c b/ompi/mca/io/romio/romio-dist/mpi-io/read_alle.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/read_alle.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/read_alle.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/read_at.c b/ompi/mca/io/romio/romio-dist/mpi-io/read_at.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/read_at.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/read_at.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/read_atall.c b/ompi/mca/io/romio/romio-dist/mpi-io/read_atall.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/read_atall.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/read_atall.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/read_ord.c b/ompi/mca/io/romio/romio-dist/mpi-io/read_ord.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/read_ord.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/read_ord.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/read_ordb.c b/ompi/mca/io/romio/romio-dist/mpi-io/read_ordb.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/read_ordb.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/read_ordb.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/read_orde.c b/ompi/mca/io/romio/romio-dist/mpi-io/read_orde.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/read_orde.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/read_orde.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/read_sh.c b/ompi/mca/io/romio/romio-dist/mpi-io/read_sh.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/read_sh.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/read_sh.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/seek.c b/ompi/mca/io/romio/romio-dist/mpi-io/seek.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/seek.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/seek.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/seek_sh.c b/ompi/mca/io/romio/romio-dist/mpi-io/seek_sh.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/seek_sh.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/seek_sh.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/set_atom.c b/ompi/mca/io/romio/romio-dist/mpi-io/set_atom.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/set_atom.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/set_atom.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/set_errh.c b/ompi/mca/io/romio/romio-dist/mpi-io/set_errh.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/set_errh.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/set_errh.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/set_info.c b/ompi/mca/io/romio/romio-dist/mpi-io/set_info.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/set_info.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/set_info.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/set_size.c b/ompi/mca/io/romio/romio-dist/mpi-io/set_size.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/set_size.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/set_size.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/set_view.c b/ompi/mca/io/romio/romio-dist/mpi-io/set_view.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/set_view.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/set_view.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/wr_atallb.c b/ompi/mca/io/romio/romio-dist/mpi-io/wr_atallb.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/wr_atallb.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/wr_atallb.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/wr_atalle.c b/ompi/mca/io/romio/romio-dist/mpi-io/wr_atalle.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/wr_atalle.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/wr_atalle.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/write.c b/ompi/mca/io/romio/romio-dist/mpi-io/write.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/write.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/write.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/write_all.c b/ompi/mca/io/romio/romio-dist/mpi-io/write_all.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/write_all.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/write_all.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/write_allb.c b/ompi/mca/io/romio/romio-dist/mpi-io/write_allb.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/write_allb.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/write_allb.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/write_alle.c b/ompi/mca/io/romio/romio-dist/mpi-io/write_alle.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/write_alle.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/write_alle.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/write_at.c b/ompi/mca/io/romio/romio-dist/mpi-io/write_at.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/write_at.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/write_at.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/write_atall.c b/ompi/mca/io/romio/romio-dist/mpi-io/write_atall.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/write_atall.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/write_atall.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/write_ord.c b/ompi/mca/io/romio/romio-dist/mpi-io/write_ord.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/write_ord.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/write_ord.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/write_ordb.c b/ompi/mca/io/romio/romio-dist/mpi-io/write_ordb.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/write_ordb.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/write_ordb.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/write_orde.c b/ompi/mca/io/romio/romio-dist/mpi-io/write_orde.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/write_orde.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/write_orde.c
diff --git a/src/mca/io/romio/romio-dist/mpi-io/write_sh.c b/ompi/mca/io/romio/romio-dist/mpi-io/write_sh.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi-io/write_sh.c
rename to ompi/mca/io/romio/romio-dist/mpi-io/write_sh.c
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/array/Makefile.in b/ompi/mca/io/romio/romio-dist/mpi2-other/array/Makefile.in
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/array/Makefile.in
rename to ompi/mca/io/romio/romio-dist/mpi2-other/array/Makefile.in
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/array/darray.c b/ompi/mca/io/romio/romio-dist/mpi2-other/array/darray.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/array/darray.c
rename to ompi/mca/io/romio/romio-dist/mpi2-other/array/darray.c
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/array/fortran/Makefile.in b/ompi/mca/io/romio/romio-dist/mpi2-other/array/fortran/Makefile.in
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/array/fortran/Makefile.in
rename to ompi/mca/io/romio/romio-dist/mpi2-other/array/fortran/Makefile.in
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/array/fortran/darrayf.c b/ompi/mca/io/romio/romio-dist/mpi2-other/array/fortran/darrayf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/array/fortran/darrayf.c
rename to ompi/mca/io/romio/romio-dist/mpi2-other/array/fortran/darrayf.c
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/array/fortran/subarrayf.c b/ompi/mca/io/romio/romio-dist/mpi2-other/array/fortran/subarrayf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/array/fortran/subarrayf.c
rename to ompi/mca/io/romio/romio-dist/mpi2-other/array/fortran/subarrayf.c
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/array/subarray.c b/ompi/mca/io/romio/romio-dist/mpi2-other/array/subarray.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/array/subarray.c
rename to ompi/mca/io/romio/romio-dist/mpi2-other/array/subarray.c
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/info/Makefile.in b/ompi/mca/io/romio/romio-dist/mpi2-other/info/Makefile.in
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/info/Makefile.in
rename to ompi/mca/io/romio/romio-dist/mpi2-other/info/Makefile.in
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/info/fortran/Makefile.in b/ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/Makefile.in
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/info/fortran/Makefile.in
rename to ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/Makefile.in
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_createf.c b/ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_createf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_createf.c
rename to ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_createf.c
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_deletef.c b/ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_deletef.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_deletef.c
rename to ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_deletef.c
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_dupf.c b/ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_dupf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_dupf.c
rename to ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_dupf.c
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_freef.c b/ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_freef.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_freef.c
rename to ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_freef.c
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_getf.c b/ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_getf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_getf.c
rename to ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_getf.c
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_getnksf.c b/ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_getnksf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_getnksf.c
rename to ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_getnksf.c
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_getnthf.c b/ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_getnthf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_getnthf.c
rename to ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_getnthf.c
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_getvlnf.c b/ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_getvlnf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_getvlnf.c
rename to ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_getvlnf.c
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_setf.c b/ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_setf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_setf.c
rename to ompi/mca/io/romio/romio-dist/mpi2-other/info/fortran/info_setf.c
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/info/info_c2f.c b/ompi/mca/io/romio/romio-dist/mpi2-other/info/info_c2f.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/info/info_c2f.c
rename to ompi/mca/io/romio/romio-dist/mpi2-other/info/info_c2f.c
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/info/info_create.c b/ompi/mca/io/romio/romio-dist/mpi2-other/info/info_create.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/info/info_create.c
rename to ompi/mca/io/romio/romio-dist/mpi2-other/info/info_create.c
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/info/info_delete.c b/ompi/mca/io/romio/romio-dist/mpi2-other/info/info_delete.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/info/info_delete.c
rename to ompi/mca/io/romio/romio-dist/mpi2-other/info/info_delete.c
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/info/info_dup.c b/ompi/mca/io/romio/romio-dist/mpi2-other/info/info_dup.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/info/info_dup.c
rename to ompi/mca/io/romio/romio-dist/mpi2-other/info/info_dup.c
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/info/info_f2c.c b/ompi/mca/io/romio/romio-dist/mpi2-other/info/info_f2c.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/info/info_f2c.c
rename to ompi/mca/io/romio/romio-dist/mpi2-other/info/info_f2c.c
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/info/info_free.c b/ompi/mca/io/romio/romio-dist/mpi2-other/info/info_free.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/info/info_free.c
rename to ompi/mca/io/romio/romio-dist/mpi2-other/info/info_free.c
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/info/info_get.c b/ompi/mca/io/romio/romio-dist/mpi2-other/info/info_get.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/info/info_get.c
rename to ompi/mca/io/romio/romio-dist/mpi2-other/info/info_get.c
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/info/info_getnks.c b/ompi/mca/io/romio/romio-dist/mpi2-other/info/info_getnks.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/info/info_getnks.c
rename to ompi/mca/io/romio/romio-dist/mpi2-other/info/info_getnks.c
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/info/info_getnth.c b/ompi/mca/io/romio/romio-dist/mpi2-other/info/info_getnth.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/info/info_getnth.c
rename to ompi/mca/io/romio/romio-dist/mpi2-other/info/info_getnth.c
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/info/info_getvln.c b/ompi/mca/io/romio/romio-dist/mpi2-other/info/info_getvln.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/info/info_getvln.c
rename to ompi/mca/io/romio/romio-dist/mpi2-other/info/info_getvln.c
diff --git a/src/mca/io/romio/romio-dist/mpi2-other/info/info_set.c b/ompi/mca/io/romio/romio-dist/mpi2-other/info/info_set.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/mpi2-other/info/info_set.c
rename to ompi/mca/io/romio/romio-dist/mpi2-other/info/info_set.c
diff --git a/src/mca/io/romio/romio-dist/test/Makefile.in b/ompi/mca/io/romio/romio-dist/test/Makefile.in
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/Makefile.in
rename to ompi/mca/io/romio/romio-dist/test/Makefile.in
diff --git a/src/mca/io/romio/romio-dist/test/README b/ompi/mca/io/romio/romio-dist/test/README
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/README
rename to ompi/mca/io/romio/romio-dist/test/README
diff --git a/src/mca/io/romio/romio-dist/test/async.c b/ompi/mca/io/romio/romio-dist/test/async.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/async.c
rename to ompi/mca/io/romio/romio-dist/test/async.c
diff --git a/src/mca/io/romio/romio-dist/test/atomicity.c b/ompi/mca/io/romio/romio-dist/test/atomicity.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/atomicity.c
rename to ompi/mca/io/romio/romio-dist/test/atomicity.c
diff --git a/src/mca/io/romio/romio-dist/test/coll_perf.c b/ompi/mca/io/romio/romio-dist/test/coll_perf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/coll_perf.c
rename to ompi/mca/io/romio/romio-dist/test/coll_perf.c
diff --git a/src/mca/io/romio/romio-dist/test/coll_test.c b/ompi/mca/io/romio/romio-dist/test/coll_test.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/coll_test.c
rename to ompi/mca/io/romio/romio-dist/test/coll_test.c
diff --git a/src/mca/io/romio/romio-dist/test/error.c b/ompi/mca/io/romio/romio-dist/test/error.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/error.c
rename to ompi/mca/io/romio/romio-dist/test/error.c
diff --git a/src/mca/io/romio/romio-dist/test/excl.c b/ompi/mca/io/romio/romio-dist/test/excl.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/excl.c
rename to ompi/mca/io/romio/romio-dist/test/excl.c
diff --git a/src/mca/io/romio/romio-dist/test/fcoll_test.f.in b/ompi/mca/io/romio/romio-dist/test/fcoll_test.f.in
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/fcoll_test.f.in
rename to ompi/mca/io/romio/romio-dist/test/fcoll_test.f.in
diff --git a/src/mca/io/romio/romio-dist/test/file_info.c b/ompi/mca/io/romio/romio-dist/test/file_info.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/file_info.c
rename to ompi/mca/io/romio/romio-dist/test/file_info.c
diff --git a/src/mca/io/romio/romio-dist/test/fmisc.f.in b/ompi/mca/io/romio/romio-dist/test/fmisc.f.in
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/fmisc.f.in
rename to ompi/mca/io/romio/romio-dist/test/fmisc.f.in
diff --git a/src/mca/io/romio/romio-dist/test/fperf.f.in b/ompi/mca/io/romio/romio-dist/test/fperf.f.in
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/fperf.f.in
rename to ompi/mca/io/romio/romio-dist/test/fperf.f.in
diff --git a/src/mca/io/romio/romio-dist/test/i_noncontig.c b/ompi/mca/io/romio/romio-dist/test/i_noncontig.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/i_noncontig.c
rename to ompi/mca/io/romio/romio-dist/test/i_noncontig.c
diff --git a/src/mca/io/romio/romio-dist/test/large_array.c b/ompi/mca/io/romio/romio-dist/test/large_array.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/large_array.c
rename to ompi/mca/io/romio/romio-dist/test/large_array.c
diff --git a/src/mca/io/romio/romio-dist/test/large_file.c.in b/ompi/mca/io/romio/romio-dist/test/large_file.c.in
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/large_file.c.in
rename to ompi/mca/io/romio/romio-dist/test/large_file.c.in
diff --git a/src/mca/io/romio/romio-dist/test/misc.c.in b/ompi/mca/io/romio/romio-dist/test/misc.c.in
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/misc.c.in
rename to ompi/mca/io/romio/romio-dist/test/misc.c.in
diff --git a/src/mca/io/romio/romio-dist/test/noncontig.c b/ompi/mca/io/romio/romio-dist/test/noncontig.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/noncontig.c
rename to ompi/mca/io/romio/romio-dist/test/noncontig.c
diff --git a/src/mca/io/romio/romio-dist/test/noncontig_coll.c b/ompi/mca/io/romio/romio-dist/test/noncontig_coll.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/noncontig_coll.c
rename to ompi/mca/io/romio/romio-dist/test/noncontig_coll.c
diff --git a/src/mca/io/romio/romio-dist/test/noncontig_coll2.c b/ompi/mca/io/romio/romio-dist/test/noncontig_coll2.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/noncontig_coll2.c
rename to ompi/mca/io/romio/romio-dist/test/noncontig_coll2.c
diff --git a/src/mca/io/romio/romio-dist/test/perf.c b/ompi/mca/io/romio/romio-dist/test/perf.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/perf.c
rename to ompi/mca/io/romio/romio-dist/test/perf.c
diff --git a/src/mca/io/romio/romio-dist/test/pfcoll_test.f.in b/ompi/mca/io/romio/romio-dist/test/pfcoll_test.f.in
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/pfcoll_test.f.in
rename to ompi/mca/io/romio/romio-dist/test/pfcoll_test.f.in
diff --git a/src/mca/io/romio/romio-dist/test/psimple.c b/ompi/mca/io/romio/romio-dist/test/psimple.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/psimple.c
rename to ompi/mca/io/romio/romio-dist/test/psimple.c
diff --git a/src/mca/io/romio/romio-dist/test/runtests.in b/ompi/mca/io/romio/romio-dist/test/runtests.in
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/runtests.in
rename to ompi/mca/io/romio/romio-dist/test/runtests.in
diff --git a/src/mca/io/romio/romio-dist/test/shared_fp.c b/ompi/mca/io/romio/romio-dist/test/shared_fp.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/shared_fp.c
rename to ompi/mca/io/romio/romio-dist/test/shared_fp.c
diff --git a/src/mca/io/romio/romio-dist/test/simple.c b/ompi/mca/io/romio/romio-dist/test/simple.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/simple.c
rename to ompi/mca/io/romio/romio-dist/test/simple.c
diff --git a/src/mca/io/romio/romio-dist/test/split_coll.c b/ompi/mca/io/romio/romio-dist/test/split_coll.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/split_coll.c
rename to ompi/mca/io/romio/romio-dist/test/split_coll.c
diff --git a/src/mca/io/romio/romio-dist/test/status.c b/ompi/mca/io/romio/romio-dist/test/status.c
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/status.c
rename to ompi/mca/io/romio/romio-dist/test/status.c
diff --git a/src/mca/io/romio/romio-dist/test/std/async.std b/ompi/mca/io/romio/romio-dist/test/std/async.std
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/std/async.std
rename to ompi/mca/io/romio/romio-dist/test/std/async.std
diff --git a/src/mca/io/romio/romio-dist/test/std/atomicity.std b/ompi/mca/io/romio/romio-dist/test/std/atomicity.std
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/std/atomicity.std
rename to ompi/mca/io/romio/romio-dist/test/std/atomicity.std
diff --git a/src/mca/io/romio/romio-dist/test/std/coll_test.std b/ompi/mca/io/romio/romio-dist/test/std/coll_test.std
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/std/coll_test.std
rename to ompi/mca/io/romio/romio-dist/test/std/coll_test.std
diff --git a/src/mca/io/romio/romio-dist/test/std/error.std b/ompi/mca/io/romio/romio-dist/test/std/error.std
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/std/error.std
rename to ompi/mca/io/romio/romio-dist/test/std/error.std
diff --git a/src/mca/io/romio/romio-dist/test/std/excl.std b/ompi/mca/io/romio/romio-dist/test/std/excl.std
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/std/excl.std
rename to ompi/mca/io/romio/romio-dist/test/std/excl.std
diff --git a/src/mca/io/romio/romio-dist/test/std/fcoll_test.std b/ompi/mca/io/romio/romio-dist/test/std/fcoll_test.std
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/std/fcoll_test.std
rename to ompi/mca/io/romio/romio-dist/test/std/fcoll_test.std
diff --git a/src/mca/io/romio/romio-dist/test/std/file_info.std b/ompi/mca/io/romio/romio-dist/test/std/file_info.std
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/std/file_info.std
rename to ompi/mca/io/romio/romio-dist/test/std/file_info.std
diff --git a/src/mca/io/romio/romio-dist/test/std/fmisc.std b/ompi/mca/io/romio/romio-dist/test/std/fmisc.std
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/std/fmisc.std
rename to ompi/mca/io/romio/romio-dist/test/std/fmisc.std
diff --git a/src/mca/io/romio/romio-dist/test/std/i_noncontig.std b/ompi/mca/io/romio/romio-dist/test/std/i_noncontig.std
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/std/i_noncontig.std
rename to ompi/mca/io/romio/romio-dist/test/std/i_noncontig.std
diff --git a/src/mca/io/romio/romio-dist/test/std/misc.std b/ompi/mca/io/romio/romio-dist/test/std/misc.std
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/std/misc.std
rename to ompi/mca/io/romio/romio-dist/test/std/misc.std
diff --git a/src/mca/io/romio/romio-dist/test/std/noncontig.std b/ompi/mca/io/romio/romio-dist/test/std/noncontig.std
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/std/noncontig.std
rename to ompi/mca/io/romio/romio-dist/test/std/noncontig.std
diff --git a/src/mca/io/romio/romio-dist/test/std/noncontig_coll.std b/ompi/mca/io/romio/romio-dist/test/std/noncontig_coll.std
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/std/noncontig_coll.std
rename to ompi/mca/io/romio/romio-dist/test/std/noncontig_coll.std
diff --git a/src/mca/io/romio/romio-dist/test/std/noncontig_coll2.std b/ompi/mca/io/romio/romio-dist/test/std/noncontig_coll2.std
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/std/noncontig_coll2.std
rename to ompi/mca/io/romio/romio-dist/test/std/noncontig_coll2.std
diff --git a/src/mca/io/romio/romio-dist/test/std/pfcoll_test.std b/ompi/mca/io/romio/romio-dist/test/std/pfcoll_test.std
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/std/pfcoll_test.std
rename to ompi/mca/io/romio/romio-dist/test/std/pfcoll_test.std
diff --git a/src/mca/io/romio/romio-dist/test/std/psimple.std b/ompi/mca/io/romio/romio-dist/test/std/psimple.std
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/std/psimple.std
rename to ompi/mca/io/romio/romio-dist/test/std/psimple.std
diff --git a/src/mca/io/romio/romio-dist/test/std/shared_fp.std b/ompi/mca/io/romio/romio-dist/test/std/shared_fp.std
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/std/shared_fp.std
rename to ompi/mca/io/romio/romio-dist/test/std/shared_fp.std
diff --git a/src/mca/io/romio/romio-dist/test/std/simple.std b/ompi/mca/io/romio/romio-dist/test/std/simple.std
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/std/simple.std
rename to ompi/mca/io/romio/romio-dist/test/std/simple.std
diff --git a/src/mca/io/romio/romio-dist/test/std/split_coll.std b/ompi/mca/io/romio/romio-dist/test/std/split_coll.std
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/std/split_coll.std
rename to ompi/mca/io/romio/romio-dist/test/std/split_coll.std
diff --git a/src/mca/io/romio/romio-dist/test/std/status.std b/ompi/mca/io/romio/romio-dist/test/std/status.std
similarity index 100%
rename from src/mca/io/romio/romio-dist/test/std/status.std
rename to ompi/mca/io/romio/romio-dist/test/std/status.std
diff --git a/src/mca/io/romio/romio-dist/util/Makefile.am b/ompi/mca/io/romio/romio-dist/util/Makefile.am
similarity index 100%
rename from src/mca/io/romio/romio-dist/util/Makefile.am
rename to ompi/mca/io/romio/romio-dist/util/Makefile.am
diff --git a/src/mca/io/romio/romio-dist/util/romioinstall.in b/ompi/mca/io/romio/romio-dist/util/romioinstall.in
similarity index 100%
rename from src/mca/io/romio/romio-dist/util/romioinstall.in
rename to ompi/mca/io/romio/romio-dist/util/romioinstall.in
diff --git a/src/mca/io/romio/romio-dist/util/tarch b/ompi/mca/io/romio/romio-dist/util/tarch
similarity index 100%
rename from src/mca/io/romio/romio-dist/util/tarch
rename to ompi/mca/io/romio/romio-dist/util/tarch
diff --git a/src/mca/io/romio/src/Makefile.extra b/ompi/mca/io/romio/src/Makefile.extra
similarity index 100%
rename from src/mca/io/romio/src/Makefile.extra
rename to ompi/mca/io/romio/src/Makefile.extra
diff --git a/src/mca/io/romio/src/io_romio.h b/ompi/mca/io/romio/src/io_romio.h
similarity index 100%
rename from src/mca/io/romio/src/io_romio.h
rename to ompi/mca/io/romio/src/io_romio.h
diff --git a/src/mca/io/romio/src/io_romio_component.c b/ompi/mca/io/romio/src/io_romio_component.c
similarity index 100%
rename from src/mca/io/romio/src/io_romio_component.c
rename to ompi/mca/io/romio/src/io_romio_component.c
diff --git a/src/mca/io/romio/src/io_romio_file_open.c b/ompi/mca/io/romio/src/io_romio_file_open.c
similarity index 100%
rename from src/mca/io/romio/src/io_romio_file_open.c
rename to ompi/mca/io/romio/src/io_romio_file_open.c
diff --git a/src/mca/io/romio/src/io_romio_file_read.c b/ompi/mca/io/romio/src/io_romio_file_read.c
similarity index 100%
rename from src/mca/io/romio/src/io_romio_file_read.c
rename to ompi/mca/io/romio/src/io_romio_file_read.c
diff --git a/src/mca/io/romio/src/io_romio_file_write.c b/ompi/mca/io/romio/src/io_romio_file_write.c
similarity index 100%
rename from src/mca/io/romio/src/io_romio_file_write.c
rename to ompi/mca/io/romio/src/io_romio_file_write.c
diff --git a/src/mca/io/romio/src/io_romio_module.c b/ompi/mca/io/romio/src/io_romio_module.c
similarity index 100%
rename from src/mca/io/romio/src/io_romio_module.c
rename to ompi/mca/io/romio/src/io_romio_module.c
diff --git a/src/mca/io/romio/src/io_romio_request.c b/ompi/mca/io/romio/src/io_romio_request.c
similarity index 100%
rename from src/mca/io/romio/src/io_romio_request.c
rename to ompi/mca/io/romio/src/io_romio_request.c
diff --git a/src/mca/mca.h b/ompi/mca/mca.h
similarity index 100%
rename from src/mca/mca.h
rename to ompi/mca/mca.h
diff --git a/src/mca/pml/Makefile.am b/ompi/mca/pml/Makefile.am
similarity index 100%
rename from src/mca/pml/Makefile.am
rename to ompi/mca/pml/Makefile.am
diff --git a/src/mca/pml/base/Makefile.am b/ompi/mca/pml/base/Makefile.am
similarity index 100%
rename from src/mca/pml/base/Makefile.am
rename to ompi/mca/pml/base/Makefile.am
diff --git a/src/mca/pml/base/base.h b/ompi/mca/pml/base/base.h
similarity index 100%
rename from src/mca/pml/base/base.h
rename to ompi/mca/pml/base/base.h
diff --git a/src/mca/pml/base/pml_base_bsend.c b/ompi/mca/pml/base/pml_base_bsend.c
similarity index 100%
rename from src/mca/pml/base/pml_base_bsend.c
rename to ompi/mca/pml/base/pml_base_bsend.c
diff --git a/src/mca/pml/base/pml_base_bsend.h b/ompi/mca/pml/base/pml_base_bsend.h
similarity index 100%
rename from src/mca/pml/base/pml_base_bsend.h
rename to ompi/mca/pml/base/pml_base_bsend.h
diff --git a/src/mca/pml/base/pml_base_close.c b/ompi/mca/pml/base/pml_base_close.c
similarity index 100%
rename from src/mca/pml/base/pml_base_close.c
rename to ompi/mca/pml/base/pml_base_close.c
diff --git a/src/mca/pml/base/pml_base_open.c b/ompi/mca/pml/base/pml_base_open.c
similarity index 100%
rename from src/mca/pml/base/pml_base_open.c
rename to ompi/mca/pml/base/pml_base_open.c
diff --git a/src/mca/pml/base/pml_base_recvreq.c b/ompi/mca/pml/base/pml_base_recvreq.c
similarity index 100%
rename from src/mca/pml/base/pml_base_recvreq.c
rename to ompi/mca/pml/base/pml_base_recvreq.c
diff --git a/src/mca/pml/base/pml_base_recvreq.h b/ompi/mca/pml/base/pml_base_recvreq.h
similarity index 100%
rename from src/mca/pml/base/pml_base_recvreq.h
rename to ompi/mca/pml/base/pml_base_recvreq.h
diff --git a/src/mca/pml/base/pml_base_request.c b/ompi/mca/pml/base/pml_base_request.c
similarity index 100%
rename from src/mca/pml/base/pml_base_request.c
rename to ompi/mca/pml/base/pml_base_request.c
diff --git a/src/mca/pml/base/pml_base_request.h b/ompi/mca/pml/base/pml_base_request.h
similarity index 100%
rename from src/mca/pml/base/pml_base_request.h
rename to ompi/mca/pml/base/pml_base_request.h
diff --git a/src/mca/pml/base/pml_base_select.c b/ompi/mca/pml/base/pml_base_select.c
similarity index 100%
rename from src/mca/pml/base/pml_base_select.c
rename to ompi/mca/pml/base/pml_base_select.c
diff --git a/src/mca/pml/base/pml_base_sendreq.c b/ompi/mca/pml/base/pml_base_sendreq.c
similarity index 100%
rename from src/mca/pml/base/pml_base_sendreq.c
rename to ompi/mca/pml/base/pml_base_sendreq.c
diff --git a/src/mca/pml/base/pml_base_sendreq.h b/ompi/mca/pml/base/pml_base_sendreq.h
similarity index 100%
rename from src/mca/pml/base/pml_base_sendreq.h
rename to ompi/mca/pml/base/pml_base_sendreq.h
diff --git a/src/mca/pml/example/.ompi_ignore b/ompi/mca/pml/example/.ompi_ignore
similarity index 100%
rename from src/mca/pml/example/.ompi_ignore
rename to ompi/mca/pml/example/.ompi_ignore
diff --git a/src/mca/pml/example/Makefile.am b/ompi/mca/pml/example/Makefile.am
similarity index 100%
rename from src/mca/pml/example/Makefile.am
rename to ompi/mca/pml/example/Makefile.am
diff --git a/src/mca/pml/example/configure.params b/ompi/mca/pml/example/configure.params
similarity index 100%
rename from src/mca/pml/example/configure.params
rename to ompi/mca/pml/example/configure.params
diff --git a/src/mca/pml/example/pml_example.c b/ompi/mca/pml/example/pml_example.c
similarity index 100%
rename from src/mca/pml/example/pml_example.c
rename to ompi/mca/pml/example/pml_example.c
diff --git a/src/mca/pml/example/pml_example.h b/ompi/mca/pml/example/pml_example.h
similarity index 100%
rename from src/mca/pml/example/pml_example.h
rename to ompi/mca/pml/example/pml_example.h
diff --git a/src/mca/pml/example/pml_example_cancel.c b/ompi/mca/pml/example/pml_example_cancel.c
similarity index 100%
rename from src/mca/pml/example/pml_example_cancel.c
rename to ompi/mca/pml/example/pml_example_cancel.c
diff --git a/src/mca/pml/example/pml_example_component.c b/ompi/mca/pml/example/pml_example_component.c
similarity index 100%
rename from src/mca/pml/example/pml_example_component.c
rename to ompi/mca/pml/example/pml_example_component.c
diff --git a/src/mca/pml/example/pml_example_iprobe.c b/ompi/mca/pml/example/pml_example_iprobe.c
similarity index 100%
rename from src/mca/pml/example/pml_example_iprobe.c
rename to ompi/mca/pml/example/pml_example_iprobe.c
diff --git a/src/mca/pml/example/pml_example_irecv.c b/ompi/mca/pml/example/pml_example_irecv.c
similarity index 100%
rename from src/mca/pml/example/pml_example_irecv.c
rename to ompi/mca/pml/example/pml_example_irecv.c
diff --git a/src/mca/pml/example/pml_example_isend.c b/ompi/mca/pml/example/pml_example_isend.c
similarity index 100%
rename from src/mca/pml/example/pml_example_isend.c
rename to ompi/mca/pml/example/pml_example_isend.c
diff --git a/src/mca/pml/example/pml_example_proc.c b/ompi/mca/pml/example/pml_example_proc.c
similarity index 100%
rename from src/mca/pml/example/pml_example_proc.c
rename to ompi/mca/pml/example/pml_example_proc.c
diff --git a/src/mca/pml/example/pml_example_proc.h b/ompi/mca/pml/example/pml_example_proc.h
similarity index 100%
rename from src/mca/pml/example/pml_example_proc.h
rename to ompi/mca/pml/example/pml_example_proc.h
diff --git a/src/mca/pml/example/pml_example_progress.c b/ompi/mca/pml/example/pml_example_progress.c
similarity index 100%
rename from src/mca/pml/example/pml_example_progress.c
rename to ompi/mca/pml/example/pml_example_progress.c
diff --git a/src/mca/pml/example/pml_example_ptl.c b/ompi/mca/pml/example/pml_example_ptl.c
similarity index 100%
rename from src/mca/pml/example/pml_example_ptl.c
rename to ompi/mca/pml/example/pml_example_ptl.c
diff --git a/src/mca/pml/example/pml_example_ptl.h b/ompi/mca/pml/example/pml_example_ptl.h
similarity index 100%
rename from src/mca/pml/example/pml_example_ptl.h
rename to ompi/mca/pml/example/pml_example_ptl.h
diff --git a/src/mca/pml/example/pml_example_recvfrag.c b/ompi/mca/pml/example/pml_example_recvfrag.c
similarity index 100%
rename from src/mca/pml/example/pml_example_recvfrag.c
rename to ompi/mca/pml/example/pml_example_recvfrag.c
diff --git a/src/mca/pml/example/pml_example_recvfrag.h b/ompi/mca/pml/example/pml_example_recvfrag.h
similarity index 100%
rename from src/mca/pml/example/pml_example_recvfrag.h
rename to ompi/mca/pml/example/pml_example_recvfrag.h
diff --git a/src/mca/pml/example/pml_example_recvreq.c b/ompi/mca/pml/example/pml_example_recvreq.c
similarity index 100%
rename from src/mca/pml/example/pml_example_recvreq.c
rename to ompi/mca/pml/example/pml_example_recvreq.c
diff --git a/src/mca/pml/example/pml_example_recvreq.h b/ompi/mca/pml/example/pml_example_recvreq.h
similarity index 100%
rename from src/mca/pml/example/pml_example_recvreq.h
rename to ompi/mca/pml/example/pml_example_recvreq.h
diff --git a/src/mca/pml/example/pml_example_sendreq.c b/ompi/mca/pml/example/pml_example_sendreq.c
similarity index 100%
rename from src/mca/pml/example/pml_example_sendreq.c
rename to ompi/mca/pml/example/pml_example_sendreq.c
diff --git a/src/mca/pml/example/pml_example_sendreq.h b/ompi/mca/pml/example/pml_example_sendreq.h
similarity index 100%
rename from src/mca/pml/example/pml_example_sendreq.h
rename to ompi/mca/pml/example/pml_example_sendreq.h
diff --git a/src/mca/pml/example/pml_example_start.c b/ompi/mca/pml/example/pml_example_start.c
similarity index 100%
rename from src/mca/pml/example/pml_example_start.c
rename to ompi/mca/pml/example/pml_example_start.c
diff --git a/src/mca/pml/ob1/.ompi_ignore b/ompi/mca/pml/ob1/.ompi_ignore
similarity index 100%
rename from src/mca/pml/ob1/.ompi_ignore
rename to ompi/mca/pml/ob1/.ompi_ignore
diff --git a/src/mca/pml/ob1/.ompi_unignore b/ompi/mca/pml/ob1/.ompi_unignore
similarity index 100%
rename from src/mca/pml/ob1/.ompi_unignore
rename to ompi/mca/pml/ob1/.ompi_unignore
diff --git a/src/mca/pml/ob1/Makefile.am b/ompi/mca/pml/ob1/Makefile.am
similarity index 100%
rename from src/mca/pml/ob1/Makefile.am
rename to ompi/mca/pml/ob1/Makefile.am
diff --git a/src/mca/pml/ob1/configure.params b/ompi/mca/pml/ob1/configure.params
similarity index 100%
rename from src/mca/pml/ob1/configure.params
rename to ompi/mca/pml/ob1/configure.params
diff --git a/src/mca/pml/ob1/pml_ob1.c b/ompi/mca/pml/ob1/pml_ob1.c
similarity index 100%
rename from src/mca/pml/ob1/pml_ob1.c
rename to ompi/mca/pml/ob1/pml_ob1.c
diff --git a/src/mca/pml/ob1/pml_ob1.h b/ompi/mca/pml/ob1/pml_ob1.h
similarity index 100%
rename from src/mca/pml/ob1/pml_ob1.h
rename to ompi/mca/pml/ob1/pml_ob1.h
diff --git a/src/mca/pml/ob1/pml_ob1_comm.c b/ompi/mca/pml/ob1/pml_ob1_comm.c
similarity index 100%
rename from src/mca/pml/ob1/pml_ob1_comm.c
rename to ompi/mca/pml/ob1/pml_ob1_comm.c
diff --git a/src/mca/pml/ob1/pml_ob1_comm.h b/ompi/mca/pml/ob1/pml_ob1_comm.h
similarity index 100%
rename from src/mca/pml/ob1/pml_ob1_comm.h
rename to ompi/mca/pml/ob1/pml_ob1_comm.h
diff --git a/src/mca/pml/ob1/pml_ob1_component.c b/ompi/mca/pml/ob1/pml_ob1_component.c
similarity index 100%
rename from src/mca/pml/ob1/pml_ob1_component.c
rename to ompi/mca/pml/ob1/pml_ob1_component.c
diff --git a/src/mca/pml/ob1/pml_ob1_component.h b/ompi/mca/pml/ob1/pml_ob1_component.h
similarity index 100%
rename from src/mca/pml/ob1/pml_ob1_component.h
rename to ompi/mca/pml/ob1/pml_ob1_component.h
diff --git a/src/mca/pml/ob1/pml_ob1_endpoint.c b/ompi/mca/pml/ob1/pml_ob1_endpoint.c
similarity index 100%
rename from src/mca/pml/ob1/pml_ob1_endpoint.c
rename to ompi/mca/pml/ob1/pml_ob1_endpoint.c
diff --git a/src/mca/pml/ob1/pml_ob1_endpoint.h b/ompi/mca/pml/ob1/pml_ob1_endpoint.h
similarity index 100%
rename from src/mca/pml/ob1/pml_ob1_endpoint.h
rename to ompi/mca/pml/ob1/pml_ob1_endpoint.h
diff --git a/src/mca/pml/ob1/pml_ob1_hdr.h b/ompi/mca/pml/ob1/pml_ob1_hdr.h
similarity index 100%
rename from src/mca/pml/ob1/pml_ob1_hdr.h
rename to ompi/mca/pml/ob1/pml_ob1_hdr.h
diff --git a/src/mca/pml/ob1/pml_ob1_iprobe.c b/ompi/mca/pml/ob1/pml_ob1_iprobe.c
similarity index 100%
rename from src/mca/pml/ob1/pml_ob1_iprobe.c
rename to ompi/mca/pml/ob1/pml_ob1_iprobe.c
diff --git a/src/mca/pml/ob1/pml_ob1_irecv.c b/ompi/mca/pml/ob1/pml_ob1_irecv.c
similarity index 100%
rename from src/mca/pml/ob1/pml_ob1_irecv.c
rename to ompi/mca/pml/ob1/pml_ob1_irecv.c
diff --git a/src/mca/pml/ob1/pml_ob1_isend.c b/ompi/mca/pml/ob1/pml_ob1_isend.c
similarity index 100%
rename from src/mca/pml/ob1/pml_ob1_isend.c
rename to ompi/mca/pml/ob1/pml_ob1_isend.c
diff --git a/src/mca/pml/ob1/pml_ob1_proc.c b/ompi/mca/pml/ob1/pml_ob1_proc.c
similarity index 100%
rename from src/mca/pml/ob1/pml_ob1_proc.c
rename to ompi/mca/pml/ob1/pml_ob1_proc.c
diff --git a/src/mca/pml/ob1/pml_ob1_proc.h b/ompi/mca/pml/ob1/pml_ob1_proc.h
similarity index 100%
rename from src/mca/pml/ob1/pml_ob1_proc.h
rename to ompi/mca/pml/ob1/pml_ob1_proc.h
diff --git a/src/mca/pml/ob1/pml_ob1_progress.c b/ompi/mca/pml/ob1/pml_ob1_progress.c
similarity index 100%
rename from src/mca/pml/ob1/pml_ob1_progress.c
rename to ompi/mca/pml/ob1/pml_ob1_progress.c
diff --git a/src/mca/pml/ob1/pml_ob1_rdmafrag.c b/ompi/mca/pml/ob1/pml_ob1_rdmafrag.c
similarity index 100%
rename from src/mca/pml/ob1/pml_ob1_rdmafrag.c
rename to ompi/mca/pml/ob1/pml_ob1_rdmafrag.c
diff --git a/src/mca/pml/ob1/pml_ob1_rdmafrag.h b/ompi/mca/pml/ob1/pml_ob1_rdmafrag.h
similarity index 100%
rename from src/mca/pml/ob1/pml_ob1_rdmafrag.h
rename to ompi/mca/pml/ob1/pml_ob1_rdmafrag.h
diff --git a/src/mca/pml/ob1/pml_ob1_recvfrag.c b/ompi/mca/pml/ob1/pml_ob1_recvfrag.c
similarity index 100%
rename from src/mca/pml/ob1/pml_ob1_recvfrag.c
rename to ompi/mca/pml/ob1/pml_ob1_recvfrag.c
diff --git a/src/mca/pml/ob1/pml_ob1_recvfrag.h b/ompi/mca/pml/ob1/pml_ob1_recvfrag.h
similarity index 100%
rename from src/mca/pml/ob1/pml_ob1_recvfrag.h
rename to ompi/mca/pml/ob1/pml_ob1_recvfrag.h
diff --git a/src/mca/pml/ob1/pml_ob1_recvreq.c b/ompi/mca/pml/ob1/pml_ob1_recvreq.c
similarity index 100%
rename from src/mca/pml/ob1/pml_ob1_recvreq.c
rename to ompi/mca/pml/ob1/pml_ob1_recvreq.c
diff --git a/src/mca/pml/ob1/pml_ob1_recvreq.h b/ompi/mca/pml/ob1/pml_ob1_recvreq.h
similarity index 100%
rename from src/mca/pml/ob1/pml_ob1_recvreq.h
rename to ompi/mca/pml/ob1/pml_ob1_recvreq.h
diff --git a/src/mca/pml/ob1/pml_ob1_sendreq.c b/ompi/mca/pml/ob1/pml_ob1_sendreq.c
similarity index 100%
rename from src/mca/pml/ob1/pml_ob1_sendreq.c
rename to ompi/mca/pml/ob1/pml_ob1_sendreq.c
diff --git a/src/mca/pml/ob1/pml_ob1_sendreq.h b/ompi/mca/pml/ob1/pml_ob1_sendreq.h
similarity index 100%
rename from src/mca/pml/ob1/pml_ob1_sendreq.h
rename to ompi/mca/pml/ob1/pml_ob1_sendreq.h
diff --git a/src/mca/pml/ob1/pml_ob1_start.c b/ompi/mca/pml/ob1/pml_ob1_start.c
similarity index 100%
rename from src/mca/pml/ob1/pml_ob1_start.c
rename to ompi/mca/pml/ob1/pml_ob1_start.c
diff --git a/src/mca/pml/pml.h b/ompi/mca/pml/pml.h
similarity index 100%
rename from src/mca/pml/pml.h
rename to ompi/mca/pml/pml.h
diff --git a/src/mca/pml/pml_direct_call.h.template.in b/ompi/mca/pml/pml_direct_call.h.template.in
similarity index 100%
rename from src/mca/pml/pml_direct_call.h.template.in
rename to ompi/mca/pml/pml_direct_call.h.template.in
diff --git a/src/mca/pml/teg/Makefile.am b/ompi/mca/pml/teg/Makefile.am
similarity index 100%
rename from src/mca/pml/teg/Makefile.am
rename to ompi/mca/pml/teg/Makefile.am
diff --git a/src/mca/pml/teg/configure.params b/ompi/mca/pml/teg/configure.params
similarity index 100%
rename from src/mca/pml/teg/configure.params
rename to ompi/mca/pml/teg/configure.params
diff --git a/src/mca/pml/teg/pml_ptl_array.c b/ompi/mca/pml/teg/pml_ptl_array.c
similarity index 100%
rename from src/mca/pml/teg/pml_ptl_array.c
rename to ompi/mca/pml/teg/pml_ptl_array.c
diff --git a/src/mca/pml/teg/pml_ptl_array.h b/ompi/mca/pml/teg/pml_ptl_array.h
similarity index 100%
rename from src/mca/pml/teg/pml_ptl_array.h
rename to ompi/mca/pml/teg/pml_ptl_array.h
diff --git a/src/mca/pml/teg/pml_teg.c b/ompi/mca/pml/teg/pml_teg.c
similarity index 100%
rename from src/mca/pml/teg/pml_teg.c
rename to ompi/mca/pml/teg/pml_teg.c
diff --git a/src/mca/pml/teg/pml_teg.h b/ompi/mca/pml/teg/pml_teg.h
similarity index 100%
rename from src/mca/pml/teg/pml_teg.h
rename to ompi/mca/pml/teg/pml_teg.h
diff --git a/src/mca/pml/teg/pml_teg_cancel.c b/ompi/mca/pml/teg/pml_teg_cancel.c
similarity index 100%
rename from src/mca/pml/teg/pml_teg_cancel.c
rename to ompi/mca/pml/teg/pml_teg_cancel.c
diff --git a/src/mca/pml/teg/pml_teg_component.c b/ompi/mca/pml/teg/pml_teg_component.c
similarity index 100%
rename from src/mca/pml/teg/pml_teg_component.c
rename to ompi/mca/pml/teg/pml_teg_component.c
diff --git a/src/mca/pml/teg/pml_teg_component.h b/ompi/mca/pml/teg/pml_teg_component.h
similarity index 100%
rename from src/mca/pml/teg/pml_teg_component.h
rename to ompi/mca/pml/teg/pml_teg_component.h
diff --git a/src/mca/pml/teg/pml_teg_iprobe.c b/ompi/mca/pml/teg/pml_teg_iprobe.c
similarity index 100%
rename from src/mca/pml/teg/pml_teg_iprobe.c
rename to ompi/mca/pml/teg/pml_teg_iprobe.c
diff --git a/src/mca/pml/teg/pml_teg_irecv.c b/ompi/mca/pml/teg/pml_teg_irecv.c
similarity index 100%
rename from src/mca/pml/teg/pml_teg_irecv.c
rename to ompi/mca/pml/teg/pml_teg_irecv.c
diff --git a/src/mca/pml/teg/pml_teg_isend.c b/ompi/mca/pml/teg/pml_teg_isend.c
similarity index 100%
rename from src/mca/pml/teg/pml_teg_isend.c
rename to ompi/mca/pml/teg/pml_teg_isend.c
diff --git a/src/mca/pml/teg/pml_teg_proc.c b/ompi/mca/pml/teg/pml_teg_proc.c
similarity index 100%
rename from src/mca/pml/teg/pml_teg_proc.c
rename to ompi/mca/pml/teg/pml_teg_proc.c
diff --git a/src/mca/pml/teg/pml_teg_proc.h b/ompi/mca/pml/teg/pml_teg_proc.h
similarity index 100%
rename from src/mca/pml/teg/pml_teg_proc.h
rename to ompi/mca/pml/teg/pml_teg_proc.h
diff --git a/src/mca/pml/teg/pml_teg_progress.c b/ompi/mca/pml/teg/pml_teg_progress.c
similarity index 100%
rename from src/mca/pml/teg/pml_teg_progress.c
rename to ompi/mca/pml/teg/pml_teg_progress.c
diff --git a/src/mca/pml/teg/pml_teg_ptl.c b/ompi/mca/pml/teg/pml_teg_ptl.c
similarity index 100%
rename from src/mca/pml/teg/pml_teg_ptl.c
rename to ompi/mca/pml/teg/pml_teg_ptl.c
diff --git a/src/mca/pml/teg/pml_teg_ptl.h b/ompi/mca/pml/teg/pml_teg_ptl.h
similarity index 100%
rename from src/mca/pml/teg/pml_teg_ptl.h
rename to ompi/mca/pml/teg/pml_teg_ptl.h
diff --git a/src/mca/pml/teg/pml_teg_recvfrag.c b/ompi/mca/pml/teg/pml_teg_recvfrag.c
similarity index 100%
rename from src/mca/pml/teg/pml_teg_recvfrag.c
rename to ompi/mca/pml/teg/pml_teg_recvfrag.c
diff --git a/src/mca/pml/teg/pml_teg_recvfrag.h b/ompi/mca/pml/teg/pml_teg_recvfrag.h
similarity index 100%
rename from src/mca/pml/teg/pml_teg_recvfrag.h
rename to ompi/mca/pml/teg/pml_teg_recvfrag.h
diff --git a/src/mca/pml/teg/pml_teg_recvreq.c b/ompi/mca/pml/teg/pml_teg_recvreq.c
similarity index 100%
rename from src/mca/pml/teg/pml_teg_recvreq.c
rename to ompi/mca/pml/teg/pml_teg_recvreq.c
diff --git a/src/mca/pml/teg/pml_teg_recvreq.h b/ompi/mca/pml/teg/pml_teg_recvreq.h
similarity index 100%
rename from src/mca/pml/teg/pml_teg_recvreq.h
rename to ompi/mca/pml/teg/pml_teg_recvreq.h
diff --git a/src/mca/pml/teg/pml_teg_sendreq.c b/ompi/mca/pml/teg/pml_teg_sendreq.c
similarity index 100%
rename from src/mca/pml/teg/pml_teg_sendreq.c
rename to ompi/mca/pml/teg/pml_teg_sendreq.c
diff --git a/src/mca/pml/teg/pml_teg_sendreq.h b/ompi/mca/pml/teg/pml_teg_sendreq.h
similarity index 100%
rename from src/mca/pml/teg/pml_teg_sendreq.h
rename to ompi/mca/pml/teg/pml_teg_sendreq.h
diff --git a/src/mca/pml/teg/pml_teg_start.c b/ompi/mca/pml/teg/pml_teg_start.c
similarity index 100%
rename from src/mca/pml/teg/pml_teg_start.c
rename to ompi/mca/pml/teg/pml_teg_start.c
diff --git a/src/mca/pml/teg/post_configure.sh b/ompi/mca/pml/teg/post_configure.sh
similarity index 100%
rename from src/mca/pml/teg/post_configure.sh
rename to ompi/mca/pml/teg/post_configure.sh
diff --git a/src/mca/pml/uniq/.ompi_ignore b/ompi/mca/pml/uniq/.ompi_ignore
similarity index 100%
rename from src/mca/pml/uniq/.ompi_ignore
rename to ompi/mca/pml/uniq/.ompi_ignore
diff --git a/src/mca/pml/uniq/.ompi_unignore b/ompi/mca/pml/uniq/.ompi_unignore
similarity index 100%
rename from src/mca/pml/uniq/.ompi_unignore
rename to ompi/mca/pml/uniq/.ompi_unignore
diff --git a/src/mca/pml/uniq/Makefile.am b/ompi/mca/pml/uniq/Makefile.am
similarity index 100%
rename from src/mca/pml/uniq/Makefile.am
rename to ompi/mca/pml/uniq/Makefile.am
diff --git a/src/mca/pml/uniq/configure.params b/ompi/mca/pml/uniq/configure.params
similarity index 100%
rename from src/mca/pml/uniq/configure.params
rename to ompi/mca/pml/uniq/configure.params
diff --git a/src/mca/pml/uniq/pml_uniq.c b/ompi/mca/pml/uniq/pml_uniq.c
similarity index 100%
rename from src/mca/pml/uniq/pml_uniq.c
rename to ompi/mca/pml/uniq/pml_uniq.c
diff --git a/src/mca/pml/uniq/pml_uniq.h b/ompi/mca/pml/uniq/pml_uniq.h
similarity index 100%
rename from src/mca/pml/uniq/pml_uniq.h
rename to ompi/mca/pml/uniq/pml_uniq.h
diff --git a/src/mca/pml/uniq/pml_uniq_cancel.c b/ompi/mca/pml/uniq/pml_uniq_cancel.c
similarity index 100%
rename from src/mca/pml/uniq/pml_uniq_cancel.c
rename to ompi/mca/pml/uniq/pml_uniq_cancel.c
diff --git a/src/mca/pml/uniq/pml_uniq_component.c b/ompi/mca/pml/uniq/pml_uniq_component.c
similarity index 100%
rename from src/mca/pml/uniq/pml_uniq_component.c
rename to ompi/mca/pml/uniq/pml_uniq_component.c
diff --git a/src/mca/pml/uniq/pml_uniq_component.h b/ompi/mca/pml/uniq/pml_uniq_component.h
similarity index 100%
rename from src/mca/pml/uniq/pml_uniq_component.h
rename to ompi/mca/pml/uniq/pml_uniq_component.h
diff --git a/src/mca/pml/uniq/pml_uniq_iprobe.c b/ompi/mca/pml/uniq/pml_uniq_iprobe.c
similarity index 100%
rename from src/mca/pml/uniq/pml_uniq_iprobe.c
rename to ompi/mca/pml/uniq/pml_uniq_iprobe.c
diff --git a/src/mca/pml/uniq/pml_uniq_irecv.c b/ompi/mca/pml/uniq/pml_uniq_irecv.c
similarity index 100%
rename from src/mca/pml/uniq/pml_uniq_irecv.c
rename to ompi/mca/pml/uniq/pml_uniq_irecv.c
diff --git a/src/mca/pml/uniq/pml_uniq_isend.c b/ompi/mca/pml/uniq/pml_uniq_isend.c
similarity index 100%
rename from src/mca/pml/uniq/pml_uniq_isend.c
rename to ompi/mca/pml/uniq/pml_uniq_isend.c
diff --git a/src/mca/pml/uniq/pml_uniq_proc.c b/ompi/mca/pml/uniq/pml_uniq_proc.c
similarity index 100%
rename from src/mca/pml/uniq/pml_uniq_proc.c
rename to ompi/mca/pml/uniq/pml_uniq_proc.c
diff --git a/src/mca/pml/uniq/pml_uniq_proc.h b/ompi/mca/pml/uniq/pml_uniq_proc.h
similarity index 100%
rename from src/mca/pml/uniq/pml_uniq_proc.h
rename to ompi/mca/pml/uniq/pml_uniq_proc.h
diff --git a/src/mca/pml/uniq/pml_uniq_progress.c b/ompi/mca/pml/uniq/pml_uniq_progress.c
similarity index 100%
rename from src/mca/pml/uniq/pml_uniq_progress.c
rename to ompi/mca/pml/uniq/pml_uniq_progress.c
diff --git a/src/mca/pml/uniq/pml_uniq_ptl.c b/ompi/mca/pml/uniq/pml_uniq_ptl.c
similarity index 100%
rename from src/mca/pml/uniq/pml_uniq_ptl.c
rename to ompi/mca/pml/uniq/pml_uniq_ptl.c
diff --git a/src/mca/pml/uniq/pml_uniq_ptl.h b/ompi/mca/pml/uniq/pml_uniq_ptl.h
similarity index 100%
rename from src/mca/pml/uniq/pml_uniq_ptl.h
rename to ompi/mca/pml/uniq/pml_uniq_ptl.h
diff --git a/src/mca/pml/uniq/pml_uniq_recvfrag.c b/ompi/mca/pml/uniq/pml_uniq_recvfrag.c
similarity index 100%
rename from src/mca/pml/uniq/pml_uniq_recvfrag.c
rename to ompi/mca/pml/uniq/pml_uniq_recvfrag.c
diff --git a/src/mca/pml/uniq/pml_uniq_recvfrag.h b/ompi/mca/pml/uniq/pml_uniq_recvfrag.h
similarity index 100%
rename from src/mca/pml/uniq/pml_uniq_recvfrag.h
rename to ompi/mca/pml/uniq/pml_uniq_recvfrag.h
diff --git a/src/mca/pml/uniq/pml_uniq_recvreq.c b/ompi/mca/pml/uniq/pml_uniq_recvreq.c
similarity index 100%
rename from src/mca/pml/uniq/pml_uniq_recvreq.c
rename to ompi/mca/pml/uniq/pml_uniq_recvreq.c
diff --git a/src/mca/pml/uniq/pml_uniq_recvreq.h b/ompi/mca/pml/uniq/pml_uniq_recvreq.h
similarity index 100%
rename from src/mca/pml/uniq/pml_uniq_recvreq.h
rename to ompi/mca/pml/uniq/pml_uniq_recvreq.h
diff --git a/src/mca/pml/uniq/pml_uniq_sendreq.c b/ompi/mca/pml/uniq/pml_uniq_sendreq.c
similarity index 100%
rename from src/mca/pml/uniq/pml_uniq_sendreq.c
rename to ompi/mca/pml/uniq/pml_uniq_sendreq.c
diff --git a/src/mca/pml/uniq/pml_uniq_sendreq.h b/ompi/mca/pml/uniq/pml_uniq_sendreq.h
similarity index 100%
rename from src/mca/pml/uniq/pml_uniq_sendreq.h
rename to ompi/mca/pml/uniq/pml_uniq_sendreq.h
diff --git a/src/mca/pml/uniq/pml_uniq_start.c b/ompi/mca/pml/uniq/pml_uniq_start.c
similarity index 100%
rename from src/mca/pml/uniq/pml_uniq_start.c
rename to ompi/mca/pml/uniq/pml_uniq_start.c
diff --git a/src/mca/ptl/Makefile.am b/ompi/mca/ptl/Makefile.am
similarity index 100%
rename from src/mca/ptl/Makefile.am
rename to ompi/mca/ptl/Makefile.am
diff --git a/src/mca/ptl/base/Makefile.am b/ompi/mca/ptl/base/Makefile.am
similarity index 100%
rename from src/mca/ptl/base/Makefile.am
rename to ompi/mca/ptl/base/Makefile.am
diff --git a/src/mca/ptl/base/base.h b/ompi/mca/ptl/base/base.h
similarity index 100%
rename from src/mca/ptl/base/base.h
rename to ompi/mca/ptl/base/base.h
diff --git a/src/mca/ptl/base/ptl_base_close.c b/ompi/mca/ptl/base/ptl_base_close.c
similarity index 100%
rename from src/mca/ptl/base/ptl_base_close.c
rename to ompi/mca/ptl/base/ptl_base_close.c
diff --git a/src/mca/ptl/base/ptl_base_comm.c b/ompi/mca/ptl/base/ptl_base_comm.c
similarity index 100%
rename from src/mca/ptl/base/ptl_base_comm.c
rename to ompi/mca/ptl/base/ptl_base_comm.c
diff --git a/src/mca/ptl/base/ptl_base_comm.h b/ompi/mca/ptl/base/ptl_base_comm.h
similarity index 100%
rename from src/mca/ptl/base/ptl_base_comm.h
rename to ompi/mca/ptl/base/ptl_base_comm.h
diff --git a/src/mca/ptl/base/ptl_base_fragment.c b/ompi/mca/ptl/base/ptl_base_fragment.c
similarity index 100%
rename from src/mca/ptl/base/ptl_base_fragment.c
rename to ompi/mca/ptl/base/ptl_base_fragment.c
diff --git a/src/mca/ptl/base/ptl_base_fragment.h b/ompi/mca/ptl/base/ptl_base_fragment.h
similarity index 100%
rename from src/mca/ptl/base/ptl_base_fragment.h
rename to ompi/mca/ptl/base/ptl_base_fragment.h
diff --git a/src/mca/ptl/base/ptl_base_header.h b/ompi/mca/ptl/base/ptl_base_header.h
similarity index 100%
rename from src/mca/ptl/base/ptl_base_header.h
rename to ompi/mca/ptl/base/ptl_base_header.h
diff --git a/src/mca/ptl/base/ptl_base_match.c b/ompi/mca/ptl/base/ptl_base_match.c
similarity index 100%
rename from src/mca/ptl/base/ptl_base_match.c
rename to ompi/mca/ptl/base/ptl_base_match.c
diff --git a/src/mca/ptl/base/ptl_base_match.h b/ompi/mca/ptl/base/ptl_base_match.h
similarity index 100%
rename from src/mca/ptl/base/ptl_base_match.h
rename to ompi/mca/ptl/base/ptl_base_match.h
diff --git a/src/mca/ptl/base/ptl_base_open.c b/ompi/mca/ptl/base/ptl_base_open.c
similarity index 100%
rename from src/mca/ptl/base/ptl_base_open.c
rename to ompi/mca/ptl/base/ptl_base_open.c
diff --git a/src/mca/ptl/base/ptl_base_recvfrag.c b/ompi/mca/ptl/base/ptl_base_recvfrag.c
similarity index 100%
rename from src/mca/ptl/base/ptl_base_recvfrag.c
rename to ompi/mca/ptl/base/ptl_base_recvfrag.c
diff --git a/src/mca/ptl/base/ptl_base_recvfrag.h b/ompi/mca/ptl/base/ptl_base_recvfrag.h
similarity index 100%
rename from src/mca/ptl/base/ptl_base_recvfrag.h
rename to ompi/mca/ptl/base/ptl_base_recvfrag.h
diff --git a/src/mca/ptl/base/ptl_base_recvreq.c b/ompi/mca/ptl/base/ptl_base_recvreq.c
similarity index 100%
rename from src/mca/ptl/base/ptl_base_recvreq.c
rename to ompi/mca/ptl/base/ptl_base_recvreq.c
diff --git a/src/mca/ptl/base/ptl_base_recvreq.h b/ompi/mca/ptl/base/ptl_base_recvreq.h
similarity index 100%
rename from src/mca/ptl/base/ptl_base_recvreq.h
rename to ompi/mca/ptl/base/ptl_base_recvreq.h
diff --git a/src/mca/ptl/base/ptl_base_select.c b/ompi/mca/ptl/base/ptl_base_select.c
similarity index 100%
rename from src/mca/ptl/base/ptl_base_select.c
rename to ompi/mca/ptl/base/ptl_base_select.c
diff --git a/src/mca/ptl/base/ptl_base_sendfrag.c b/ompi/mca/ptl/base/ptl_base_sendfrag.c
similarity index 100%
rename from src/mca/ptl/base/ptl_base_sendfrag.c
rename to ompi/mca/ptl/base/ptl_base_sendfrag.c
diff --git a/src/mca/ptl/base/ptl_base_sendfrag.h b/ompi/mca/ptl/base/ptl_base_sendfrag.h
similarity index 100%
rename from src/mca/ptl/base/ptl_base_sendfrag.h
rename to ompi/mca/ptl/base/ptl_base_sendfrag.h
diff --git a/src/mca/ptl/base/ptl_base_sendreq.c b/ompi/mca/ptl/base/ptl_base_sendreq.c
similarity index 100%
rename from src/mca/ptl/base/ptl_base_sendreq.c
rename to ompi/mca/ptl/base/ptl_base_sendreq.c
diff --git a/src/mca/ptl/base/ptl_base_sendreq.h b/ompi/mca/ptl/base/ptl_base_sendreq.h
similarity index 100%
rename from src/mca/ptl/base/ptl_base_sendreq.h
rename to ompi/mca/ptl/base/ptl_base_sendreq.h
diff --git a/src/mca/ptl/elan/.ompi_ignore b/ompi/mca/ptl/elan/.ompi_ignore
similarity index 100%
rename from src/mca/ptl/elan/.ompi_ignore
rename to ompi/mca/ptl/elan/.ompi_ignore
diff --git a/src/mca/ptl/elan/Makefile.am b/ompi/mca/ptl/elan/Makefile.am
similarity index 100%
rename from src/mca/ptl/elan/Makefile.am
rename to ompi/mca/ptl/elan/Makefile.am
diff --git a/src/mca/ptl/elan/configure.params b/ompi/mca/ptl/elan/configure.params
similarity index 100%
rename from src/mca/ptl/elan/configure.params
rename to ompi/mca/ptl/elan/configure.params
diff --git a/src/mca/ptl/elan/configure.stub b/ompi/mca/ptl/elan/configure.stub
similarity index 100%
rename from src/mca/ptl/elan/configure.stub
rename to ompi/mca/ptl/elan/configure.stub
diff --git a/src/mca/ptl/elan/src/Makefile.extra b/ompi/mca/ptl/elan/src/Makefile.extra
similarity index 100%
rename from src/mca/ptl/elan/src/Makefile.extra
rename to ompi/mca/ptl/elan/src/Makefile.extra
diff --git a/src/mca/ptl/elan/src/ptl_elan.c b/ompi/mca/ptl/elan/src/ptl_elan.c
similarity index 100%
rename from src/mca/ptl/elan/src/ptl_elan.c
rename to ompi/mca/ptl/elan/src/ptl_elan.c
diff --git a/src/mca/ptl/elan/src/ptl_elan.h b/ompi/mca/ptl/elan/src/ptl_elan.h
similarity index 100%
rename from src/mca/ptl/elan/src/ptl_elan.h
rename to ompi/mca/ptl/elan/src/ptl_elan.h
diff --git a/src/mca/ptl/elan/src/ptl_elan_comm_init.c b/ompi/mca/ptl/elan/src/ptl_elan_comm_init.c
similarity index 100%
rename from src/mca/ptl/elan/src/ptl_elan_comm_init.c
rename to ompi/mca/ptl/elan/src/ptl_elan_comm_init.c
diff --git a/src/mca/ptl/elan/src/ptl_elan_component.c b/ompi/mca/ptl/elan/src/ptl_elan_component.c
similarity index 100%
rename from src/mca/ptl/elan/src/ptl_elan_component.c
rename to ompi/mca/ptl/elan/src/ptl_elan_component.c
diff --git a/src/mca/ptl/elan/src/ptl_elan_frag.c b/ompi/mca/ptl/elan/src/ptl_elan_frag.c
similarity index 100%
rename from src/mca/ptl/elan/src/ptl_elan_frag.c
rename to ompi/mca/ptl/elan/src/ptl_elan_frag.c
diff --git a/src/mca/ptl/elan/src/ptl_elan_frag.h b/ompi/mca/ptl/elan/src/ptl_elan_frag.h
similarity index 100%
rename from src/mca/ptl/elan/src/ptl_elan_frag.h
rename to ompi/mca/ptl/elan/src/ptl_elan_frag.h
diff --git a/src/mca/ptl/elan/src/ptl_elan_init.c b/ompi/mca/ptl/elan/src/ptl_elan_init.c
similarity index 100%
rename from src/mca/ptl/elan/src/ptl_elan_init.c
rename to ompi/mca/ptl/elan/src/ptl_elan_init.c
diff --git a/src/mca/ptl/elan/src/ptl_elan_peer.c b/ompi/mca/ptl/elan/src/ptl_elan_peer.c
similarity index 100%
rename from src/mca/ptl/elan/src/ptl_elan_peer.c
rename to ompi/mca/ptl/elan/src/ptl_elan_peer.c
diff --git a/src/mca/ptl/elan/src/ptl_elan_peer.h b/ompi/mca/ptl/elan/src/ptl_elan_peer.h
similarity index 100%
rename from src/mca/ptl/elan/src/ptl_elan_peer.h
rename to ompi/mca/ptl/elan/src/ptl_elan_peer.h
diff --git a/src/mca/ptl/elan/src/ptl_elan_priv.c b/ompi/mca/ptl/elan/src/ptl_elan_priv.c
similarity index 100%
rename from src/mca/ptl/elan/src/ptl_elan_priv.c
rename to ompi/mca/ptl/elan/src/ptl_elan_priv.c
diff --git a/src/mca/ptl/elan/src/ptl_elan_priv.h b/ompi/mca/ptl/elan/src/ptl_elan_priv.h
similarity index 100%
rename from src/mca/ptl/elan/src/ptl_elan_priv.h
rename to ompi/mca/ptl/elan/src/ptl_elan_priv.h
diff --git a/src/mca/ptl/elan/src/ptl_elan_proc.c b/ompi/mca/ptl/elan/src/ptl_elan_proc.c
similarity index 100%
rename from src/mca/ptl/elan/src/ptl_elan_proc.c
rename to ompi/mca/ptl/elan/src/ptl_elan_proc.c
diff --git a/src/mca/ptl/elan/src/ptl_elan_proc.h b/ompi/mca/ptl/elan/src/ptl_elan_proc.h
similarity index 100%
rename from src/mca/ptl/elan/src/ptl_elan_proc.h
rename to ompi/mca/ptl/elan/src/ptl_elan_proc.h
diff --git a/src/mca/ptl/elan/tests/Makefile.am b/ompi/mca/ptl/elan/tests/Makefile.am
similarity index 100%
rename from src/mca/ptl/elan/tests/Makefile.am
rename to ompi/mca/ptl/elan/tests/Makefile.am
diff --git a/src/mca/ptl/elan/tests/bw.c b/ompi/mca/ptl/elan/tests/bw.c
similarity index 100%
rename from src/mca/ptl/elan/tests/bw.c
rename to ompi/mca/ptl/elan/tests/bw.c
diff --git a/src/mca/ptl/elan/tests/check.c b/ompi/mca/ptl/elan/tests/check.c
similarity index 100%
rename from src/mca/ptl/elan/tests/check.c
rename to ompi/mca/ptl/elan/tests/check.c
diff --git a/src/mca/ptl/elan/tests/check_bw.c b/ompi/mca/ptl/elan/tests/check_bw.c
similarity index 100%
rename from src/mca/ptl/elan/tests/check_bw.c
rename to ompi/mca/ptl/elan/tests/check_bw.c
diff --git a/src/mca/ptl/elan/tests/init_elan.c b/ompi/mca/ptl/elan/tests/init_elan.c
similarity index 100%
rename from src/mca/ptl/elan/tests/init_elan.c
rename to ompi/mca/ptl/elan/tests/init_elan.c
diff --git a/src/mca/ptl/elan/tests/lat.c b/ompi/mca/ptl/elan/tests/lat.c
similarity index 100%
rename from src/mca/ptl/elan/tests/lat.c
rename to ompi/mca/ptl/elan/tests/lat.c
diff --git a/src/mca/ptl/elan/tests/mpi_test.c b/ompi/mca/ptl/elan/tests/mpi_test.c
similarity index 100%
rename from src/mca/ptl/elan/tests/mpi_test.c
rename to ompi/mca/ptl/elan/tests/mpi_test.c
diff --git a/src/mca/ptl/elan/tests/qsnet_init.c b/ompi/mca/ptl/elan/tests/qsnet_init.c
similarity index 100%
rename from src/mca/ptl/elan/tests/qsnet_init.c
rename to ompi/mca/ptl/elan/tests/qsnet_init.c
diff --git a/src/mca/ptl/elan/tests/qsnet_qdma.c b/ompi/mca/ptl/elan/tests/qsnet_qdma.c
similarity index 100%
rename from src/mca/ptl/elan/tests/qsnet_qdma.c
rename to ompi/mca/ptl/elan/tests/qsnet_qdma.c
diff --git a/src/mca/ptl/elan/tests/qsnet_rdma.c b/ompi/mca/ptl/elan/tests/qsnet_rdma.c
similarity index 100%
rename from src/mca/ptl/elan/tests/qsnet_rdma.c
rename to ompi/mca/ptl/elan/tests/qsnet_rdma.c
diff --git a/src/mca/ptl/elan/tests/test_util.h b/ompi/mca/ptl/elan/tests/test_util.h
similarity index 100%
rename from src/mca/ptl/elan/tests/test_util.h
rename to ompi/mca/ptl/elan/tests/test_util.h
diff --git a/src/mca/ptl/gm/Makefile.am b/ompi/mca/ptl/gm/Makefile.am
similarity index 100%
rename from src/mca/ptl/gm/Makefile.am
rename to ompi/mca/ptl/gm/Makefile.am
diff --git a/src/mca/ptl/gm/configure.params b/ompi/mca/ptl/gm/configure.params
similarity index 100%
rename from src/mca/ptl/gm/configure.params
rename to ompi/mca/ptl/gm/configure.params
diff --git a/src/mca/ptl/gm/configure.stub b/ompi/mca/ptl/gm/configure.stub
similarity index 100%
rename from src/mca/ptl/gm/configure.stub
rename to ompi/mca/ptl/gm/configure.stub
diff --git a/src/mca/ptl/gm/ptl_gm.c b/ompi/mca/ptl/gm/ptl_gm.c
similarity index 100%
rename from src/mca/ptl/gm/ptl_gm.c
rename to ompi/mca/ptl/gm/ptl_gm.c
diff --git a/src/mca/ptl/gm/ptl_gm.h b/ompi/mca/ptl/gm/ptl_gm.h
similarity index 100%
rename from src/mca/ptl/gm/ptl_gm.h
rename to ompi/mca/ptl/gm/ptl_gm.h
diff --git a/src/mca/ptl/gm/ptl_gm_component.c b/ompi/mca/ptl/gm/ptl_gm_component.c
similarity index 100%
rename from src/mca/ptl/gm/ptl_gm_component.c
rename to ompi/mca/ptl/gm/ptl_gm_component.c
diff --git a/src/mca/ptl/gm/ptl_gm_memory.c b/ompi/mca/ptl/gm/ptl_gm_memory.c
similarity index 100%
rename from src/mca/ptl/gm/ptl_gm_memory.c
rename to ompi/mca/ptl/gm/ptl_gm_memory.c
diff --git a/src/mca/ptl/gm/ptl_gm_peer.h b/ompi/mca/ptl/gm/ptl_gm_peer.h
similarity index 100%
rename from src/mca/ptl/gm/ptl_gm_peer.h
rename to ompi/mca/ptl/gm/ptl_gm_peer.h
diff --git a/src/mca/ptl/gm/ptl_gm_priv.c b/ompi/mca/ptl/gm/ptl_gm_priv.c
similarity index 100%
rename from src/mca/ptl/gm/ptl_gm_priv.c
rename to ompi/mca/ptl/gm/ptl_gm_priv.c
diff --git a/src/mca/ptl/gm/ptl_gm_priv.h b/ompi/mca/ptl/gm/ptl_gm_priv.h
similarity index 100%
rename from src/mca/ptl/gm/ptl_gm_priv.h
rename to ompi/mca/ptl/gm/ptl_gm_priv.h
diff --git a/src/mca/ptl/gm/ptl_gm_proc.c b/ompi/mca/ptl/gm/ptl_gm_proc.c
similarity index 100%
rename from src/mca/ptl/gm/ptl_gm_proc.c
rename to ompi/mca/ptl/gm/ptl_gm_proc.c
diff --git a/src/mca/ptl/gm/ptl_gm_proc.h b/ompi/mca/ptl/gm/ptl_gm_proc.h
similarity index 100%
rename from src/mca/ptl/gm/ptl_gm_proc.h
rename to ompi/mca/ptl/gm/ptl_gm_proc.h
diff --git a/src/mca/ptl/gm/ptl_gm_regcache.c b/ompi/mca/ptl/gm/ptl_gm_regcache.c
similarity index 100%
rename from src/mca/ptl/gm/ptl_gm_regcache.c
rename to ompi/mca/ptl/gm/ptl_gm_regcache.c
diff --git a/src/mca/ptl/gm/ptl_gm_sendfrag.c b/ompi/mca/ptl/gm/ptl_gm_sendfrag.c
similarity index 100%
rename from src/mca/ptl/gm/ptl_gm_sendfrag.c
rename to ompi/mca/ptl/gm/ptl_gm_sendfrag.c
diff --git a/src/mca/ptl/gm/ptl_gm_sendfrag.h b/ompi/mca/ptl/gm/ptl_gm_sendfrag.h
similarity index 100%
rename from src/mca/ptl/gm/ptl_gm_sendfrag.h
rename to ompi/mca/ptl/gm/ptl_gm_sendfrag.h
diff --git a/src/mca/ptl/mx/Makefile.am b/ompi/mca/ptl/mx/Makefile.am
similarity index 100%
rename from src/mca/ptl/mx/Makefile.am
rename to ompi/mca/ptl/mx/Makefile.am
diff --git a/src/mca/ptl/mx/configure.params b/ompi/mca/ptl/mx/configure.params
similarity index 100%
rename from src/mca/ptl/mx/configure.params
rename to ompi/mca/ptl/mx/configure.params
diff --git a/src/mca/ptl/mx/configure.stub b/ompi/mca/ptl/mx/configure.stub
similarity index 100%
rename from src/mca/ptl/mx/configure.stub
rename to ompi/mca/ptl/mx/configure.stub
diff --git a/src/mca/ptl/mx/ptl_mx.c b/ompi/mca/ptl/mx/ptl_mx.c
similarity index 100%
rename from src/mca/ptl/mx/ptl_mx.c
rename to ompi/mca/ptl/mx/ptl_mx.c
diff --git a/src/mca/ptl/mx/ptl_mx.h b/ompi/mca/ptl/mx/ptl_mx.h
similarity index 100%
rename from src/mca/ptl/mx/ptl_mx.h
rename to ompi/mca/ptl/mx/ptl_mx.h
diff --git a/src/mca/ptl/mx/ptl_mx_component.c b/ompi/mca/ptl/mx/ptl_mx_component.c
similarity index 100%
rename from src/mca/ptl/mx/ptl_mx_component.c
rename to ompi/mca/ptl/mx/ptl_mx_component.c
diff --git a/src/mca/ptl/mx/ptl_mx_module.c b/ompi/mca/ptl/mx/ptl_mx_module.c
similarity index 100%
rename from src/mca/ptl/mx/ptl_mx_module.c
rename to ompi/mca/ptl/mx/ptl_mx_module.c
diff --git a/src/mca/ptl/mx/ptl_mx_module.h b/ompi/mca/ptl/mx/ptl_mx_module.h
similarity index 100%
rename from src/mca/ptl/mx/ptl_mx_module.h
rename to ompi/mca/ptl/mx/ptl_mx_module.h
diff --git a/src/mca/ptl/mx/ptl_mx_peer.c b/ompi/mca/ptl/mx/ptl_mx_peer.c
similarity index 100%
rename from src/mca/ptl/mx/ptl_mx_peer.c
rename to ompi/mca/ptl/mx/ptl_mx_peer.c
diff --git a/src/mca/ptl/mx/ptl_mx_peer.h b/ompi/mca/ptl/mx/ptl_mx_peer.h
similarity index 100%
rename from src/mca/ptl/mx/ptl_mx_peer.h
rename to ompi/mca/ptl/mx/ptl_mx_peer.h
diff --git a/src/mca/ptl/mx/ptl_mx_proc.c b/ompi/mca/ptl/mx/ptl_mx_proc.c
similarity index 100%
rename from src/mca/ptl/mx/ptl_mx_proc.c
rename to ompi/mca/ptl/mx/ptl_mx_proc.c
diff --git a/src/mca/ptl/mx/ptl_mx_proc.h b/ompi/mca/ptl/mx/ptl_mx_proc.h
similarity index 100%
rename from src/mca/ptl/mx/ptl_mx_proc.h
rename to ompi/mca/ptl/mx/ptl_mx_proc.h
diff --git a/src/mca/ptl/mx/ptl_mx_recvfrag.c b/ompi/mca/ptl/mx/ptl_mx_recvfrag.c
similarity index 100%
rename from src/mca/ptl/mx/ptl_mx_recvfrag.c
rename to ompi/mca/ptl/mx/ptl_mx_recvfrag.c
diff --git a/src/mca/ptl/mx/ptl_mx_recvfrag.h b/ompi/mca/ptl/mx/ptl_mx_recvfrag.h
similarity index 100%
rename from src/mca/ptl/mx/ptl_mx_recvfrag.h
rename to ompi/mca/ptl/mx/ptl_mx_recvfrag.h
diff --git a/src/mca/ptl/mx/ptl_mx_sendfrag.c b/ompi/mca/ptl/mx/ptl_mx_sendfrag.c
similarity index 100%
rename from src/mca/ptl/mx/ptl_mx_sendfrag.c
rename to ompi/mca/ptl/mx/ptl_mx_sendfrag.c
diff --git a/src/mca/ptl/mx/ptl_mx_sendfrag.h b/ompi/mca/ptl/mx/ptl_mx_sendfrag.h
similarity index 100%
rename from src/mca/ptl/mx/ptl_mx_sendfrag.h
rename to ompi/mca/ptl/mx/ptl_mx_sendfrag.h
diff --git a/src/mca/ptl/portals/.ompi_ignore b/ompi/mca/ptl/portals/.ompi_ignore
similarity index 100%
rename from src/mca/ptl/portals/.ompi_ignore
rename to ompi/mca/ptl/portals/.ompi_ignore
diff --git a/src/mca/ptl/portals/.ompi_unignore b/ompi/mca/ptl/portals/.ompi_unignore
similarity index 100%
rename from src/mca/ptl/portals/.ompi_unignore
rename to ompi/mca/ptl/portals/.ompi_unignore
diff --git a/src/mca/ptl/portals/Makefile.am b/ompi/mca/ptl/portals/Makefile.am
similarity index 100%
rename from src/mca/ptl/portals/Makefile.am
rename to ompi/mca/ptl/portals/Makefile.am
diff --git a/src/mca/ptl/portals/configure.params b/ompi/mca/ptl/portals/configure.params
similarity index 100%
rename from src/mca/ptl/portals/configure.params
rename to ompi/mca/ptl/portals/configure.params
diff --git a/src/mca/ptl/portals/configure.stub b/ompi/mca/ptl/portals/configure.stub
similarity index 100%
rename from src/mca/ptl/portals/configure.stub
rename to ompi/mca/ptl/portals/configure.stub
diff --git a/src/mca/ptl/portals/src/ptl_portals.c b/ompi/mca/ptl/portals/src/ptl_portals.c
similarity index 100%
rename from src/mca/ptl/portals/src/ptl_portals.c
rename to ompi/mca/ptl/portals/src/ptl_portals.c
diff --git a/src/mca/ptl/portals/src/ptl_portals.h b/ompi/mca/ptl/portals/src/ptl_portals.h
similarity index 100%
rename from src/mca/ptl/portals/src/ptl_portals.h
rename to ompi/mca/ptl/portals/src/ptl_portals.h
diff --git a/src/mca/ptl/portals/src/ptl_portals_compat.h b/ompi/mca/ptl/portals/src/ptl_portals_compat.h
similarity index 100%
rename from src/mca/ptl/portals/src/ptl_portals_compat.h
rename to ompi/mca/ptl/portals/src/ptl_portals_compat.h
diff --git a/src/mca/ptl/portals/src/ptl_portals_compat_redstorm.c b/ompi/mca/ptl/portals/src/ptl_portals_compat_redstorm.c
similarity index 100%
rename from src/mca/ptl/portals/src/ptl_portals_compat_redstorm.c
rename to ompi/mca/ptl/portals/src/ptl_portals_compat_redstorm.c
diff --git a/src/mca/ptl/portals/src/ptl_portals_compat_utcp.c b/ompi/mca/ptl/portals/src/ptl_portals_compat_utcp.c
similarity index 100%
rename from src/mca/ptl/portals/src/ptl_portals_compat_utcp.c
rename to ompi/mca/ptl/portals/src/ptl_portals_compat_utcp.c
diff --git a/src/mca/ptl/portals/src/ptl_portals_component.c b/ompi/mca/ptl/portals/src/ptl_portals_component.c
similarity index 100%
rename from src/mca/ptl/portals/src/ptl_portals_component.c
rename to ompi/mca/ptl/portals/src/ptl_portals_component.c
diff --git a/src/mca/ptl/portals/src/ptl_portals_recv.c b/ompi/mca/ptl/portals/src/ptl_portals_recv.c
similarity index 100%
rename from src/mca/ptl/portals/src/ptl_portals_recv.c
rename to ompi/mca/ptl/portals/src/ptl_portals_recv.c
diff --git a/src/mca/ptl/portals/src/ptl_portals_recv.h b/ompi/mca/ptl/portals/src/ptl_portals_recv.h
similarity index 100%
rename from src/mca/ptl/portals/src/ptl_portals_recv.h
rename to ompi/mca/ptl/portals/src/ptl_portals_recv.h
diff --git a/src/mca/ptl/portals/src/ptl_portals_send.c b/ompi/mca/ptl/portals/src/ptl_portals_send.c
similarity index 100%
rename from src/mca/ptl/portals/src/ptl_portals_send.c
rename to ompi/mca/ptl/portals/src/ptl_portals_send.c
diff --git a/src/mca/ptl/portals/src/ptl_portals_send.h b/ompi/mca/ptl/portals/src/ptl_portals_send.h
similarity index 100%
rename from src/mca/ptl/portals/src/ptl_portals_send.h
rename to ompi/mca/ptl/portals/src/ptl_portals_send.h
diff --git a/src/mca/ptl/portals/src/ptl_portals_stubs.c b/ompi/mca/ptl/portals/src/ptl_portals_stubs.c
similarity index 100%
rename from src/mca/ptl/portals/src/ptl_portals_stubs.c
rename to ompi/mca/ptl/portals/src/ptl_portals_stubs.c
diff --git a/src/mca/ptl/prof/.ompi_ignore b/ompi/mca/ptl/prof/.ompi_ignore
similarity index 100%
rename from src/mca/ptl/prof/.ompi_ignore
rename to ompi/mca/ptl/prof/.ompi_ignore
diff --git a/src/mca/ptl/prof/Makefile.am b/ompi/mca/ptl/prof/Makefile.am
similarity index 100%
rename from src/mca/ptl/prof/Makefile.am
rename to ompi/mca/ptl/prof/Makefile.am
diff --git a/src/mca/ptl/prof/VERSION b/ompi/mca/ptl/prof/VERSION
similarity index 100%
rename from src/mca/ptl/prof/VERSION
rename to ompi/mca/ptl/prof/VERSION
diff --git a/src/mca/ptl/prof/configure.params b/ompi/mca/ptl/prof/configure.params
similarity index 100%
rename from src/mca/ptl/prof/configure.params
rename to ompi/mca/ptl/prof/configure.params
diff --git a/src/mca/ptl/prof/ptl_prof.c b/ompi/mca/ptl/prof/ptl_prof.c
similarity index 100%
rename from src/mca/ptl/prof/ptl_prof.c
rename to ompi/mca/ptl/prof/ptl_prof.c
diff --git a/src/mca/ptl/prof/ptl_prof.h b/ompi/mca/ptl/prof/ptl_prof.h
similarity index 100%
rename from src/mca/ptl/prof/ptl_prof.h
rename to ompi/mca/ptl/prof/ptl_prof.h
diff --git a/src/mca/ptl/prof/ptl_prof_component.c b/ompi/mca/ptl/prof/ptl_prof_component.c
similarity index 100%
rename from src/mca/ptl/prof/ptl_prof_component.c
rename to ompi/mca/ptl/prof/ptl_prof_component.c
diff --git a/src/mca/ptl/ptl.h b/ompi/mca/ptl/ptl.h
similarity index 100%
rename from src/mca/ptl/ptl.h
rename to ompi/mca/ptl/ptl.h
diff --git a/src/mca/ptl/self/Makefile.am b/ompi/mca/ptl/self/Makefile.am
similarity index 100%
rename from src/mca/ptl/self/Makefile.am
rename to ompi/mca/ptl/self/Makefile.am
diff --git a/src/mca/ptl/self/configure.params b/ompi/mca/ptl/self/configure.params
similarity index 100%
rename from src/mca/ptl/self/configure.params
rename to ompi/mca/ptl/self/configure.params
diff --git a/src/mca/ptl/self/ptl_self.c b/ompi/mca/ptl/self/ptl_self.c
similarity index 100%
rename from src/mca/ptl/self/ptl_self.c
rename to ompi/mca/ptl/self/ptl_self.c
diff --git a/src/mca/ptl/self/ptl_self.h b/ompi/mca/ptl/self/ptl_self.h
similarity index 100%
rename from src/mca/ptl/self/ptl_self.h
rename to ompi/mca/ptl/self/ptl_self.h
diff --git a/src/mca/ptl/self/ptl_self_component.c b/ompi/mca/ptl/self/ptl_self_component.c
similarity index 100%
rename from src/mca/ptl/self/ptl_self_component.c
rename to ompi/mca/ptl/self/ptl_self_component.c
diff --git a/src/mca/ptl/sm/Makefile.am b/ompi/mca/ptl/sm/Makefile.am
similarity index 100%
rename from src/mca/ptl/sm/Makefile.am
rename to ompi/mca/ptl/sm/Makefile.am
diff --git a/src/mca/ptl/sm/configure.params b/ompi/mca/ptl/sm/configure.params
similarity index 100%
rename from src/mca/ptl/sm/configure.params
rename to ompi/mca/ptl/sm/configure.params
diff --git a/src/mca/ptl/sm/src/Makefile.am b/ompi/mca/ptl/sm/src/Makefile.am
similarity index 100%
rename from src/mca/ptl/sm/src/Makefile.am
rename to ompi/mca/ptl/sm/src/Makefile.am
diff --git a/src/mca/ptl/sm/src/ptl_sm.c b/ompi/mca/ptl/sm/src/ptl_sm.c
similarity index 100%
rename from src/mca/ptl/sm/src/ptl_sm.c
rename to ompi/mca/ptl/sm/src/ptl_sm.c
diff --git a/src/mca/ptl/sm/src/ptl_sm.h b/ompi/mca/ptl/sm/src/ptl_sm.h
similarity index 100%
rename from src/mca/ptl/sm/src/ptl_sm.h
rename to ompi/mca/ptl/sm/src/ptl_sm.h
diff --git a/src/mca/ptl/sm/src/ptl_sm_address.h b/ompi/mca/ptl/sm/src/ptl_sm_address.h
similarity index 100%
rename from src/mca/ptl/sm/src/ptl_sm_address.h
rename to ompi/mca/ptl/sm/src/ptl_sm_address.h
diff --git a/src/mca/ptl/sm/src/ptl_sm_component.c b/ompi/mca/ptl/sm/src/ptl_sm_component.c
similarity index 100%
rename from src/mca/ptl/sm/src/ptl_sm_component.c
rename to ompi/mca/ptl/sm/src/ptl_sm_component.c
diff --git a/src/mca/ptl/sm/src/ptl_sm_frag.c b/ompi/mca/ptl/sm/src/ptl_sm_frag.c
similarity index 100%
rename from src/mca/ptl/sm/src/ptl_sm_frag.c
rename to ompi/mca/ptl/sm/src/ptl_sm_frag.c
diff --git a/src/mca/ptl/sm/src/ptl_sm_frag.h b/ompi/mca/ptl/sm/src/ptl_sm_frag.h
similarity index 100%
rename from src/mca/ptl/sm/src/ptl_sm_frag.h
rename to ompi/mca/ptl/sm/src/ptl_sm_frag.h
diff --git a/src/mca/ptl/sm/src/ptl_sm_peer.h b/ompi/mca/ptl/sm/src/ptl_sm_peer.h
similarity index 100%
rename from src/mca/ptl/sm/src/ptl_sm_peer.h
rename to ompi/mca/ptl/sm/src/ptl_sm_peer.h
diff --git a/src/mca/ptl/sm/src/ptl_sm_recvfrag.c b/ompi/mca/ptl/sm/src/ptl_sm_recvfrag.c
similarity index 100%
rename from src/mca/ptl/sm/src/ptl_sm_recvfrag.c
rename to ompi/mca/ptl/sm/src/ptl_sm_recvfrag.c
diff --git a/src/mca/ptl/sm/src/ptl_sm_recvfrag.h b/ompi/mca/ptl/sm/src/ptl_sm_recvfrag.h
similarity index 100%
rename from src/mca/ptl/sm/src/ptl_sm_recvfrag.h
rename to ompi/mca/ptl/sm/src/ptl_sm_recvfrag.h
diff --git a/src/mca/ptl/sm/src/ptl_sm_send.c b/ompi/mca/ptl/sm/src/ptl_sm_send.c
similarity index 100%
rename from src/mca/ptl/sm/src/ptl_sm_send.c
rename to ompi/mca/ptl/sm/src/ptl_sm_send.c
diff --git a/src/mca/ptl/sm/src/ptl_sm_sendfrag.c b/ompi/mca/ptl/sm/src/ptl_sm_sendfrag.c
similarity index 100%
rename from src/mca/ptl/sm/src/ptl_sm_sendfrag.c
rename to ompi/mca/ptl/sm/src/ptl_sm_sendfrag.c
diff --git a/src/mca/ptl/sm/src/ptl_sm_sendfrag.h b/ompi/mca/ptl/sm/src/ptl_sm_sendfrag.h
similarity index 100%
rename from src/mca/ptl/sm/src/ptl_sm_sendfrag.h
rename to ompi/mca/ptl/sm/src/ptl_sm_sendfrag.h
diff --git a/src/mca/ptl/sm/src/ptl_sm_sendreq.c b/ompi/mca/ptl/sm/src/ptl_sm_sendreq.c
similarity index 100%
rename from src/mca/ptl/sm/src/ptl_sm_sendreq.c
rename to ompi/mca/ptl/sm/src/ptl_sm_sendreq.c
diff --git a/src/mca/ptl/sm/src/ptl_sm_sendreq.h b/ompi/mca/ptl/sm/src/ptl_sm_sendreq.h
similarity index 100%
rename from src/mca/ptl/sm/src/ptl_sm_sendreq.h
rename to ompi/mca/ptl/sm/src/ptl_sm_sendreq.h
diff --git a/src/mca/ptl/tcp/Makefile.am b/ompi/mca/ptl/tcp/Makefile.am
similarity index 100%
rename from src/mca/ptl/tcp/Makefile.am
rename to ompi/mca/ptl/tcp/Makefile.am
diff --git a/src/mca/ptl/tcp/configure.params b/ompi/mca/ptl/tcp/configure.params
similarity index 100%
rename from src/mca/ptl/tcp/configure.params
rename to ompi/mca/ptl/tcp/configure.params
diff --git a/src/mca/ptl/tcp/ptl_tcp.c b/ompi/mca/ptl/tcp/ptl_tcp.c
similarity index 100%
rename from src/mca/ptl/tcp/ptl_tcp.c
rename to ompi/mca/ptl/tcp/ptl_tcp.c
diff --git a/src/mca/ptl/tcp/ptl_tcp.h b/ompi/mca/ptl/tcp/ptl_tcp.h
similarity index 100%
rename from src/mca/ptl/tcp/ptl_tcp.h
rename to ompi/mca/ptl/tcp/ptl_tcp.h
diff --git a/src/mca/ptl/tcp/ptl_tcp_addr.h b/ompi/mca/ptl/tcp/ptl_tcp_addr.h
similarity index 100%
rename from src/mca/ptl/tcp/ptl_tcp_addr.h
rename to ompi/mca/ptl/tcp/ptl_tcp_addr.h
diff --git a/src/mca/ptl/tcp/ptl_tcp_component.c b/ompi/mca/ptl/tcp/ptl_tcp_component.c
similarity index 100%
rename from src/mca/ptl/tcp/ptl_tcp_component.c
rename to ompi/mca/ptl/tcp/ptl_tcp_component.c
diff --git a/src/mca/ptl/tcp/ptl_tcp_peer.c b/ompi/mca/ptl/tcp/ptl_tcp_peer.c
similarity index 100%
rename from src/mca/ptl/tcp/ptl_tcp_peer.c
rename to ompi/mca/ptl/tcp/ptl_tcp_peer.c
diff --git a/src/mca/ptl/tcp/ptl_tcp_peer.h b/ompi/mca/ptl/tcp/ptl_tcp_peer.h
similarity index 100%
rename from src/mca/ptl/tcp/ptl_tcp_peer.h
rename to ompi/mca/ptl/tcp/ptl_tcp_peer.h
diff --git a/src/mca/ptl/tcp/ptl_tcp_proc.c b/ompi/mca/ptl/tcp/ptl_tcp_proc.c
similarity index 100%
rename from src/mca/ptl/tcp/ptl_tcp_proc.c
rename to ompi/mca/ptl/tcp/ptl_tcp_proc.c
diff --git a/src/mca/ptl/tcp/ptl_tcp_proc.h b/ompi/mca/ptl/tcp/ptl_tcp_proc.h
similarity index 100%
rename from src/mca/ptl/tcp/ptl_tcp_proc.h
rename to ompi/mca/ptl/tcp/ptl_tcp_proc.h
diff --git a/src/mca/ptl/tcp/ptl_tcp_recvfrag.c b/ompi/mca/ptl/tcp/ptl_tcp_recvfrag.c
similarity index 100%
rename from src/mca/ptl/tcp/ptl_tcp_recvfrag.c
rename to ompi/mca/ptl/tcp/ptl_tcp_recvfrag.c
diff --git a/src/mca/ptl/tcp/ptl_tcp_recvfrag.h b/ompi/mca/ptl/tcp/ptl_tcp_recvfrag.h
similarity index 100%
rename from src/mca/ptl/tcp/ptl_tcp_recvfrag.h
rename to ompi/mca/ptl/tcp/ptl_tcp_recvfrag.h
diff --git a/src/mca/ptl/tcp/ptl_tcp_sendfrag.c b/ompi/mca/ptl/tcp/ptl_tcp_sendfrag.c
similarity index 100%
rename from src/mca/ptl/tcp/ptl_tcp_sendfrag.c
rename to ompi/mca/ptl/tcp/ptl_tcp_sendfrag.c
diff --git a/src/mca/ptl/tcp/ptl_tcp_sendfrag.h b/ompi/mca/ptl/tcp/ptl_tcp_sendfrag.h
similarity index 100%
rename from src/mca/ptl/tcp/ptl_tcp_sendfrag.h
rename to ompi/mca/ptl/tcp/ptl_tcp_sendfrag.h
diff --git a/src/mca/ptl/tcp/ptl_tcp_sendreq.c b/ompi/mca/ptl/tcp/ptl_tcp_sendreq.c
similarity index 100%
rename from src/mca/ptl/tcp/ptl_tcp_sendreq.c
rename to ompi/mca/ptl/tcp/ptl_tcp_sendreq.c
diff --git a/src/mca/ptl/tcp/ptl_tcp_sendreq.h b/ompi/mca/ptl/tcp/ptl_tcp_sendreq.h
similarity index 100%
rename from src/mca/ptl/tcp/ptl_tcp_sendreq.h
rename to ompi/mca/ptl/tcp/ptl_tcp_sendreq.h
diff --git a/src/mca/rmgr/Makefile.am b/ompi/mca/rmgr/Makefile.am
similarity index 100%
rename from src/mca/rmgr/Makefile.am
rename to ompi/mca/rmgr/Makefile.am
diff --git a/src/mca/rmgr/base/Makefile.am b/ompi/mca/rmgr/base/Makefile.am
similarity index 100%
rename from src/mca/rmgr/base/Makefile.am
rename to ompi/mca/rmgr/base/Makefile.am
diff --git a/src/mca/rmgr/base/base.h b/ompi/mca/rmgr/base/base.h
similarity index 100%
rename from src/mca/rmgr/base/base.h
rename to ompi/mca/rmgr/base/base.h
diff --git a/src/mca/rmgr/base/data_type_support/Makefile.am b/ompi/mca/rmgr/base/data_type_support/Makefile.am
similarity index 100%
rename from src/mca/rmgr/base/data_type_support/Makefile.am
rename to ompi/mca/rmgr/base/data_type_support/Makefile.am
diff --git a/src/mca/rmgr/base/data_type_support/rmgr_data_type_packing_fns.c b/ompi/mca/rmgr/base/data_type_support/rmgr_data_type_packing_fns.c
similarity index 100%
rename from src/mca/rmgr/base/data_type_support/rmgr_data_type_packing_fns.c
rename to ompi/mca/rmgr/base/data_type_support/rmgr_data_type_packing_fns.c
diff --git a/src/mca/rmgr/base/data_type_support/rmgr_data_type_unpacking_fns.c b/ompi/mca/rmgr/base/data_type_support/rmgr_data_type_unpacking_fns.c
similarity index 100%
rename from src/mca/rmgr/base/data_type_support/rmgr_data_type_unpacking_fns.c
rename to ompi/mca/rmgr/base/data_type_support/rmgr_data_type_unpacking_fns.c
diff --git a/src/mca/rmgr/base/rmgr_base_close.c b/ompi/mca/rmgr/base/rmgr_base_close.c
similarity index 100%
rename from src/mca/rmgr/base/rmgr_base_close.c
rename to ompi/mca/rmgr/base/rmgr_base_close.c
diff --git a/src/mca/rmgr/base/rmgr_base_context.c b/ompi/mca/rmgr/base/rmgr_base_context.c
similarity index 100%
rename from src/mca/rmgr/base/rmgr_base_context.c
rename to ompi/mca/rmgr/base/rmgr_base_context.c
diff --git a/src/mca/rmgr/base/rmgr_base_open.c b/ompi/mca/rmgr/base/rmgr_base_open.c
similarity index 100%
rename from src/mca/rmgr/base/rmgr_base_open.c
rename to ompi/mca/rmgr/base/rmgr_base_open.c
diff --git a/src/mca/rmgr/base/rmgr_base_pack.c b/ompi/mca/rmgr/base/rmgr_base_pack.c
similarity index 100%
rename from src/mca/rmgr/base/rmgr_base_pack.c
rename to ompi/mca/rmgr/base/rmgr_base_pack.c
diff --git a/src/mca/rmgr/base/rmgr_base_select.c b/ompi/mca/rmgr/base/rmgr_base_select.c
similarity index 100%
rename from src/mca/rmgr/base/rmgr_base_select.c
rename to ompi/mca/rmgr/base/rmgr_base_select.c
diff --git a/src/mca/rmgr/base/rmgr_base_stage_gate.c b/ompi/mca/rmgr/base/rmgr_base_stage_gate.c
similarity index 100%
rename from src/mca/rmgr/base/rmgr_base_stage_gate.c
rename to ompi/mca/rmgr/base/rmgr_base_stage_gate.c
diff --git a/src/mca/rmgr/base/rmgr_base_stubs.c b/ompi/mca/rmgr/base/rmgr_base_stubs.c
similarity index 100%
rename from src/mca/rmgr/base/rmgr_base_stubs.c
rename to ompi/mca/rmgr/base/rmgr_base_stubs.c
diff --git a/src/mca/rmgr/base/rmgr_base_unpack.c b/ompi/mca/rmgr/base/rmgr_base_unpack.c
similarity index 100%
rename from src/mca/rmgr/base/rmgr_base_unpack.c
rename to ompi/mca/rmgr/base/rmgr_base_unpack.c
diff --git a/src/mca/rmgr/proxy/Makefile.am b/ompi/mca/rmgr/proxy/Makefile.am
similarity index 100%
rename from src/mca/rmgr/proxy/Makefile.am
rename to ompi/mca/rmgr/proxy/Makefile.am
diff --git a/src/mca/rmgr/proxy/configure.params b/ompi/mca/rmgr/proxy/configure.params
similarity index 100%
rename from src/mca/rmgr/proxy/configure.params
rename to ompi/mca/rmgr/proxy/configure.params
diff --git a/src/mca/rmgr/proxy/rmgr_proxy.c b/ompi/mca/rmgr/proxy/rmgr_proxy.c
similarity index 100%
rename from src/mca/rmgr/proxy/rmgr_proxy.c
rename to ompi/mca/rmgr/proxy/rmgr_proxy.c
diff --git a/src/mca/rmgr/proxy/rmgr_proxy.h b/ompi/mca/rmgr/proxy/rmgr_proxy.h
similarity index 100%
rename from src/mca/rmgr/proxy/rmgr_proxy.h
rename to ompi/mca/rmgr/proxy/rmgr_proxy.h
diff --git a/src/mca/rmgr/proxy/rmgr_proxy_component.c b/ompi/mca/rmgr/proxy/rmgr_proxy_component.c
similarity index 100%
rename from src/mca/rmgr/proxy/rmgr_proxy_component.c
rename to ompi/mca/rmgr/proxy/rmgr_proxy_component.c
diff --git a/src/mca/rmgr/rmgr.h b/ompi/mca/rmgr/rmgr.h
similarity index 100%
rename from src/mca/rmgr/rmgr.h
rename to ompi/mca/rmgr/rmgr.h
diff --git a/src/mca/rmgr/rmgr_types.h b/ompi/mca/rmgr/rmgr_types.h
similarity index 100%
rename from src/mca/rmgr/rmgr_types.h
rename to ompi/mca/rmgr/rmgr_types.h
diff --git a/src/mca/rmgr/urm/Makefile.am b/ompi/mca/rmgr/urm/Makefile.am
similarity index 100%
rename from src/mca/rmgr/urm/Makefile.am
rename to ompi/mca/rmgr/urm/Makefile.am
diff --git a/src/mca/rmgr/urm/configure.params b/ompi/mca/rmgr/urm/configure.params
similarity index 100%
rename from src/mca/rmgr/urm/configure.params
rename to ompi/mca/rmgr/urm/configure.params
diff --git a/src/mca/rmgr/urm/rmgr_urm.c b/ompi/mca/rmgr/urm/rmgr_urm.c
similarity index 100%
rename from src/mca/rmgr/urm/rmgr_urm.c
rename to ompi/mca/rmgr/urm/rmgr_urm.c
diff --git a/src/mca/rmgr/urm/rmgr_urm.h b/ompi/mca/rmgr/urm/rmgr_urm.h
similarity index 100%
rename from src/mca/rmgr/urm/rmgr_urm.h
rename to ompi/mca/rmgr/urm/rmgr_urm.h
diff --git a/src/mca/rmgr/urm/rmgr_urm_component.c b/ompi/mca/rmgr/urm/rmgr_urm_component.c
similarity index 100%
rename from src/mca/rmgr/urm/rmgr_urm_component.c
rename to ompi/mca/rmgr/urm/rmgr_urm_component.c
diff --git a/src/mca/topo/Makefile.am b/ompi/mca/topo/Makefile.am
similarity index 100%
rename from src/mca/topo/Makefile.am
rename to ompi/mca/topo/Makefile.am
diff --git a/src/mca/topo/base/Makefile.am b/ompi/mca/topo/base/Makefile.am
similarity index 100%
rename from src/mca/topo/base/Makefile.am
rename to ompi/mca/topo/base/Makefile.am
diff --git a/src/mca/topo/base/base.h b/ompi/mca/topo/base/base.h
similarity index 100%
rename from src/mca/topo/base/base.h
rename to ompi/mca/topo/base/base.h
diff --git a/src/mca/topo/base/topo_base_cart_coords.c b/ompi/mca/topo/base/topo_base_cart_coords.c
similarity index 100%
rename from src/mca/topo/base/topo_base_cart_coords.c
rename to ompi/mca/topo/base/topo_base_cart_coords.c
diff --git a/src/mca/topo/base/topo_base_cart_create.c b/ompi/mca/topo/base/topo_base_cart_create.c
similarity index 100%
rename from src/mca/topo/base/topo_base_cart_create.c
rename to ompi/mca/topo/base/topo_base_cart_create.c
diff --git a/src/mca/topo/base/topo_base_cart_get.c b/ompi/mca/topo/base/topo_base_cart_get.c
similarity index 100%
rename from src/mca/topo/base/topo_base_cart_get.c
rename to ompi/mca/topo/base/topo_base_cart_get.c
diff --git a/src/mca/topo/base/topo_base_cart_rank.c b/ompi/mca/topo/base/topo_base_cart_rank.c
similarity index 100%
rename from src/mca/topo/base/topo_base_cart_rank.c
rename to ompi/mca/topo/base/topo_base_cart_rank.c
diff --git a/src/mca/topo/base/topo_base_cart_shift.c b/ompi/mca/topo/base/topo_base_cart_shift.c
similarity index 100%
rename from src/mca/topo/base/topo_base_cart_shift.c
rename to ompi/mca/topo/base/topo_base_cart_shift.c
diff --git a/src/mca/topo/base/topo_base_cart_sub.c b/ompi/mca/topo/base/topo_base_cart_sub.c
similarity index 100%
rename from src/mca/topo/base/topo_base_cart_sub.c
rename to ompi/mca/topo/base/topo_base_cart_sub.c
diff --git a/src/mca/topo/base/topo_base_cartdim_get.c b/ompi/mca/topo/base/topo_base_cartdim_get.c
similarity index 100%
rename from src/mca/topo/base/topo_base_cartdim_get.c
rename to ompi/mca/topo/base/topo_base_cartdim_get.c
diff --git a/src/mca/topo/base/topo_base_close.c b/ompi/mca/topo/base/topo_base_close.c
similarity index 100%
rename from src/mca/topo/base/topo_base_close.c
rename to ompi/mca/topo/base/topo_base_close.c
diff --git a/src/mca/topo/base/topo_base_comm_select.c b/ompi/mca/topo/base/topo_base_comm_select.c
similarity index 100%
rename from src/mca/topo/base/topo_base_comm_select.c
rename to ompi/mca/topo/base/topo_base_comm_select.c
diff --git a/src/mca/topo/base/topo_base_comm_unselect.c b/ompi/mca/topo/base/topo_base_comm_unselect.c
similarity index 100%
rename from src/mca/topo/base/topo_base_comm_unselect.c
rename to ompi/mca/topo/base/topo_base_comm_unselect.c
diff --git a/src/mca/topo/base/topo_base_find_available.c b/ompi/mca/topo/base/topo_base_find_available.c
similarity index 100%
rename from src/mca/topo/base/topo_base_find_available.c
rename to ompi/mca/topo/base/topo_base_find_available.c
diff --git a/src/mca/topo/base/topo_base_graph_create.c b/ompi/mca/topo/base/topo_base_graph_create.c
similarity index 100%
rename from src/mca/topo/base/topo_base_graph_create.c
rename to ompi/mca/topo/base/topo_base_graph_create.c
diff --git a/src/mca/topo/base/topo_base_graph_get.c b/ompi/mca/topo/base/topo_base_graph_get.c
similarity index 100%
rename from src/mca/topo/base/topo_base_graph_get.c
rename to ompi/mca/topo/base/topo_base_graph_get.c
diff --git a/src/mca/topo/base/topo_base_graph_neighbors.c b/ompi/mca/topo/base/topo_base_graph_neighbors.c
similarity index 100%
rename from src/mca/topo/base/topo_base_graph_neighbors.c
rename to ompi/mca/topo/base/topo_base_graph_neighbors.c
diff --git a/src/mca/topo/base/topo_base_graph_neighbors_count.c b/ompi/mca/topo/base/topo_base_graph_neighbors_count.c
similarity index 100%
rename from src/mca/topo/base/topo_base_graph_neighbors_count.c
rename to ompi/mca/topo/base/topo_base_graph_neighbors_count.c
diff --git a/src/mca/topo/base/topo_base_graphdims_get.c b/ompi/mca/topo/base/topo_base_graphdims_get.c
similarity index 100%
rename from src/mca/topo/base/topo_base_graphdims_get.c
rename to ompi/mca/topo/base/topo_base_graphdims_get.c
diff --git a/src/mca/topo/base/topo_base_open.c b/ompi/mca/topo/base/topo_base_open.c
similarity index 100%
rename from src/mca/topo/base/topo_base_open.c
rename to ompi/mca/topo/base/topo_base_open.c
diff --git a/src/mca/topo/topo.h b/ompi/mca/topo/topo.h
similarity index 100%
rename from src/mca/topo/topo.h
rename to ompi/mca/topo/topo.h
diff --git a/src/mca/topo/unity/Makefile.am b/ompi/mca/topo/unity/Makefile.am
similarity index 100%
rename from src/mca/topo/unity/Makefile.am
rename to ompi/mca/topo/unity/Makefile.am
diff --git a/src/mca/topo/unity/VERSION b/ompi/mca/topo/unity/VERSION
similarity index 100%
rename from src/mca/topo/unity/VERSION
rename to ompi/mca/topo/unity/VERSION
diff --git a/src/mca/topo/unity/configure.params b/ompi/mca/topo/unity/configure.params
similarity index 100%
rename from src/mca/topo/unity/configure.params
rename to ompi/mca/topo/unity/configure.params
diff --git a/src/mca/topo/unity/topo_unity.c b/ompi/mca/topo/unity/topo_unity.c
similarity index 100%
rename from src/mca/topo/unity/topo_unity.c
rename to ompi/mca/topo/unity/topo_unity.c
diff --git a/src/mca/topo/unity/topo_unity.h b/ompi/mca/topo/unity/topo_unity.h
similarity index 100%
rename from src/mca/topo/unity/topo_unity.h
rename to ompi/mca/topo/unity/topo_unity.h
diff --git a/src/mca/topo/unity/topo_unity_cart_map.c b/ompi/mca/topo/unity/topo_unity_cart_map.c
similarity index 100%
rename from src/mca/topo/unity/topo_unity_cart_map.c
rename to ompi/mca/topo/unity/topo_unity_cart_map.c
diff --git a/src/mca/topo/unity/topo_unity_component.c b/ompi/mca/topo/unity/topo_unity_component.c
similarity index 100%
rename from src/mca/topo/unity/topo_unity_component.c
rename to ompi/mca/topo/unity/topo_unity_component.c
diff --git a/src/mca/topo/unity/topo_unity_graph_map.c b/ompi/mca/topo/unity/topo_unity_graph_map.c
similarity index 100%
rename from src/mca/topo/unity/topo_unity_graph_map.c
rename to ompi/mca/topo/unity/topo_unity_graph_map.c
diff --git a/src/mca/win_makefile b/ompi/mca/win_makefile
similarity index 100%
rename from src/mca/win_makefile
rename to ompi/mca/win_makefile
diff --git a/src/mpi/Makefile.am b/ompi/mpi/Makefile.am
similarity index 100%
rename from src/mpi/Makefile.am
rename to ompi/mpi/Makefile.am
diff --git a/src/mpi/README.dox b/ompi/mpi/README.dox
similarity index 100%
rename from src/mpi/README.dox
rename to ompi/mpi/README.dox
diff --git a/src/mpi/c/Makefile.am b/ompi/mpi/c/Makefile.am
similarity index 100%
rename from src/mpi/c/Makefile.am
rename to ompi/mpi/c/Makefile.am
diff --git a/src/mpi/c/abort.c b/ompi/mpi/c/abort.c
similarity index 100%
rename from src/mpi/c/abort.c
rename to ompi/mpi/c/abort.c
diff --git a/src/mpi/c/accumulate.c b/ompi/mpi/c/accumulate.c
similarity index 100%
rename from src/mpi/c/accumulate.c
rename to ompi/mpi/c/accumulate.c
diff --git a/src/mpi/c/add_error_class.c b/ompi/mpi/c/add_error_class.c
similarity index 100%
rename from src/mpi/c/add_error_class.c
rename to ompi/mpi/c/add_error_class.c
diff --git a/src/mpi/c/add_error_code.c b/ompi/mpi/c/add_error_code.c
similarity index 100%
rename from src/mpi/c/add_error_code.c
rename to ompi/mpi/c/add_error_code.c
diff --git a/src/mpi/c/add_error_string.c b/ompi/mpi/c/add_error_string.c
similarity index 100%
rename from src/mpi/c/add_error_string.c
rename to ompi/mpi/c/add_error_string.c
diff --git a/src/mpi/c/address.c b/ompi/mpi/c/address.c
similarity index 100%
rename from src/mpi/c/address.c
rename to ompi/mpi/c/address.c
diff --git a/src/mpi/c/allgather.c b/ompi/mpi/c/allgather.c
similarity index 100%
rename from src/mpi/c/allgather.c
rename to ompi/mpi/c/allgather.c
diff --git a/src/mpi/c/allgatherv.c b/ompi/mpi/c/allgatherv.c
similarity index 100%
rename from src/mpi/c/allgatherv.c
rename to ompi/mpi/c/allgatherv.c
diff --git a/src/mpi/c/alloc_mem.c b/ompi/mpi/c/alloc_mem.c
similarity index 100%
rename from src/mpi/c/alloc_mem.c
rename to ompi/mpi/c/alloc_mem.c
diff --git a/src/mpi/c/allreduce.c b/ompi/mpi/c/allreduce.c
similarity index 100%
rename from src/mpi/c/allreduce.c
rename to ompi/mpi/c/allreduce.c
diff --git a/src/mpi/c/alltoall.c b/ompi/mpi/c/alltoall.c
similarity index 100%
rename from src/mpi/c/alltoall.c
rename to ompi/mpi/c/alltoall.c
diff --git a/src/mpi/c/alltoallv.c b/ompi/mpi/c/alltoallv.c
similarity index 100%
rename from src/mpi/c/alltoallv.c
rename to ompi/mpi/c/alltoallv.c
diff --git a/src/mpi/c/alltoallw.c b/ompi/mpi/c/alltoallw.c
similarity index 100%
rename from src/mpi/c/alltoallw.c
rename to ompi/mpi/c/alltoallw.c
diff --git a/src/mpi/c/attr_delete.c b/ompi/mpi/c/attr_delete.c
similarity index 100%
rename from src/mpi/c/attr_delete.c
rename to ompi/mpi/c/attr_delete.c
diff --git a/src/mpi/c/attr_fn.c b/ompi/mpi/c/attr_fn.c
similarity index 100%
rename from src/mpi/c/attr_fn.c
rename to ompi/mpi/c/attr_fn.c
diff --git a/src/mpi/c/attr_get.c b/ompi/mpi/c/attr_get.c
similarity index 100%
rename from src/mpi/c/attr_get.c
rename to ompi/mpi/c/attr_get.c
diff --git a/src/mpi/c/attr_put.c b/ompi/mpi/c/attr_put.c
similarity index 100%
rename from src/mpi/c/attr_put.c
rename to ompi/mpi/c/attr_put.c
diff --git a/src/mpi/c/barrier.c b/ompi/mpi/c/barrier.c
similarity index 100%
rename from src/mpi/c/barrier.c
rename to ompi/mpi/c/barrier.c
diff --git a/src/mpi/c/bcast.c b/ompi/mpi/c/bcast.c
similarity index 100%
rename from src/mpi/c/bcast.c
rename to ompi/mpi/c/bcast.c
diff --git a/src/mpi/c/bindings.h b/ompi/mpi/c/bindings.h
similarity index 100%
rename from src/mpi/c/bindings.h
rename to ompi/mpi/c/bindings.h
diff --git a/src/mpi/c/bsend.c b/ompi/mpi/c/bsend.c
similarity index 100%
rename from src/mpi/c/bsend.c
rename to ompi/mpi/c/bsend.c
diff --git a/src/mpi/c/bsend_init.c b/ompi/mpi/c/bsend_init.c
similarity index 100%
rename from src/mpi/c/bsend_init.c
rename to ompi/mpi/c/bsend_init.c
diff --git a/src/mpi/c/buffer_attach.c b/ompi/mpi/c/buffer_attach.c
similarity index 100%
rename from src/mpi/c/buffer_attach.c
rename to ompi/mpi/c/buffer_attach.c
diff --git a/src/mpi/c/buffer_detach.c b/ompi/mpi/c/buffer_detach.c
similarity index 100%
rename from src/mpi/c/buffer_detach.c
rename to ompi/mpi/c/buffer_detach.c
diff --git a/src/mpi/c/cancel.c b/ompi/mpi/c/cancel.c
similarity index 100%
rename from src/mpi/c/cancel.c
rename to ompi/mpi/c/cancel.c
diff --git a/src/mpi/c/cart_coords.c b/ompi/mpi/c/cart_coords.c
similarity index 100%
rename from src/mpi/c/cart_coords.c
rename to ompi/mpi/c/cart_coords.c
diff --git a/src/mpi/c/cart_create.c b/ompi/mpi/c/cart_create.c
similarity index 100%
rename from src/mpi/c/cart_create.c
rename to ompi/mpi/c/cart_create.c
diff --git a/src/mpi/c/cart_get.c b/ompi/mpi/c/cart_get.c
similarity index 100%
rename from src/mpi/c/cart_get.c
rename to ompi/mpi/c/cart_get.c
diff --git a/src/mpi/c/cart_map.c b/ompi/mpi/c/cart_map.c
similarity index 100%
rename from src/mpi/c/cart_map.c
rename to ompi/mpi/c/cart_map.c
diff --git a/src/mpi/c/cart_rank.c b/ompi/mpi/c/cart_rank.c
similarity index 100%
rename from src/mpi/c/cart_rank.c
rename to ompi/mpi/c/cart_rank.c
diff --git a/src/mpi/c/cart_shift.c b/ompi/mpi/c/cart_shift.c
similarity index 100%
rename from src/mpi/c/cart_shift.c
rename to ompi/mpi/c/cart_shift.c
diff --git a/src/mpi/c/cart_sub.c b/ompi/mpi/c/cart_sub.c
similarity index 100%
rename from src/mpi/c/cart_sub.c
rename to ompi/mpi/c/cart_sub.c
diff --git a/src/mpi/c/cartdim_get.c b/ompi/mpi/c/cartdim_get.c
similarity index 100%
rename from src/mpi/c/cartdim_get.c
rename to ompi/mpi/c/cartdim_get.c
diff --git a/src/mpi/c/close_port.c b/ompi/mpi/c/close_port.c
similarity index 100%
rename from src/mpi/c/close_port.c
rename to ompi/mpi/c/close_port.c
diff --git a/src/mpi/c/comm_accept.c b/ompi/mpi/c/comm_accept.c
similarity index 100%
rename from src/mpi/c/comm_accept.c
rename to ompi/mpi/c/comm_accept.c
diff --git a/src/mpi/c/comm_c2f.c b/ompi/mpi/c/comm_c2f.c
similarity index 100%
rename from src/mpi/c/comm_c2f.c
rename to ompi/mpi/c/comm_c2f.c
diff --git a/src/mpi/c/comm_call_errhandler.c b/ompi/mpi/c/comm_call_errhandler.c
similarity index 100%
rename from src/mpi/c/comm_call_errhandler.c
rename to ompi/mpi/c/comm_call_errhandler.c
diff --git a/src/mpi/c/comm_compare.c b/ompi/mpi/c/comm_compare.c
similarity index 100%
rename from src/mpi/c/comm_compare.c
rename to ompi/mpi/c/comm_compare.c
diff --git a/src/mpi/c/comm_connect.c b/ompi/mpi/c/comm_connect.c
similarity index 100%
rename from src/mpi/c/comm_connect.c
rename to ompi/mpi/c/comm_connect.c
diff --git a/src/mpi/c/comm_create.c b/ompi/mpi/c/comm_create.c
similarity index 100%
rename from src/mpi/c/comm_create.c
rename to ompi/mpi/c/comm_create.c
diff --git a/src/mpi/c/comm_create_errhandler.c b/ompi/mpi/c/comm_create_errhandler.c
similarity index 100%
rename from src/mpi/c/comm_create_errhandler.c
rename to ompi/mpi/c/comm_create_errhandler.c
diff --git a/src/mpi/c/comm_create_keyval.c b/ompi/mpi/c/comm_create_keyval.c
similarity index 100%
rename from src/mpi/c/comm_create_keyval.c
rename to ompi/mpi/c/comm_create_keyval.c
diff --git a/src/mpi/c/comm_delete_attr.c b/ompi/mpi/c/comm_delete_attr.c
similarity index 100%
rename from src/mpi/c/comm_delete_attr.c
rename to ompi/mpi/c/comm_delete_attr.c
diff --git a/src/mpi/c/comm_disconnect.c b/ompi/mpi/c/comm_disconnect.c
similarity index 100%
rename from src/mpi/c/comm_disconnect.c
rename to ompi/mpi/c/comm_disconnect.c
diff --git a/src/mpi/c/comm_dup.c b/ompi/mpi/c/comm_dup.c
similarity index 100%
rename from src/mpi/c/comm_dup.c
rename to ompi/mpi/c/comm_dup.c
diff --git a/src/mpi/c/comm_f2c.c b/ompi/mpi/c/comm_f2c.c
similarity index 100%
rename from src/mpi/c/comm_f2c.c
rename to ompi/mpi/c/comm_f2c.c
diff --git a/src/mpi/c/comm_free.c b/ompi/mpi/c/comm_free.c
similarity index 100%
rename from src/mpi/c/comm_free.c
rename to ompi/mpi/c/comm_free.c
diff --git a/src/mpi/c/comm_free_keyval.c b/ompi/mpi/c/comm_free_keyval.c
similarity index 100%
rename from src/mpi/c/comm_free_keyval.c
rename to ompi/mpi/c/comm_free_keyval.c
diff --git a/src/mpi/c/comm_get_attr.c b/ompi/mpi/c/comm_get_attr.c
similarity index 100%
rename from src/mpi/c/comm_get_attr.c
rename to ompi/mpi/c/comm_get_attr.c
diff --git a/src/mpi/c/comm_get_errhandler.c b/ompi/mpi/c/comm_get_errhandler.c
similarity index 100%
rename from src/mpi/c/comm_get_errhandler.c
rename to ompi/mpi/c/comm_get_errhandler.c
diff --git a/src/mpi/c/comm_get_name.c b/ompi/mpi/c/comm_get_name.c
similarity index 100%
rename from src/mpi/c/comm_get_name.c
rename to ompi/mpi/c/comm_get_name.c
diff --git a/src/mpi/c/comm_get_parent.c b/ompi/mpi/c/comm_get_parent.c
similarity index 100%
rename from src/mpi/c/comm_get_parent.c
rename to ompi/mpi/c/comm_get_parent.c
diff --git a/src/mpi/c/comm_group.c b/ompi/mpi/c/comm_group.c
similarity index 100%
rename from src/mpi/c/comm_group.c
rename to ompi/mpi/c/comm_group.c
diff --git a/src/mpi/c/comm_join.c b/ompi/mpi/c/comm_join.c
similarity index 100%
rename from src/mpi/c/comm_join.c
rename to ompi/mpi/c/comm_join.c
diff --git a/src/mpi/c/comm_rank.c b/ompi/mpi/c/comm_rank.c
similarity index 100%
rename from src/mpi/c/comm_rank.c
rename to ompi/mpi/c/comm_rank.c
diff --git a/src/mpi/c/comm_remote_group.c b/ompi/mpi/c/comm_remote_group.c
similarity index 100%
rename from src/mpi/c/comm_remote_group.c
rename to ompi/mpi/c/comm_remote_group.c
diff --git a/src/mpi/c/comm_remote_size.c b/ompi/mpi/c/comm_remote_size.c
similarity index 100%
rename from src/mpi/c/comm_remote_size.c
rename to ompi/mpi/c/comm_remote_size.c
diff --git a/src/mpi/c/comm_set_attr.c b/ompi/mpi/c/comm_set_attr.c
similarity index 100%
rename from src/mpi/c/comm_set_attr.c
rename to ompi/mpi/c/comm_set_attr.c
diff --git a/src/mpi/c/comm_set_errhandler.c b/ompi/mpi/c/comm_set_errhandler.c
similarity index 100%
rename from src/mpi/c/comm_set_errhandler.c
rename to ompi/mpi/c/comm_set_errhandler.c
diff --git a/src/mpi/c/comm_set_name.c b/ompi/mpi/c/comm_set_name.c
similarity index 100%
rename from src/mpi/c/comm_set_name.c
rename to ompi/mpi/c/comm_set_name.c
diff --git a/src/mpi/c/comm_size.c b/ompi/mpi/c/comm_size.c
similarity index 100%
rename from src/mpi/c/comm_size.c
rename to ompi/mpi/c/comm_size.c
diff --git a/src/mpi/c/comm_spawn.c b/ompi/mpi/c/comm_spawn.c
similarity index 100%
rename from src/mpi/c/comm_spawn.c
rename to ompi/mpi/c/comm_spawn.c
diff --git a/src/mpi/c/comm_spawn_multiple.c b/ompi/mpi/c/comm_spawn_multiple.c
similarity index 100%
rename from src/mpi/c/comm_spawn_multiple.c
rename to ompi/mpi/c/comm_spawn_multiple.c
diff --git a/src/mpi/c/comm_split.c b/ompi/mpi/c/comm_split.c
similarity index 100%
rename from src/mpi/c/comm_split.c
rename to ompi/mpi/c/comm_split.c
diff --git a/src/mpi/c/comm_test_inter.c b/ompi/mpi/c/comm_test_inter.c
similarity index 100%
rename from src/mpi/c/comm_test_inter.c
rename to ompi/mpi/c/comm_test_inter.c
diff --git a/src/mpi/c/dims_create.c b/ompi/mpi/c/dims_create.c
similarity index 100%
rename from src/mpi/c/dims_create.c
rename to ompi/mpi/c/dims_create.c
diff --git a/src/mpi/c/errhandler_c2f.c b/ompi/mpi/c/errhandler_c2f.c
similarity index 100%
rename from src/mpi/c/errhandler_c2f.c
rename to ompi/mpi/c/errhandler_c2f.c
diff --git a/src/mpi/c/errhandler_create.c b/ompi/mpi/c/errhandler_create.c
similarity index 100%
rename from src/mpi/c/errhandler_create.c
rename to ompi/mpi/c/errhandler_create.c
diff --git a/src/mpi/c/errhandler_f2c.c b/ompi/mpi/c/errhandler_f2c.c
similarity index 100%
rename from src/mpi/c/errhandler_f2c.c
rename to ompi/mpi/c/errhandler_f2c.c
diff --git a/src/mpi/c/errhandler_free.c b/ompi/mpi/c/errhandler_free.c
similarity index 100%
rename from src/mpi/c/errhandler_free.c
rename to ompi/mpi/c/errhandler_free.c
diff --git a/src/mpi/c/errhandler_get.c b/ompi/mpi/c/errhandler_get.c
similarity index 100%
rename from src/mpi/c/errhandler_get.c
rename to ompi/mpi/c/errhandler_get.c
diff --git a/src/mpi/c/errhandler_set.c b/ompi/mpi/c/errhandler_set.c
similarity index 100%
rename from src/mpi/c/errhandler_set.c
rename to ompi/mpi/c/errhandler_set.c
diff --git a/src/mpi/c/error_class.c b/ompi/mpi/c/error_class.c
similarity index 100%
rename from src/mpi/c/error_class.c
rename to ompi/mpi/c/error_class.c
diff --git a/src/mpi/c/error_string.c b/ompi/mpi/c/error_string.c
similarity index 100%
rename from src/mpi/c/error_string.c
rename to ompi/mpi/c/error_string.c
diff --git a/src/mpi/c/exscan.c b/ompi/mpi/c/exscan.c
similarity index 100%
rename from src/mpi/c/exscan.c
rename to ompi/mpi/c/exscan.c
diff --git a/src/mpi/c/file_c2f.c b/ompi/mpi/c/file_c2f.c
similarity index 100%
rename from src/mpi/c/file_c2f.c
rename to ompi/mpi/c/file_c2f.c
diff --git a/src/mpi/c/file_call_errhandler.c b/ompi/mpi/c/file_call_errhandler.c
similarity index 100%
rename from src/mpi/c/file_call_errhandler.c
rename to ompi/mpi/c/file_call_errhandler.c
diff --git a/src/mpi/c/file_close.c b/ompi/mpi/c/file_close.c
similarity index 100%
rename from src/mpi/c/file_close.c
rename to ompi/mpi/c/file_close.c
diff --git a/src/mpi/c/file_create_errhandler.c b/ompi/mpi/c/file_create_errhandler.c
similarity index 100%
rename from src/mpi/c/file_create_errhandler.c
rename to ompi/mpi/c/file_create_errhandler.c
diff --git a/src/mpi/c/file_delete.c b/ompi/mpi/c/file_delete.c
similarity index 100%
rename from src/mpi/c/file_delete.c
rename to ompi/mpi/c/file_delete.c
diff --git a/src/mpi/c/file_f2c.c b/ompi/mpi/c/file_f2c.c
similarity index 100%
rename from src/mpi/c/file_f2c.c
rename to ompi/mpi/c/file_f2c.c
diff --git a/src/mpi/c/file_get_amode.c b/ompi/mpi/c/file_get_amode.c
similarity index 100%
rename from src/mpi/c/file_get_amode.c
rename to ompi/mpi/c/file_get_amode.c
diff --git a/src/mpi/c/file_get_atomicity.c b/ompi/mpi/c/file_get_atomicity.c
similarity index 100%
rename from src/mpi/c/file_get_atomicity.c
rename to ompi/mpi/c/file_get_atomicity.c
diff --git a/src/mpi/c/file_get_byte_offset.c b/ompi/mpi/c/file_get_byte_offset.c
similarity index 100%
rename from src/mpi/c/file_get_byte_offset.c
rename to ompi/mpi/c/file_get_byte_offset.c
diff --git a/src/mpi/c/file_get_errhandler.c b/ompi/mpi/c/file_get_errhandler.c
similarity index 100%
rename from src/mpi/c/file_get_errhandler.c
rename to ompi/mpi/c/file_get_errhandler.c
diff --git a/src/mpi/c/file_get_group.c b/ompi/mpi/c/file_get_group.c
similarity index 100%
rename from src/mpi/c/file_get_group.c
rename to ompi/mpi/c/file_get_group.c
diff --git a/src/mpi/c/file_get_info.c b/ompi/mpi/c/file_get_info.c
similarity index 100%
rename from src/mpi/c/file_get_info.c
rename to ompi/mpi/c/file_get_info.c
diff --git a/src/mpi/c/file_get_position.c b/ompi/mpi/c/file_get_position.c
similarity index 100%
rename from src/mpi/c/file_get_position.c
rename to ompi/mpi/c/file_get_position.c
diff --git a/src/mpi/c/file_get_position_shared.c b/ompi/mpi/c/file_get_position_shared.c
similarity index 100%
rename from src/mpi/c/file_get_position_shared.c
rename to ompi/mpi/c/file_get_position_shared.c
diff --git a/src/mpi/c/file_get_size.c b/ompi/mpi/c/file_get_size.c
similarity index 100%
rename from src/mpi/c/file_get_size.c
rename to ompi/mpi/c/file_get_size.c
diff --git a/src/mpi/c/file_get_type_extent.c b/ompi/mpi/c/file_get_type_extent.c
similarity index 100%
rename from src/mpi/c/file_get_type_extent.c
rename to ompi/mpi/c/file_get_type_extent.c
diff --git a/src/mpi/c/file_get_view.c b/ompi/mpi/c/file_get_view.c
similarity index 100%
rename from src/mpi/c/file_get_view.c
rename to ompi/mpi/c/file_get_view.c
diff --git a/src/mpi/c/file_iread.c b/ompi/mpi/c/file_iread.c
similarity index 100%
rename from src/mpi/c/file_iread.c
rename to ompi/mpi/c/file_iread.c
diff --git a/src/mpi/c/file_iread_at.c b/ompi/mpi/c/file_iread_at.c
similarity index 100%
rename from src/mpi/c/file_iread_at.c
rename to ompi/mpi/c/file_iread_at.c
diff --git a/src/mpi/c/file_iread_shared.c b/ompi/mpi/c/file_iread_shared.c
similarity index 100%
rename from src/mpi/c/file_iread_shared.c
rename to ompi/mpi/c/file_iread_shared.c
diff --git a/src/mpi/c/file_iwrite.c b/ompi/mpi/c/file_iwrite.c
similarity index 100%
rename from src/mpi/c/file_iwrite.c
rename to ompi/mpi/c/file_iwrite.c
diff --git a/src/mpi/c/file_iwrite_at.c b/ompi/mpi/c/file_iwrite_at.c
similarity index 100%
rename from src/mpi/c/file_iwrite_at.c
rename to ompi/mpi/c/file_iwrite_at.c
diff --git a/src/mpi/c/file_iwrite_shared.c b/ompi/mpi/c/file_iwrite_shared.c
similarity index 100%
rename from src/mpi/c/file_iwrite_shared.c
rename to ompi/mpi/c/file_iwrite_shared.c
diff --git a/src/mpi/c/file_open.c b/ompi/mpi/c/file_open.c
similarity index 100%
rename from src/mpi/c/file_open.c
rename to ompi/mpi/c/file_open.c
diff --git a/src/mpi/c/file_preallocate.c b/ompi/mpi/c/file_preallocate.c
similarity index 100%
rename from src/mpi/c/file_preallocate.c
rename to ompi/mpi/c/file_preallocate.c
diff --git a/src/mpi/c/file_read.c b/ompi/mpi/c/file_read.c
similarity index 100%
rename from src/mpi/c/file_read.c
rename to ompi/mpi/c/file_read.c
diff --git a/src/mpi/c/file_read_all.c b/ompi/mpi/c/file_read_all.c
similarity index 100%
rename from src/mpi/c/file_read_all.c
rename to ompi/mpi/c/file_read_all.c
diff --git a/src/mpi/c/file_read_all_begin.c b/ompi/mpi/c/file_read_all_begin.c
similarity index 100%
rename from src/mpi/c/file_read_all_begin.c
rename to ompi/mpi/c/file_read_all_begin.c
diff --git a/src/mpi/c/file_read_all_end.c b/ompi/mpi/c/file_read_all_end.c
similarity index 100%
rename from src/mpi/c/file_read_all_end.c
rename to ompi/mpi/c/file_read_all_end.c
diff --git a/src/mpi/c/file_read_at.c b/ompi/mpi/c/file_read_at.c
similarity index 100%
rename from src/mpi/c/file_read_at.c
rename to ompi/mpi/c/file_read_at.c
diff --git a/src/mpi/c/file_read_at_all.c b/ompi/mpi/c/file_read_at_all.c
similarity index 100%
rename from src/mpi/c/file_read_at_all.c
rename to ompi/mpi/c/file_read_at_all.c
diff --git a/src/mpi/c/file_read_at_all_begin.c b/ompi/mpi/c/file_read_at_all_begin.c
similarity index 100%
rename from src/mpi/c/file_read_at_all_begin.c
rename to ompi/mpi/c/file_read_at_all_begin.c
diff --git a/src/mpi/c/file_read_at_all_end.c b/ompi/mpi/c/file_read_at_all_end.c
similarity index 100%
rename from src/mpi/c/file_read_at_all_end.c
rename to ompi/mpi/c/file_read_at_all_end.c
diff --git a/src/mpi/c/file_read_ordered.c b/ompi/mpi/c/file_read_ordered.c
similarity index 100%
rename from src/mpi/c/file_read_ordered.c
rename to ompi/mpi/c/file_read_ordered.c
diff --git a/src/mpi/c/file_read_ordered_begin.c b/ompi/mpi/c/file_read_ordered_begin.c
similarity index 100%
rename from src/mpi/c/file_read_ordered_begin.c
rename to ompi/mpi/c/file_read_ordered_begin.c
diff --git a/src/mpi/c/file_read_ordered_end.c b/ompi/mpi/c/file_read_ordered_end.c
similarity index 100%
rename from src/mpi/c/file_read_ordered_end.c
rename to ompi/mpi/c/file_read_ordered_end.c
diff --git a/src/mpi/c/file_read_shared.c b/ompi/mpi/c/file_read_shared.c
similarity index 100%
rename from src/mpi/c/file_read_shared.c
rename to ompi/mpi/c/file_read_shared.c
diff --git a/src/mpi/c/file_seek.c b/ompi/mpi/c/file_seek.c
similarity index 100%
rename from src/mpi/c/file_seek.c
rename to ompi/mpi/c/file_seek.c
diff --git a/src/mpi/c/file_seek_shared.c b/ompi/mpi/c/file_seek_shared.c
similarity index 100%
rename from src/mpi/c/file_seek_shared.c
rename to ompi/mpi/c/file_seek_shared.c
diff --git a/src/mpi/c/file_set_atomicity.c b/ompi/mpi/c/file_set_atomicity.c
similarity index 100%
rename from src/mpi/c/file_set_atomicity.c
rename to ompi/mpi/c/file_set_atomicity.c
diff --git a/src/mpi/c/file_set_errhandler.c b/ompi/mpi/c/file_set_errhandler.c
similarity index 100%
rename from src/mpi/c/file_set_errhandler.c
rename to ompi/mpi/c/file_set_errhandler.c
diff --git a/src/mpi/c/file_set_info.c b/ompi/mpi/c/file_set_info.c
similarity index 100%
rename from src/mpi/c/file_set_info.c
rename to ompi/mpi/c/file_set_info.c
diff --git a/src/mpi/c/file_set_size.c b/ompi/mpi/c/file_set_size.c
similarity index 100%
rename from src/mpi/c/file_set_size.c
rename to ompi/mpi/c/file_set_size.c
diff --git a/src/mpi/c/file_set_view.c b/ompi/mpi/c/file_set_view.c
similarity index 100%
rename from src/mpi/c/file_set_view.c
rename to ompi/mpi/c/file_set_view.c
diff --git a/src/mpi/c/file_sync.c b/ompi/mpi/c/file_sync.c
similarity index 100%
rename from src/mpi/c/file_sync.c
rename to ompi/mpi/c/file_sync.c
diff --git a/src/mpi/c/file_write.c b/ompi/mpi/c/file_write.c
similarity index 100%
rename from src/mpi/c/file_write.c
rename to ompi/mpi/c/file_write.c
diff --git a/src/mpi/c/file_write_all.c b/ompi/mpi/c/file_write_all.c
similarity index 100%
rename from src/mpi/c/file_write_all.c
rename to ompi/mpi/c/file_write_all.c
diff --git a/src/mpi/c/file_write_all_begin.c b/ompi/mpi/c/file_write_all_begin.c
similarity index 100%
rename from src/mpi/c/file_write_all_begin.c
rename to ompi/mpi/c/file_write_all_begin.c
diff --git a/src/mpi/c/file_write_all_end.c b/ompi/mpi/c/file_write_all_end.c
similarity index 100%
rename from src/mpi/c/file_write_all_end.c
rename to ompi/mpi/c/file_write_all_end.c
diff --git a/src/mpi/c/file_write_at.c b/ompi/mpi/c/file_write_at.c
similarity index 100%
rename from src/mpi/c/file_write_at.c
rename to ompi/mpi/c/file_write_at.c
diff --git a/src/mpi/c/file_write_at_all.c b/ompi/mpi/c/file_write_at_all.c
similarity index 100%
rename from src/mpi/c/file_write_at_all.c
rename to ompi/mpi/c/file_write_at_all.c
diff --git a/src/mpi/c/file_write_at_all_begin.c b/ompi/mpi/c/file_write_at_all_begin.c
similarity index 100%
rename from src/mpi/c/file_write_at_all_begin.c
rename to ompi/mpi/c/file_write_at_all_begin.c
diff --git a/src/mpi/c/file_write_at_all_end.c b/ompi/mpi/c/file_write_at_all_end.c
similarity index 100%
rename from src/mpi/c/file_write_at_all_end.c
rename to ompi/mpi/c/file_write_at_all_end.c
diff --git a/src/mpi/c/file_write_ordered.c b/ompi/mpi/c/file_write_ordered.c
similarity index 100%
rename from src/mpi/c/file_write_ordered.c
rename to ompi/mpi/c/file_write_ordered.c
diff --git a/src/mpi/c/file_write_ordered_begin.c b/ompi/mpi/c/file_write_ordered_begin.c
similarity index 100%
rename from src/mpi/c/file_write_ordered_begin.c
rename to ompi/mpi/c/file_write_ordered_begin.c
diff --git a/src/mpi/c/file_write_ordered_end.c b/ompi/mpi/c/file_write_ordered_end.c
similarity index 100%
rename from src/mpi/c/file_write_ordered_end.c
rename to ompi/mpi/c/file_write_ordered_end.c
diff --git a/src/mpi/c/file_write_shared.c b/ompi/mpi/c/file_write_shared.c
similarity index 100%
rename from src/mpi/c/file_write_shared.c
rename to ompi/mpi/c/file_write_shared.c
diff --git a/src/mpi/c/finalize.c b/ompi/mpi/c/finalize.c
similarity index 100%
rename from src/mpi/c/finalize.c
rename to ompi/mpi/c/finalize.c
diff --git a/src/mpi/c/finalized.c b/ompi/mpi/c/finalized.c
similarity index 100%
rename from src/mpi/c/finalized.c
rename to ompi/mpi/c/finalized.c
diff --git a/src/mpi/c/free_mem.c b/ompi/mpi/c/free_mem.c
similarity index 100%
rename from src/mpi/c/free_mem.c
rename to ompi/mpi/c/free_mem.c
diff --git a/src/mpi/c/gather.c b/ompi/mpi/c/gather.c
similarity index 100%
rename from src/mpi/c/gather.c
rename to ompi/mpi/c/gather.c
diff --git a/src/mpi/c/gatherv.c b/ompi/mpi/c/gatherv.c
similarity index 100%
rename from src/mpi/c/gatherv.c
rename to ompi/mpi/c/gatherv.c
diff --git a/src/mpi/c/get.c b/ompi/mpi/c/get.c
similarity index 100%
rename from src/mpi/c/get.c
rename to ompi/mpi/c/get.c
diff --git a/src/mpi/c/get_address.c b/ompi/mpi/c/get_address.c
similarity index 100%
rename from src/mpi/c/get_address.c
rename to ompi/mpi/c/get_address.c
diff --git a/src/mpi/c/get_count.c b/ompi/mpi/c/get_count.c
similarity index 100%
rename from src/mpi/c/get_count.c
rename to ompi/mpi/c/get_count.c
diff --git a/src/mpi/c/get_elements.c b/ompi/mpi/c/get_elements.c
similarity index 100%
rename from src/mpi/c/get_elements.c
rename to ompi/mpi/c/get_elements.c
diff --git a/src/mpi/c/get_processor_name.c b/ompi/mpi/c/get_processor_name.c
similarity index 100%
rename from src/mpi/c/get_processor_name.c
rename to ompi/mpi/c/get_processor_name.c
diff --git a/src/mpi/c/get_version.c b/ompi/mpi/c/get_version.c
similarity index 100%
rename from src/mpi/c/get_version.c
rename to ompi/mpi/c/get_version.c
diff --git a/src/mpi/c/graph_create.c b/ompi/mpi/c/graph_create.c
similarity index 100%
rename from src/mpi/c/graph_create.c
rename to ompi/mpi/c/graph_create.c
diff --git a/src/mpi/c/graph_get.c b/ompi/mpi/c/graph_get.c
similarity index 100%
rename from src/mpi/c/graph_get.c
rename to ompi/mpi/c/graph_get.c
diff --git a/src/mpi/c/graph_map.c b/ompi/mpi/c/graph_map.c
similarity index 100%
rename from src/mpi/c/graph_map.c
rename to ompi/mpi/c/graph_map.c
diff --git a/src/mpi/c/graph_neighbors.c b/ompi/mpi/c/graph_neighbors.c
similarity index 100%
rename from src/mpi/c/graph_neighbors.c
rename to ompi/mpi/c/graph_neighbors.c
diff --git a/src/mpi/c/graph_neighbors_count.c b/ompi/mpi/c/graph_neighbors_count.c
similarity index 100%
rename from src/mpi/c/graph_neighbors_count.c
rename to ompi/mpi/c/graph_neighbors_count.c
diff --git a/src/mpi/c/graphdims_get.c b/ompi/mpi/c/graphdims_get.c
similarity index 100%
rename from src/mpi/c/graphdims_get.c
rename to ompi/mpi/c/graphdims_get.c
diff --git a/src/mpi/c/grequest_complete.c b/ompi/mpi/c/grequest_complete.c
similarity index 100%
rename from src/mpi/c/grequest_complete.c
rename to ompi/mpi/c/grequest_complete.c
diff --git a/src/mpi/c/grequest_start.c b/ompi/mpi/c/grequest_start.c
similarity index 100%
rename from src/mpi/c/grequest_start.c
rename to ompi/mpi/c/grequest_start.c
diff --git a/src/mpi/c/group_c2f.c b/ompi/mpi/c/group_c2f.c
similarity index 100%
rename from src/mpi/c/group_c2f.c
rename to ompi/mpi/c/group_c2f.c
diff --git a/src/mpi/c/group_compare.c b/ompi/mpi/c/group_compare.c
similarity index 100%
rename from src/mpi/c/group_compare.c
rename to ompi/mpi/c/group_compare.c
diff --git a/src/mpi/c/group_difference.c b/ompi/mpi/c/group_difference.c
similarity index 100%
rename from src/mpi/c/group_difference.c
rename to ompi/mpi/c/group_difference.c
diff --git a/src/mpi/c/group_excl.c b/ompi/mpi/c/group_excl.c
similarity index 100%
rename from src/mpi/c/group_excl.c
rename to ompi/mpi/c/group_excl.c
diff --git a/src/mpi/c/group_f2c.c b/ompi/mpi/c/group_f2c.c
similarity index 100%
rename from src/mpi/c/group_f2c.c
rename to ompi/mpi/c/group_f2c.c
diff --git a/src/mpi/c/group_free.c b/ompi/mpi/c/group_free.c
similarity index 100%
rename from src/mpi/c/group_free.c
rename to ompi/mpi/c/group_free.c
diff --git a/src/mpi/c/group_incl.c b/ompi/mpi/c/group_incl.c
similarity index 100%
rename from src/mpi/c/group_incl.c
rename to ompi/mpi/c/group_incl.c
diff --git a/src/mpi/c/group_intersection.c b/ompi/mpi/c/group_intersection.c
similarity index 100%
rename from src/mpi/c/group_intersection.c
rename to ompi/mpi/c/group_intersection.c
diff --git a/src/mpi/c/group_range_excl.c b/ompi/mpi/c/group_range_excl.c
similarity index 100%
rename from src/mpi/c/group_range_excl.c
rename to ompi/mpi/c/group_range_excl.c
diff --git a/src/mpi/c/group_range_incl.c b/ompi/mpi/c/group_range_incl.c
similarity index 100%
rename from src/mpi/c/group_range_incl.c
rename to ompi/mpi/c/group_range_incl.c
diff --git a/src/mpi/c/group_rank.c b/ompi/mpi/c/group_rank.c
similarity index 100%
rename from src/mpi/c/group_rank.c
rename to ompi/mpi/c/group_rank.c
diff --git a/src/mpi/c/group_size.c b/ompi/mpi/c/group_size.c
similarity index 100%
rename from src/mpi/c/group_size.c
rename to ompi/mpi/c/group_size.c
diff --git a/src/mpi/c/group_translate_ranks.c b/ompi/mpi/c/group_translate_ranks.c
similarity index 100%
rename from src/mpi/c/group_translate_ranks.c
rename to ompi/mpi/c/group_translate_ranks.c
diff --git a/src/mpi/c/group_union.c b/ompi/mpi/c/group_union.c
similarity index 100%
rename from src/mpi/c/group_union.c
rename to ompi/mpi/c/group_union.c
diff --git a/src/mpi/c/ibsend.c b/ompi/mpi/c/ibsend.c
similarity index 100%
rename from src/mpi/c/ibsend.c
rename to ompi/mpi/c/ibsend.c
diff --git a/src/mpi/c/info_c2f.c b/ompi/mpi/c/info_c2f.c
similarity index 100%
rename from src/mpi/c/info_c2f.c
rename to ompi/mpi/c/info_c2f.c
diff --git a/src/mpi/c/info_create.c b/ompi/mpi/c/info_create.c
similarity index 100%
rename from src/mpi/c/info_create.c
rename to ompi/mpi/c/info_create.c
diff --git a/src/mpi/c/info_delete.c b/ompi/mpi/c/info_delete.c
similarity index 100%
rename from src/mpi/c/info_delete.c
rename to ompi/mpi/c/info_delete.c
diff --git a/src/mpi/c/info_dup.c b/ompi/mpi/c/info_dup.c
similarity index 100%
rename from src/mpi/c/info_dup.c
rename to ompi/mpi/c/info_dup.c
diff --git a/src/mpi/c/info_f2c.c b/ompi/mpi/c/info_f2c.c
similarity index 100%
rename from src/mpi/c/info_f2c.c
rename to ompi/mpi/c/info_f2c.c
diff --git a/src/mpi/c/info_free.c b/ompi/mpi/c/info_free.c
similarity index 100%
rename from src/mpi/c/info_free.c
rename to ompi/mpi/c/info_free.c
diff --git a/src/mpi/c/info_get.c b/ompi/mpi/c/info_get.c
similarity index 100%
rename from src/mpi/c/info_get.c
rename to ompi/mpi/c/info_get.c
diff --git a/src/mpi/c/info_get_nkeys.c b/ompi/mpi/c/info_get_nkeys.c
similarity index 100%
rename from src/mpi/c/info_get_nkeys.c
rename to ompi/mpi/c/info_get_nkeys.c
diff --git a/src/mpi/c/info_get_nthkey.c b/ompi/mpi/c/info_get_nthkey.c
similarity index 100%
rename from src/mpi/c/info_get_nthkey.c
rename to ompi/mpi/c/info_get_nthkey.c
diff --git a/src/mpi/c/info_get_valuelen.c b/ompi/mpi/c/info_get_valuelen.c
similarity index 100%
rename from src/mpi/c/info_get_valuelen.c
rename to ompi/mpi/c/info_get_valuelen.c
diff --git a/src/mpi/c/info_set.c b/ompi/mpi/c/info_set.c
similarity index 100%
rename from src/mpi/c/info_set.c
rename to ompi/mpi/c/info_set.c
diff --git a/src/mpi/c/init.c b/ompi/mpi/c/init.c
similarity index 100%
rename from src/mpi/c/init.c
rename to ompi/mpi/c/init.c
diff --git a/src/mpi/c/init_thread.c b/ompi/mpi/c/init_thread.c
similarity index 100%
rename from src/mpi/c/init_thread.c
rename to ompi/mpi/c/init_thread.c
diff --git a/src/mpi/c/initialized.c b/ompi/mpi/c/initialized.c
similarity index 100%
rename from src/mpi/c/initialized.c
rename to ompi/mpi/c/initialized.c
diff --git a/src/mpi/c/intercomm_create.c b/ompi/mpi/c/intercomm_create.c
similarity index 100%
rename from src/mpi/c/intercomm_create.c
rename to ompi/mpi/c/intercomm_create.c
diff --git a/src/mpi/c/intercomm_merge.c b/ompi/mpi/c/intercomm_merge.c
similarity index 100%
rename from src/mpi/c/intercomm_merge.c
rename to ompi/mpi/c/intercomm_merge.c
diff --git a/src/mpi/c/iprobe.c b/ompi/mpi/c/iprobe.c
similarity index 100%
rename from src/mpi/c/iprobe.c
rename to ompi/mpi/c/iprobe.c
diff --git a/src/mpi/c/irecv.c b/ompi/mpi/c/irecv.c
similarity index 100%
rename from src/mpi/c/irecv.c
rename to ompi/mpi/c/irecv.c
diff --git a/src/mpi/c/irsend.c b/ompi/mpi/c/irsend.c
similarity index 100%
rename from src/mpi/c/irsend.c
rename to ompi/mpi/c/irsend.c
diff --git a/src/mpi/c/is_thread_main.c b/ompi/mpi/c/is_thread_main.c
similarity index 100%
rename from src/mpi/c/is_thread_main.c
rename to ompi/mpi/c/is_thread_main.c
diff --git a/src/mpi/c/isend.c b/ompi/mpi/c/isend.c
similarity index 100%
rename from src/mpi/c/isend.c
rename to ompi/mpi/c/isend.c
diff --git a/src/mpi/c/issend.c b/ompi/mpi/c/issend.c
similarity index 100%
rename from src/mpi/c/issend.c
rename to ompi/mpi/c/issend.c
diff --git a/src/mpi/c/keyval_create.c b/ompi/mpi/c/keyval_create.c
similarity index 100%
rename from src/mpi/c/keyval_create.c
rename to ompi/mpi/c/keyval_create.c
diff --git a/src/mpi/c/keyval_free.c b/ompi/mpi/c/keyval_free.c
similarity index 100%
rename from src/mpi/c/keyval_free.c
rename to ompi/mpi/c/keyval_free.c
diff --git a/src/mpi/c/lookup_name.c b/ompi/mpi/c/lookup_name.c
similarity index 100%
rename from src/mpi/c/lookup_name.c
rename to ompi/mpi/c/lookup_name.c
diff --git a/src/mpi/c/op_c2f.c b/ompi/mpi/c/op_c2f.c
similarity index 100%
rename from src/mpi/c/op_c2f.c
rename to ompi/mpi/c/op_c2f.c
diff --git a/src/mpi/c/op_create.c b/ompi/mpi/c/op_create.c
similarity index 100%
rename from src/mpi/c/op_create.c
rename to ompi/mpi/c/op_create.c
diff --git a/src/mpi/c/op_f2c.c b/ompi/mpi/c/op_f2c.c
similarity index 100%
rename from src/mpi/c/op_f2c.c
rename to ompi/mpi/c/op_f2c.c
diff --git a/src/mpi/c/op_free.c b/ompi/mpi/c/op_free.c
similarity index 100%
rename from src/mpi/c/op_free.c
rename to ompi/mpi/c/op_free.c
diff --git a/src/mpi/c/open_port.c b/ompi/mpi/c/open_port.c
similarity index 100%
rename from src/mpi/c/open_port.c
rename to ompi/mpi/c/open_port.c
diff --git a/src/mpi/c/pack.c b/ompi/mpi/c/pack.c
similarity index 100%
rename from src/mpi/c/pack.c
rename to ompi/mpi/c/pack.c
diff --git a/src/mpi/c/pack_external.c b/ompi/mpi/c/pack_external.c
similarity index 100%
rename from src/mpi/c/pack_external.c
rename to ompi/mpi/c/pack_external.c
diff --git a/src/mpi/c/pack_external_size.c b/ompi/mpi/c/pack_external_size.c
similarity index 100%
rename from src/mpi/c/pack_external_size.c
rename to ompi/mpi/c/pack_external_size.c
diff --git a/src/mpi/c/pack_size.c b/ompi/mpi/c/pack_size.c
similarity index 100%
rename from src/mpi/c/pack_size.c
rename to ompi/mpi/c/pack_size.c
diff --git a/src/mpi/c/pcontrol.c b/ompi/mpi/c/pcontrol.c
similarity index 100%
rename from src/mpi/c/pcontrol.c
rename to ompi/mpi/c/pcontrol.c
diff --git a/src/mpi/c/probe.c b/ompi/mpi/c/probe.c
similarity index 100%
rename from src/mpi/c/probe.c
rename to ompi/mpi/c/probe.c
diff --git a/src/mpi/c/profile/Makefile.am b/ompi/mpi/c/profile/Makefile.am
similarity index 100%
rename from src/mpi/c/profile/Makefile.am
rename to ompi/mpi/c/profile/Makefile.am
diff --git a/src/mpi/c/profile/defines.h b/ompi/mpi/c/profile/defines.h
similarity index 100%
rename from src/mpi/c/profile/defines.h
rename to ompi/mpi/c/profile/defines.h
diff --git a/src/mpi/c/publish_name.c b/ompi/mpi/c/publish_name.c
similarity index 100%
rename from src/mpi/c/publish_name.c
rename to ompi/mpi/c/publish_name.c
diff --git a/src/mpi/c/put.c b/ompi/mpi/c/put.c
similarity index 100%
rename from src/mpi/c/put.c
rename to ompi/mpi/c/put.c
diff --git a/src/mpi/c/query_thread.c b/ompi/mpi/c/query_thread.c
similarity index 100%
rename from src/mpi/c/query_thread.c
rename to ompi/mpi/c/query_thread.c
diff --git a/src/mpi/c/recv.c b/ompi/mpi/c/recv.c
similarity index 100%
rename from src/mpi/c/recv.c
rename to ompi/mpi/c/recv.c
diff --git a/src/mpi/c/recv_init.c b/ompi/mpi/c/recv_init.c
similarity index 100%
rename from src/mpi/c/recv_init.c
rename to ompi/mpi/c/recv_init.c
diff --git a/src/mpi/c/reduce.c b/ompi/mpi/c/reduce.c
similarity index 100%
rename from src/mpi/c/reduce.c
rename to ompi/mpi/c/reduce.c
diff --git a/src/mpi/c/reduce_scatter.c b/ompi/mpi/c/reduce_scatter.c
similarity index 100%
rename from src/mpi/c/reduce_scatter.c
rename to ompi/mpi/c/reduce_scatter.c
diff --git a/src/mpi/c/register_datarep.c b/ompi/mpi/c/register_datarep.c
similarity index 100%
rename from src/mpi/c/register_datarep.c
rename to ompi/mpi/c/register_datarep.c
diff --git a/src/mpi/c/request_c2f.c b/ompi/mpi/c/request_c2f.c
similarity index 100%
rename from src/mpi/c/request_c2f.c
rename to ompi/mpi/c/request_c2f.c
diff --git a/src/mpi/c/request_f2c.c b/ompi/mpi/c/request_f2c.c
similarity index 100%
rename from src/mpi/c/request_f2c.c
rename to ompi/mpi/c/request_f2c.c
diff --git a/src/mpi/c/request_free.c b/ompi/mpi/c/request_free.c
similarity index 100%
rename from src/mpi/c/request_free.c
rename to ompi/mpi/c/request_free.c
diff --git a/src/mpi/c/request_get_status.c b/ompi/mpi/c/request_get_status.c
similarity index 100%
rename from src/mpi/c/request_get_status.c
rename to ompi/mpi/c/request_get_status.c
diff --git a/src/mpi/c/rsend.c b/ompi/mpi/c/rsend.c
similarity index 100%
rename from src/mpi/c/rsend.c
rename to ompi/mpi/c/rsend.c
diff --git a/src/mpi/c/rsend_init.c b/ompi/mpi/c/rsend_init.c
similarity index 100%
rename from src/mpi/c/rsend_init.c
rename to ompi/mpi/c/rsend_init.c
diff --git a/src/mpi/c/scan.c b/ompi/mpi/c/scan.c
similarity index 100%
rename from src/mpi/c/scan.c
rename to ompi/mpi/c/scan.c
diff --git a/src/mpi/c/scatter.c b/ompi/mpi/c/scatter.c
similarity index 100%
rename from src/mpi/c/scatter.c
rename to ompi/mpi/c/scatter.c
diff --git a/src/mpi/c/scatterv.c b/ompi/mpi/c/scatterv.c
similarity index 100%
rename from src/mpi/c/scatterv.c
rename to ompi/mpi/c/scatterv.c
diff --git a/src/mpi/c/send.c b/ompi/mpi/c/send.c
similarity index 100%
rename from src/mpi/c/send.c
rename to ompi/mpi/c/send.c
diff --git a/src/mpi/c/send_init.c b/ompi/mpi/c/send_init.c
similarity index 100%
rename from src/mpi/c/send_init.c
rename to ompi/mpi/c/send_init.c
diff --git a/src/mpi/c/sendrecv.c b/ompi/mpi/c/sendrecv.c
similarity index 100%
rename from src/mpi/c/sendrecv.c
rename to ompi/mpi/c/sendrecv.c
diff --git a/src/mpi/c/sendrecv_replace.c b/ompi/mpi/c/sendrecv_replace.c
similarity index 100%
rename from src/mpi/c/sendrecv_replace.c
rename to ompi/mpi/c/sendrecv_replace.c
diff --git a/src/mpi/c/ssend.c b/ompi/mpi/c/ssend.c
similarity index 100%
rename from src/mpi/c/ssend.c
rename to ompi/mpi/c/ssend.c
diff --git a/src/mpi/c/ssend_init.c b/ompi/mpi/c/ssend_init.c
similarity index 100%
rename from src/mpi/c/ssend_init.c
rename to ompi/mpi/c/ssend_init.c
diff --git a/src/mpi/c/start.c b/ompi/mpi/c/start.c
similarity index 100%
rename from src/mpi/c/start.c
rename to ompi/mpi/c/start.c
diff --git a/src/mpi/c/startall.c b/ompi/mpi/c/startall.c
similarity index 100%
rename from src/mpi/c/startall.c
rename to ompi/mpi/c/startall.c
diff --git a/src/mpi/c/status_c2f.c b/ompi/mpi/c/status_c2f.c
similarity index 100%
rename from src/mpi/c/status_c2f.c
rename to ompi/mpi/c/status_c2f.c
diff --git a/src/mpi/c/status_f2c.c b/ompi/mpi/c/status_f2c.c
similarity index 100%
rename from src/mpi/c/status_f2c.c
rename to ompi/mpi/c/status_f2c.c
diff --git a/src/mpi/c/status_set_cancelled.c b/ompi/mpi/c/status_set_cancelled.c
similarity index 100%
rename from src/mpi/c/status_set_cancelled.c
rename to ompi/mpi/c/status_set_cancelled.c
diff --git a/src/mpi/c/status_set_elements.c b/ompi/mpi/c/status_set_elements.c
similarity index 100%
rename from src/mpi/c/status_set_elements.c
rename to ompi/mpi/c/status_set_elements.c
diff --git a/src/mpi/c/test.c b/ompi/mpi/c/test.c
similarity index 100%
rename from src/mpi/c/test.c
rename to ompi/mpi/c/test.c
diff --git a/src/mpi/c/test_cancelled.c b/ompi/mpi/c/test_cancelled.c
similarity index 100%
rename from src/mpi/c/test_cancelled.c
rename to ompi/mpi/c/test_cancelled.c
diff --git a/src/mpi/c/testall.c b/ompi/mpi/c/testall.c
similarity index 100%
rename from src/mpi/c/testall.c
rename to ompi/mpi/c/testall.c
diff --git a/src/mpi/c/testany.c b/ompi/mpi/c/testany.c
similarity index 100%
rename from src/mpi/c/testany.c
rename to ompi/mpi/c/testany.c
diff --git a/src/mpi/c/testsome.c b/ompi/mpi/c/testsome.c
similarity index 100%
rename from src/mpi/c/testsome.c
rename to ompi/mpi/c/testsome.c
diff --git a/src/mpi/c/topo_test.c b/ompi/mpi/c/topo_test.c
similarity index 100%
rename from src/mpi/c/topo_test.c
rename to ompi/mpi/c/topo_test.c
diff --git a/src/mpi/c/type_c2f.c b/ompi/mpi/c/type_c2f.c
similarity index 100%
rename from src/mpi/c/type_c2f.c
rename to ompi/mpi/c/type_c2f.c
diff --git a/src/mpi/c/type_commit.c b/ompi/mpi/c/type_commit.c
similarity index 100%
rename from src/mpi/c/type_commit.c
rename to ompi/mpi/c/type_commit.c
diff --git a/src/mpi/c/type_contiguous.c b/ompi/mpi/c/type_contiguous.c
similarity index 100%
rename from src/mpi/c/type_contiguous.c
rename to ompi/mpi/c/type_contiguous.c
diff --git a/src/mpi/c/type_create_darray.c b/ompi/mpi/c/type_create_darray.c
similarity index 100%
rename from src/mpi/c/type_create_darray.c
rename to ompi/mpi/c/type_create_darray.c
diff --git a/src/mpi/c/type_create_f90_complex.c b/ompi/mpi/c/type_create_f90_complex.c
similarity index 100%
rename from src/mpi/c/type_create_f90_complex.c
rename to ompi/mpi/c/type_create_f90_complex.c
diff --git a/src/mpi/c/type_create_f90_integer.c b/ompi/mpi/c/type_create_f90_integer.c
similarity index 100%
rename from src/mpi/c/type_create_f90_integer.c
rename to ompi/mpi/c/type_create_f90_integer.c
diff --git a/src/mpi/c/type_create_f90_real.c b/ompi/mpi/c/type_create_f90_real.c
similarity index 100%
rename from src/mpi/c/type_create_f90_real.c
rename to ompi/mpi/c/type_create_f90_real.c
diff --git a/src/mpi/c/type_create_hindexed.c b/ompi/mpi/c/type_create_hindexed.c
similarity index 100%
rename from src/mpi/c/type_create_hindexed.c
rename to ompi/mpi/c/type_create_hindexed.c
diff --git a/src/mpi/c/type_create_hvector.c b/ompi/mpi/c/type_create_hvector.c
similarity index 100%
rename from src/mpi/c/type_create_hvector.c
rename to ompi/mpi/c/type_create_hvector.c
diff --git a/src/mpi/c/type_create_indexed_block.c b/ompi/mpi/c/type_create_indexed_block.c
similarity index 100%
rename from src/mpi/c/type_create_indexed_block.c
rename to ompi/mpi/c/type_create_indexed_block.c
diff --git a/src/mpi/c/type_create_keyval.c b/ompi/mpi/c/type_create_keyval.c
similarity index 100%
rename from src/mpi/c/type_create_keyval.c
rename to ompi/mpi/c/type_create_keyval.c
diff --git a/src/mpi/c/type_create_resized.c b/ompi/mpi/c/type_create_resized.c
similarity index 100%
rename from src/mpi/c/type_create_resized.c
rename to ompi/mpi/c/type_create_resized.c
diff --git a/src/mpi/c/type_create_struct.c b/ompi/mpi/c/type_create_struct.c
similarity index 100%
rename from src/mpi/c/type_create_struct.c
rename to ompi/mpi/c/type_create_struct.c
diff --git a/src/mpi/c/type_create_subarray.c b/ompi/mpi/c/type_create_subarray.c
similarity index 100%
rename from src/mpi/c/type_create_subarray.c
rename to ompi/mpi/c/type_create_subarray.c
diff --git a/src/mpi/c/type_delete_attr.c b/ompi/mpi/c/type_delete_attr.c
similarity index 100%
rename from src/mpi/c/type_delete_attr.c
rename to ompi/mpi/c/type_delete_attr.c
diff --git a/src/mpi/c/type_dup.c b/ompi/mpi/c/type_dup.c
similarity index 100%
rename from src/mpi/c/type_dup.c
rename to ompi/mpi/c/type_dup.c
diff --git a/src/mpi/c/type_extent.c b/ompi/mpi/c/type_extent.c
similarity index 100%
rename from src/mpi/c/type_extent.c
rename to ompi/mpi/c/type_extent.c
diff --git a/src/mpi/c/type_f2c.c b/ompi/mpi/c/type_f2c.c
similarity index 100%
rename from src/mpi/c/type_f2c.c
rename to ompi/mpi/c/type_f2c.c
diff --git a/src/mpi/c/type_free.c b/ompi/mpi/c/type_free.c
similarity index 100%
rename from src/mpi/c/type_free.c
rename to ompi/mpi/c/type_free.c
diff --git a/src/mpi/c/type_free_keyval.c b/ompi/mpi/c/type_free_keyval.c
similarity index 100%
rename from src/mpi/c/type_free_keyval.c
rename to ompi/mpi/c/type_free_keyval.c
diff --git a/src/mpi/c/type_get_attr.c b/ompi/mpi/c/type_get_attr.c
similarity index 100%
rename from src/mpi/c/type_get_attr.c
rename to ompi/mpi/c/type_get_attr.c
diff --git a/src/mpi/c/type_get_contents.c b/ompi/mpi/c/type_get_contents.c
similarity index 100%
rename from src/mpi/c/type_get_contents.c
rename to ompi/mpi/c/type_get_contents.c
diff --git a/src/mpi/c/type_get_envelope.c b/ompi/mpi/c/type_get_envelope.c
similarity index 100%
rename from src/mpi/c/type_get_envelope.c
rename to ompi/mpi/c/type_get_envelope.c
diff --git a/src/mpi/c/type_get_extent.c b/ompi/mpi/c/type_get_extent.c
similarity index 100%
rename from src/mpi/c/type_get_extent.c
rename to ompi/mpi/c/type_get_extent.c
diff --git a/src/mpi/c/type_get_name.c b/ompi/mpi/c/type_get_name.c
similarity index 100%
rename from src/mpi/c/type_get_name.c
rename to ompi/mpi/c/type_get_name.c
diff --git a/src/mpi/c/type_get_true_extent.c b/ompi/mpi/c/type_get_true_extent.c
similarity index 100%
rename from src/mpi/c/type_get_true_extent.c
rename to ompi/mpi/c/type_get_true_extent.c
diff --git a/src/mpi/c/type_hindexed.c b/ompi/mpi/c/type_hindexed.c
similarity index 100%
rename from src/mpi/c/type_hindexed.c
rename to ompi/mpi/c/type_hindexed.c
diff --git a/src/mpi/c/type_hvector.c b/ompi/mpi/c/type_hvector.c
similarity index 100%
rename from src/mpi/c/type_hvector.c
rename to ompi/mpi/c/type_hvector.c
diff --git a/src/mpi/c/type_indexed.c b/ompi/mpi/c/type_indexed.c
similarity index 100%
rename from src/mpi/c/type_indexed.c
rename to ompi/mpi/c/type_indexed.c
diff --git a/src/mpi/c/type_lb.c b/ompi/mpi/c/type_lb.c
similarity index 100%
rename from src/mpi/c/type_lb.c
rename to ompi/mpi/c/type_lb.c
diff --git a/src/mpi/c/type_match_size.c b/ompi/mpi/c/type_match_size.c
similarity index 100%
rename from src/mpi/c/type_match_size.c
rename to ompi/mpi/c/type_match_size.c
diff --git a/src/mpi/c/type_set_attr.c b/ompi/mpi/c/type_set_attr.c
similarity index 100%
rename from src/mpi/c/type_set_attr.c
rename to ompi/mpi/c/type_set_attr.c
diff --git a/src/mpi/c/type_set_name.c b/ompi/mpi/c/type_set_name.c
similarity index 100%
rename from src/mpi/c/type_set_name.c
rename to ompi/mpi/c/type_set_name.c
diff --git a/src/mpi/c/type_size.c b/ompi/mpi/c/type_size.c
similarity index 100%
rename from src/mpi/c/type_size.c
rename to ompi/mpi/c/type_size.c
diff --git a/src/mpi/c/type_struct.c b/ompi/mpi/c/type_struct.c
similarity index 100%
rename from src/mpi/c/type_struct.c
rename to ompi/mpi/c/type_struct.c
diff --git a/src/mpi/c/type_ub.c b/ompi/mpi/c/type_ub.c
similarity index 100%
rename from src/mpi/c/type_ub.c
rename to ompi/mpi/c/type_ub.c
diff --git a/src/mpi/c/type_vector.c b/ompi/mpi/c/type_vector.c
similarity index 100%
rename from src/mpi/c/type_vector.c
rename to ompi/mpi/c/type_vector.c
diff --git a/src/mpi/c/unpack.c b/ompi/mpi/c/unpack.c
similarity index 100%
rename from src/mpi/c/unpack.c
rename to ompi/mpi/c/unpack.c
diff --git a/src/mpi/c/unpack_external.c b/ompi/mpi/c/unpack_external.c
similarity index 100%
rename from src/mpi/c/unpack_external.c
rename to ompi/mpi/c/unpack_external.c
diff --git a/src/mpi/c/unpublish_name.c b/ompi/mpi/c/unpublish_name.c
similarity index 100%
rename from src/mpi/c/unpublish_name.c
rename to ompi/mpi/c/unpublish_name.c
diff --git a/src/mpi/c/wait.c b/ompi/mpi/c/wait.c
similarity index 100%
rename from src/mpi/c/wait.c
rename to ompi/mpi/c/wait.c
diff --git a/src/mpi/c/waitall.c b/ompi/mpi/c/waitall.c
similarity index 100%
rename from src/mpi/c/waitall.c
rename to ompi/mpi/c/waitall.c
diff --git a/src/mpi/c/waitany.c b/ompi/mpi/c/waitany.c
similarity index 100%
rename from src/mpi/c/waitany.c
rename to ompi/mpi/c/waitany.c
diff --git a/src/mpi/c/waitsome.c b/ompi/mpi/c/waitsome.c
similarity index 100%
rename from src/mpi/c/waitsome.c
rename to ompi/mpi/c/waitsome.c
diff --git a/src/mpi/c/win_c2f.c b/ompi/mpi/c/win_c2f.c
similarity index 100%
rename from src/mpi/c/win_c2f.c
rename to ompi/mpi/c/win_c2f.c
diff --git a/src/mpi/c/win_call_errhandler.c b/ompi/mpi/c/win_call_errhandler.c
similarity index 100%
rename from src/mpi/c/win_call_errhandler.c
rename to ompi/mpi/c/win_call_errhandler.c
diff --git a/src/mpi/c/win_complete.c b/ompi/mpi/c/win_complete.c
similarity index 100%
rename from src/mpi/c/win_complete.c
rename to ompi/mpi/c/win_complete.c
diff --git a/src/mpi/c/win_create.c b/ompi/mpi/c/win_create.c
similarity index 100%
rename from src/mpi/c/win_create.c
rename to ompi/mpi/c/win_create.c
diff --git a/src/mpi/c/win_create_errhandler.c b/ompi/mpi/c/win_create_errhandler.c
similarity index 100%
rename from src/mpi/c/win_create_errhandler.c
rename to ompi/mpi/c/win_create_errhandler.c
diff --git a/src/mpi/c/win_create_keyval.c b/ompi/mpi/c/win_create_keyval.c
similarity index 100%
rename from src/mpi/c/win_create_keyval.c
rename to ompi/mpi/c/win_create_keyval.c
diff --git a/src/mpi/c/win_delete_attr.c b/ompi/mpi/c/win_delete_attr.c
similarity index 100%
rename from src/mpi/c/win_delete_attr.c
rename to ompi/mpi/c/win_delete_attr.c
diff --git a/src/mpi/c/win_f2c.c b/ompi/mpi/c/win_f2c.c
similarity index 100%
rename from src/mpi/c/win_f2c.c
rename to ompi/mpi/c/win_f2c.c
diff --git a/src/mpi/c/win_fence.c b/ompi/mpi/c/win_fence.c
similarity index 100%
rename from src/mpi/c/win_fence.c
rename to ompi/mpi/c/win_fence.c
diff --git a/src/mpi/c/win_free.c b/ompi/mpi/c/win_free.c
similarity index 100%
rename from src/mpi/c/win_free.c
rename to ompi/mpi/c/win_free.c
diff --git a/src/mpi/c/win_free_keyval.c b/ompi/mpi/c/win_free_keyval.c
similarity index 100%
rename from src/mpi/c/win_free_keyval.c
rename to ompi/mpi/c/win_free_keyval.c
diff --git a/src/mpi/c/win_get_attr.c b/ompi/mpi/c/win_get_attr.c
similarity index 100%
rename from src/mpi/c/win_get_attr.c
rename to ompi/mpi/c/win_get_attr.c
diff --git a/src/mpi/c/win_get_errhandler.c b/ompi/mpi/c/win_get_errhandler.c
similarity index 100%
rename from src/mpi/c/win_get_errhandler.c
rename to ompi/mpi/c/win_get_errhandler.c
diff --git a/src/mpi/c/win_get_group.c b/ompi/mpi/c/win_get_group.c
similarity index 100%
rename from src/mpi/c/win_get_group.c
rename to ompi/mpi/c/win_get_group.c
diff --git a/src/mpi/c/win_get_name.c b/ompi/mpi/c/win_get_name.c
similarity index 100%
rename from src/mpi/c/win_get_name.c
rename to ompi/mpi/c/win_get_name.c
diff --git a/src/mpi/c/win_lock.c b/ompi/mpi/c/win_lock.c
similarity index 100%
rename from src/mpi/c/win_lock.c
rename to ompi/mpi/c/win_lock.c
diff --git a/src/mpi/c/win_post.c b/ompi/mpi/c/win_post.c
similarity index 100%
rename from src/mpi/c/win_post.c
rename to ompi/mpi/c/win_post.c
diff --git a/src/mpi/c/win_set_attr.c b/ompi/mpi/c/win_set_attr.c
similarity index 100%
rename from src/mpi/c/win_set_attr.c
rename to ompi/mpi/c/win_set_attr.c
diff --git a/src/mpi/c/win_set_errhandler.c b/ompi/mpi/c/win_set_errhandler.c
similarity index 100%
rename from src/mpi/c/win_set_errhandler.c
rename to ompi/mpi/c/win_set_errhandler.c
diff --git a/src/mpi/c/win_set_name.c b/ompi/mpi/c/win_set_name.c
similarity index 100%
rename from src/mpi/c/win_set_name.c
rename to ompi/mpi/c/win_set_name.c
diff --git a/src/mpi/c/win_start.c b/ompi/mpi/c/win_start.c
similarity index 100%
rename from src/mpi/c/win_start.c
rename to ompi/mpi/c/win_start.c
diff --git a/src/mpi/c/win_test.c b/ompi/mpi/c/win_test.c
similarity index 100%
rename from src/mpi/c/win_test.c
rename to ompi/mpi/c/win_test.c
diff --git a/src/mpi/c/win_unlock.c b/ompi/mpi/c/win_unlock.c
similarity index 100%
rename from src/mpi/c/win_unlock.c
rename to ompi/mpi/c/win_unlock.c
diff --git a/src/mpi/c/win_wait.c b/ompi/mpi/c/win_wait.c
similarity index 100%
rename from src/mpi/c/win_wait.c
rename to ompi/mpi/c/win_wait.c
diff --git a/src/mpi/cxx/Makefile.am b/ompi/mpi/cxx/Makefile.am
similarity index 100%
rename from src/mpi/cxx/Makefile.am
rename to ompi/mpi/cxx/Makefile.am
diff --git a/src/mpi/cxx/comm.cc b/ompi/mpi/cxx/comm.cc
similarity index 100%
rename from src/mpi/cxx/comm.cc
rename to ompi/mpi/cxx/comm.cc
diff --git a/src/mpi/cxx/comm.h b/ompi/mpi/cxx/comm.h
similarity index 100%
rename from src/mpi/cxx/comm.h
rename to ompi/mpi/cxx/comm.h
diff --git a/src/mpi/cxx/comm_inln.h b/ompi/mpi/cxx/comm_inln.h
similarity index 100%
rename from src/mpi/cxx/comm_inln.h
rename to ompi/mpi/cxx/comm_inln.h
diff --git a/src/mpi/cxx/constants.h b/ompi/mpi/cxx/constants.h
similarity index 100%
rename from src/mpi/cxx/constants.h
rename to ompi/mpi/cxx/constants.h
diff --git a/src/mpi/cxx/datatype.h b/ompi/mpi/cxx/datatype.h
similarity index 100%
rename from src/mpi/cxx/datatype.h
rename to ompi/mpi/cxx/datatype.h
diff --git a/src/mpi/cxx/datatype_inln.h b/ompi/mpi/cxx/datatype_inln.h
similarity index 100%
rename from src/mpi/cxx/datatype_inln.h
rename to ompi/mpi/cxx/datatype_inln.h
diff --git a/src/mpi/cxx/errhandler.h b/ompi/mpi/cxx/errhandler.h
similarity index 100%
rename from src/mpi/cxx/errhandler.h
rename to ompi/mpi/cxx/errhandler.h
diff --git a/src/mpi/cxx/errhandler_inln.h b/ompi/mpi/cxx/errhandler_inln.h
similarity index 100%
rename from src/mpi/cxx/errhandler_inln.h
rename to ompi/mpi/cxx/errhandler_inln.h
diff --git a/src/mpi/cxx/exception.h b/ompi/mpi/cxx/exception.h
similarity index 100%
rename from src/mpi/cxx/exception.h
rename to ompi/mpi/cxx/exception.h
diff --git a/src/mpi/cxx/file.h b/ompi/mpi/cxx/file.h
similarity index 100%
rename from src/mpi/cxx/file.h
rename to ompi/mpi/cxx/file.h
diff --git a/src/mpi/cxx/file_inln.h b/ompi/mpi/cxx/file_inln.h
similarity index 100%
rename from src/mpi/cxx/file_inln.h
rename to ompi/mpi/cxx/file_inln.h
diff --git a/src/mpi/cxx/functions.h b/ompi/mpi/cxx/functions.h
similarity index 100%
rename from src/mpi/cxx/functions.h
rename to ompi/mpi/cxx/functions.h
diff --git a/src/mpi/cxx/functions_inln.h b/ompi/mpi/cxx/functions_inln.h
similarity index 100%
rename from src/mpi/cxx/functions_inln.h
rename to ompi/mpi/cxx/functions_inln.h
diff --git a/src/mpi/cxx/group.h b/ompi/mpi/cxx/group.h
similarity index 100%
rename from src/mpi/cxx/group.h
rename to ompi/mpi/cxx/group.h
diff --git a/src/mpi/cxx/group_inln.h b/ompi/mpi/cxx/group_inln.h
similarity index 100%
rename from src/mpi/cxx/group_inln.h
rename to ompi/mpi/cxx/group_inln.h
diff --git a/src/mpi/cxx/info.h b/ompi/mpi/cxx/info.h
similarity index 100%
rename from src/mpi/cxx/info.h
rename to ompi/mpi/cxx/info.h
diff --git a/src/mpi/cxx/info_inln.h b/ompi/mpi/cxx/info_inln.h
similarity index 100%
rename from src/mpi/cxx/info_inln.h
rename to ompi/mpi/cxx/info_inln.h
diff --git a/src/mpi/cxx/intercepts.cc b/ompi/mpi/cxx/intercepts.cc
similarity index 100%
rename from src/mpi/cxx/intercepts.cc
rename to ompi/mpi/cxx/intercepts.cc
diff --git a/src/mpi/cxx/intercomm.h b/ompi/mpi/cxx/intercomm.h
similarity index 100%
rename from src/mpi/cxx/intercomm.h
rename to ompi/mpi/cxx/intercomm.h
diff --git a/src/mpi/cxx/intercomm_inln.h b/ompi/mpi/cxx/intercomm_inln.h
similarity index 100%
rename from src/mpi/cxx/intercomm_inln.h
rename to ompi/mpi/cxx/intercomm_inln.h
diff --git a/src/mpi/cxx/intracomm.h b/ompi/mpi/cxx/intracomm.h
similarity index 100%
rename from src/mpi/cxx/intracomm.h
rename to ompi/mpi/cxx/intracomm.h
diff --git a/src/mpi/cxx/intracomm_inln.h b/ompi/mpi/cxx/intracomm_inln.h
similarity index 100%
rename from src/mpi/cxx/intracomm_inln.h
rename to ompi/mpi/cxx/intracomm_inln.h
diff --git a/src/mpi/cxx/mpicxx.cc b/ompi/mpi/cxx/mpicxx.cc
similarity index 100%
rename from src/mpi/cxx/mpicxx.cc
rename to ompi/mpi/cxx/mpicxx.cc
diff --git a/src/mpi/cxx/mpicxx.h b/ompi/mpi/cxx/mpicxx.h
similarity index 100%
rename from src/mpi/cxx/mpicxx.h
rename to ompi/mpi/cxx/mpicxx.h
diff --git a/src/mpi/cxx/op.h b/ompi/mpi/cxx/op.h
similarity index 100%
rename from src/mpi/cxx/op.h
rename to ompi/mpi/cxx/op.h
diff --git a/src/mpi/cxx/op_inln.h b/ompi/mpi/cxx/op_inln.h
similarity index 100%
rename from src/mpi/cxx/op_inln.h
rename to ompi/mpi/cxx/op_inln.h
diff --git a/src/mpi/cxx/request.h b/ompi/mpi/cxx/request.h
similarity index 100%
rename from src/mpi/cxx/request.h
rename to ompi/mpi/cxx/request.h
diff --git a/src/mpi/cxx/request_inln.h b/ompi/mpi/cxx/request_inln.h
similarity index 100%
rename from src/mpi/cxx/request_inln.h
rename to ompi/mpi/cxx/request_inln.h
diff --git a/src/mpi/cxx/status.h b/ompi/mpi/cxx/status.h
similarity index 100%
rename from src/mpi/cxx/status.h
rename to ompi/mpi/cxx/status.h
diff --git a/src/mpi/cxx/status_inln.h b/ompi/mpi/cxx/status_inln.h
similarity index 100%
rename from src/mpi/cxx/status_inln.h
rename to ompi/mpi/cxx/status_inln.h
diff --git a/src/mpi/cxx/topology.h b/ompi/mpi/cxx/topology.h
similarity index 100%
rename from src/mpi/cxx/topology.h
rename to ompi/mpi/cxx/topology.h
diff --git a/src/mpi/cxx/topology_inln.h b/ompi/mpi/cxx/topology_inln.h
similarity index 100%
rename from src/mpi/cxx/topology_inln.h
rename to ompi/mpi/cxx/topology_inln.h
diff --git a/src/mpi/cxx/win.h b/ompi/mpi/cxx/win.h
similarity index 100%
rename from src/mpi/cxx/win.h
rename to ompi/mpi/cxx/win.h
diff --git a/src/mpi/cxx/win_inln.h b/ompi/mpi/cxx/win_inln.h
similarity index 100%
rename from src/mpi/cxx/win_inln.h
rename to ompi/mpi/cxx/win_inln.h
diff --git a/src/mpi/f77/.f77.pl b/ompi/mpi/f77/.f77.pl
similarity index 100%
rename from src/mpi/f77/.f77.pl
rename to ompi/mpi/f77/.f77.pl
diff --git a/src/mpi/f77/Makefile.am b/ompi/mpi/f77/Makefile.am
similarity index 100%
rename from src/mpi/f77/Makefile.am
rename to ompi/mpi/f77/Makefile.am
diff --git a/src/mpi/f77/abort_f.c b/ompi/mpi/f77/abort_f.c
similarity index 100%
rename from src/mpi/f77/abort_f.c
rename to ompi/mpi/f77/abort_f.c
diff --git a/src/mpi/f77/accumulate_f.c b/ompi/mpi/f77/accumulate_f.c
similarity index 100%
rename from src/mpi/f77/accumulate_f.c
rename to ompi/mpi/f77/accumulate_f.c
diff --git a/src/mpi/f77/add_error_class_f.c b/ompi/mpi/f77/add_error_class_f.c
similarity index 100%
rename from src/mpi/f77/add_error_class_f.c
rename to ompi/mpi/f77/add_error_class_f.c
diff --git a/src/mpi/f77/add_error_code_f.c b/ompi/mpi/f77/add_error_code_f.c
similarity index 100%
rename from src/mpi/f77/add_error_code_f.c
rename to ompi/mpi/f77/add_error_code_f.c
diff --git a/src/mpi/f77/add_error_string_f.c b/ompi/mpi/f77/add_error_string_f.c
similarity index 100%
rename from src/mpi/f77/add_error_string_f.c
rename to ompi/mpi/f77/add_error_string_f.c
diff --git a/src/mpi/f77/address_f.c b/ompi/mpi/f77/address_f.c
similarity index 100%
rename from src/mpi/f77/address_f.c
rename to ompi/mpi/f77/address_f.c
diff --git a/src/mpi/f77/allgather_f.c b/ompi/mpi/f77/allgather_f.c
similarity index 100%
rename from src/mpi/f77/allgather_f.c
rename to ompi/mpi/f77/allgather_f.c
diff --git a/src/mpi/f77/allgatherv_f.c b/ompi/mpi/f77/allgatherv_f.c
similarity index 100%
rename from src/mpi/f77/allgatherv_f.c
rename to ompi/mpi/f77/allgatherv_f.c
diff --git a/src/mpi/f77/alloc_mem_f.c b/ompi/mpi/f77/alloc_mem_f.c
similarity index 100%
rename from src/mpi/f77/alloc_mem_f.c
rename to ompi/mpi/f77/alloc_mem_f.c
diff --git a/src/mpi/f77/allreduce_f.c b/ompi/mpi/f77/allreduce_f.c
similarity index 100%
rename from src/mpi/f77/allreduce_f.c
rename to ompi/mpi/f77/allreduce_f.c
diff --git a/src/mpi/f77/alltoall_f.c b/ompi/mpi/f77/alltoall_f.c
similarity index 100%
rename from src/mpi/f77/alltoall_f.c
rename to ompi/mpi/f77/alltoall_f.c
diff --git a/src/mpi/f77/alltoallv_f.c b/ompi/mpi/f77/alltoallv_f.c
similarity index 100%
rename from src/mpi/f77/alltoallv_f.c
rename to ompi/mpi/f77/alltoallv_f.c
diff --git a/src/mpi/f77/alltoallw_f.c b/ompi/mpi/f77/alltoallw_f.c
similarity index 100%
rename from src/mpi/f77/alltoallw_f.c
rename to ompi/mpi/f77/alltoallw_f.c
diff --git a/src/mpi/f77/attr_delete_f.c b/ompi/mpi/f77/attr_delete_f.c
similarity index 100%
rename from src/mpi/f77/attr_delete_f.c
rename to ompi/mpi/f77/attr_delete_f.c
diff --git a/src/mpi/f77/attr_fn_f.c b/ompi/mpi/f77/attr_fn_f.c
similarity index 100%
rename from src/mpi/f77/attr_fn_f.c
rename to ompi/mpi/f77/attr_fn_f.c
diff --git a/src/mpi/f77/attr_get_f.c b/ompi/mpi/f77/attr_get_f.c
similarity index 100%
rename from src/mpi/f77/attr_get_f.c
rename to ompi/mpi/f77/attr_get_f.c
diff --git a/src/mpi/f77/attr_put_f.c b/ompi/mpi/f77/attr_put_f.c
similarity index 100%
rename from src/mpi/f77/attr_put_f.c
rename to ompi/mpi/f77/attr_put_f.c
diff --git a/src/mpi/f77/barrier_f.c b/ompi/mpi/f77/barrier_f.c
similarity index 100%
rename from src/mpi/f77/barrier_f.c
rename to ompi/mpi/f77/barrier_f.c
diff --git a/src/mpi/f77/bcast_f.c b/ompi/mpi/f77/bcast_f.c
similarity index 100%
rename from src/mpi/f77/bcast_f.c
rename to ompi/mpi/f77/bcast_f.c
diff --git a/src/mpi/f77/bindings.h b/ompi/mpi/f77/bindings.h
similarity index 100%
rename from src/mpi/f77/bindings.h
rename to ompi/mpi/f77/bindings.h
diff --git a/src/mpi/f77/bsend_f.c b/ompi/mpi/f77/bsend_f.c
similarity index 100%
rename from src/mpi/f77/bsend_f.c
rename to ompi/mpi/f77/bsend_f.c
diff --git a/src/mpi/f77/bsend_init_f.c b/ompi/mpi/f77/bsend_init_f.c
similarity index 100%
rename from src/mpi/f77/bsend_init_f.c
rename to ompi/mpi/f77/bsend_init_f.c
diff --git a/src/mpi/f77/buffer_attach_f.c b/ompi/mpi/f77/buffer_attach_f.c
similarity index 100%
rename from src/mpi/f77/buffer_attach_f.c
rename to ompi/mpi/f77/buffer_attach_f.c
diff --git a/src/mpi/f77/buffer_detach_f.c b/ompi/mpi/f77/buffer_detach_f.c
similarity index 100%
rename from src/mpi/f77/buffer_detach_f.c
rename to ompi/mpi/f77/buffer_detach_f.c
diff --git a/src/mpi/f77/cancel_f.c b/ompi/mpi/f77/cancel_f.c
similarity index 100%
rename from src/mpi/f77/cancel_f.c
rename to ompi/mpi/f77/cancel_f.c
diff --git a/src/mpi/f77/cart_coords_f.c b/ompi/mpi/f77/cart_coords_f.c
similarity index 100%
rename from src/mpi/f77/cart_coords_f.c
rename to ompi/mpi/f77/cart_coords_f.c
diff --git a/src/mpi/f77/cart_create_f.c b/ompi/mpi/f77/cart_create_f.c
similarity index 100%
rename from src/mpi/f77/cart_create_f.c
rename to ompi/mpi/f77/cart_create_f.c
diff --git a/src/mpi/f77/cart_get_f.c b/ompi/mpi/f77/cart_get_f.c
similarity index 100%
rename from src/mpi/f77/cart_get_f.c
rename to ompi/mpi/f77/cart_get_f.c
diff --git a/src/mpi/f77/cart_map_f.c b/ompi/mpi/f77/cart_map_f.c
similarity index 100%
rename from src/mpi/f77/cart_map_f.c
rename to ompi/mpi/f77/cart_map_f.c
diff --git a/src/mpi/f77/cart_rank_f.c b/ompi/mpi/f77/cart_rank_f.c
similarity index 100%
rename from src/mpi/f77/cart_rank_f.c
rename to ompi/mpi/f77/cart_rank_f.c
diff --git a/src/mpi/f77/cart_shift_f.c b/ompi/mpi/f77/cart_shift_f.c
similarity index 100%
rename from src/mpi/f77/cart_shift_f.c
rename to ompi/mpi/f77/cart_shift_f.c
diff --git a/src/mpi/f77/cart_sub_f.c b/ompi/mpi/f77/cart_sub_f.c
similarity index 100%
rename from src/mpi/f77/cart_sub_f.c
rename to ompi/mpi/f77/cart_sub_f.c
diff --git a/src/mpi/f77/cartdim_get_f.c b/ompi/mpi/f77/cartdim_get_f.c
similarity index 100%
rename from src/mpi/f77/cartdim_get_f.c
rename to ompi/mpi/f77/cartdim_get_f.c
diff --git a/src/mpi/f77/close_port_f.c b/ompi/mpi/f77/close_port_f.c
similarity index 100%
rename from src/mpi/f77/close_port_f.c
rename to ompi/mpi/f77/close_port_f.c
diff --git a/src/mpi/f77/comm_accept_f.c b/ompi/mpi/f77/comm_accept_f.c
similarity index 100%
rename from src/mpi/f77/comm_accept_f.c
rename to ompi/mpi/f77/comm_accept_f.c
diff --git a/src/mpi/f77/comm_call_errhandler_f.c b/ompi/mpi/f77/comm_call_errhandler_f.c
similarity index 100%
rename from src/mpi/f77/comm_call_errhandler_f.c
rename to ompi/mpi/f77/comm_call_errhandler_f.c
diff --git a/src/mpi/f77/comm_compare_f.c b/ompi/mpi/f77/comm_compare_f.c
similarity index 100%
rename from src/mpi/f77/comm_compare_f.c
rename to ompi/mpi/f77/comm_compare_f.c
diff --git a/src/mpi/f77/comm_connect_f.c b/ompi/mpi/f77/comm_connect_f.c
similarity index 100%
rename from src/mpi/f77/comm_connect_f.c
rename to ompi/mpi/f77/comm_connect_f.c
diff --git a/src/mpi/f77/comm_create_errhandler_f.c b/ompi/mpi/f77/comm_create_errhandler_f.c
similarity index 100%
rename from src/mpi/f77/comm_create_errhandler_f.c
rename to ompi/mpi/f77/comm_create_errhandler_f.c
diff --git a/src/mpi/f77/comm_create_f.c b/ompi/mpi/f77/comm_create_f.c
similarity index 100%
rename from src/mpi/f77/comm_create_f.c
rename to ompi/mpi/f77/comm_create_f.c
diff --git a/src/mpi/f77/comm_create_keyval_f.c b/ompi/mpi/f77/comm_create_keyval_f.c
similarity index 100%
rename from src/mpi/f77/comm_create_keyval_f.c
rename to ompi/mpi/f77/comm_create_keyval_f.c
diff --git a/src/mpi/f77/comm_delete_attr_f.c b/ompi/mpi/f77/comm_delete_attr_f.c
similarity index 100%
rename from src/mpi/f77/comm_delete_attr_f.c
rename to ompi/mpi/f77/comm_delete_attr_f.c
diff --git a/src/mpi/f77/comm_disconnect_f.c b/ompi/mpi/f77/comm_disconnect_f.c
similarity index 100%
rename from src/mpi/f77/comm_disconnect_f.c
rename to ompi/mpi/f77/comm_disconnect_f.c
diff --git a/src/mpi/f77/comm_dup_f.c b/ompi/mpi/f77/comm_dup_f.c
similarity index 100%
rename from src/mpi/f77/comm_dup_f.c
rename to ompi/mpi/f77/comm_dup_f.c
diff --git a/src/mpi/f77/comm_free_f.c b/ompi/mpi/f77/comm_free_f.c
similarity index 100%
rename from src/mpi/f77/comm_free_f.c
rename to ompi/mpi/f77/comm_free_f.c
diff --git a/src/mpi/f77/comm_free_keyval_f.c b/ompi/mpi/f77/comm_free_keyval_f.c
similarity index 100%
rename from src/mpi/f77/comm_free_keyval_f.c
rename to ompi/mpi/f77/comm_free_keyval_f.c
diff --git a/src/mpi/f77/comm_get_attr_f.c b/ompi/mpi/f77/comm_get_attr_f.c
similarity index 100%
rename from src/mpi/f77/comm_get_attr_f.c
rename to ompi/mpi/f77/comm_get_attr_f.c
diff --git a/src/mpi/f77/comm_get_errhandler_f.c b/ompi/mpi/f77/comm_get_errhandler_f.c
similarity index 100%
rename from src/mpi/f77/comm_get_errhandler_f.c
rename to ompi/mpi/f77/comm_get_errhandler_f.c
diff --git a/src/mpi/f77/comm_get_name_f.c b/ompi/mpi/f77/comm_get_name_f.c
similarity index 100%
rename from src/mpi/f77/comm_get_name_f.c
rename to ompi/mpi/f77/comm_get_name_f.c
diff --git a/src/mpi/f77/comm_get_parent_f.c b/ompi/mpi/f77/comm_get_parent_f.c
similarity index 100%
rename from src/mpi/f77/comm_get_parent_f.c
rename to ompi/mpi/f77/comm_get_parent_f.c
diff --git a/src/mpi/f77/comm_group_f.c b/ompi/mpi/f77/comm_group_f.c
similarity index 100%
rename from src/mpi/f77/comm_group_f.c
rename to ompi/mpi/f77/comm_group_f.c
diff --git a/src/mpi/f77/comm_join_f.c b/ompi/mpi/f77/comm_join_f.c
similarity index 100%
rename from src/mpi/f77/comm_join_f.c
rename to ompi/mpi/f77/comm_join_f.c
diff --git a/src/mpi/f77/comm_rank_f.c b/ompi/mpi/f77/comm_rank_f.c
similarity index 100%
rename from src/mpi/f77/comm_rank_f.c
rename to ompi/mpi/f77/comm_rank_f.c
diff --git a/src/mpi/f77/comm_remote_group_f.c b/ompi/mpi/f77/comm_remote_group_f.c
similarity index 100%
rename from src/mpi/f77/comm_remote_group_f.c
rename to ompi/mpi/f77/comm_remote_group_f.c
diff --git a/src/mpi/f77/comm_remote_size_f.c b/ompi/mpi/f77/comm_remote_size_f.c
similarity index 100%
rename from src/mpi/f77/comm_remote_size_f.c
rename to ompi/mpi/f77/comm_remote_size_f.c
diff --git a/src/mpi/f77/comm_set_attr_f.c b/ompi/mpi/f77/comm_set_attr_f.c
similarity index 100%
rename from src/mpi/f77/comm_set_attr_f.c
rename to ompi/mpi/f77/comm_set_attr_f.c
diff --git a/src/mpi/f77/comm_set_errhandler_f.c b/ompi/mpi/f77/comm_set_errhandler_f.c
similarity index 100%
rename from src/mpi/f77/comm_set_errhandler_f.c
rename to ompi/mpi/f77/comm_set_errhandler_f.c
diff --git a/src/mpi/f77/comm_set_name_f.c b/ompi/mpi/f77/comm_set_name_f.c
similarity index 100%
rename from src/mpi/f77/comm_set_name_f.c
rename to ompi/mpi/f77/comm_set_name_f.c
diff --git a/src/mpi/f77/comm_size_f.c b/ompi/mpi/f77/comm_size_f.c
similarity index 100%
rename from src/mpi/f77/comm_size_f.c
rename to ompi/mpi/f77/comm_size_f.c
diff --git a/src/mpi/f77/comm_spawn_f.c b/ompi/mpi/f77/comm_spawn_f.c
similarity index 100%
rename from src/mpi/f77/comm_spawn_f.c
rename to ompi/mpi/f77/comm_spawn_f.c
diff --git a/src/mpi/f77/comm_spawn_multiple_f.c b/ompi/mpi/f77/comm_spawn_multiple_f.c
similarity index 100%
rename from src/mpi/f77/comm_spawn_multiple_f.c
rename to ompi/mpi/f77/comm_spawn_multiple_f.c
diff --git a/src/mpi/f77/comm_split_f.c b/ompi/mpi/f77/comm_split_f.c
similarity index 100%
rename from src/mpi/f77/comm_split_f.c
rename to ompi/mpi/f77/comm_split_f.c
diff --git a/src/mpi/f77/comm_test_inter_f.c b/ompi/mpi/f77/comm_test_inter_f.c
similarity index 100%
rename from src/mpi/f77/comm_test_inter_f.c
rename to ompi/mpi/f77/comm_test_inter_f.c
diff --git a/src/mpi/f77/constants.h b/ompi/mpi/f77/constants.h
similarity index 100%
rename from src/mpi/f77/constants.h
rename to ompi/mpi/f77/constants.h
diff --git a/src/mpi/f77/constants_f.c b/ompi/mpi/f77/constants_f.c
similarity index 100%
rename from src/mpi/f77/constants_f.c
rename to ompi/mpi/f77/constants_f.c
diff --git a/src/mpi/f77/dims_create_f.c b/ompi/mpi/f77/dims_create_f.c
similarity index 100%
rename from src/mpi/f77/dims_create_f.c
rename to ompi/mpi/f77/dims_create_f.c
diff --git a/src/mpi/f77/errhandler_create_f.c b/ompi/mpi/f77/errhandler_create_f.c
similarity index 100%
rename from src/mpi/f77/errhandler_create_f.c
rename to ompi/mpi/f77/errhandler_create_f.c
diff --git a/src/mpi/f77/errhandler_free_f.c b/ompi/mpi/f77/errhandler_free_f.c
similarity index 100%
rename from src/mpi/f77/errhandler_free_f.c
rename to ompi/mpi/f77/errhandler_free_f.c
diff --git a/src/mpi/f77/errhandler_get_f.c b/ompi/mpi/f77/errhandler_get_f.c
similarity index 100%
rename from src/mpi/f77/errhandler_get_f.c
rename to ompi/mpi/f77/errhandler_get_f.c
diff --git a/src/mpi/f77/errhandler_set_f.c b/ompi/mpi/f77/errhandler_set_f.c
similarity index 100%
rename from src/mpi/f77/errhandler_set_f.c
rename to ompi/mpi/f77/errhandler_set_f.c
diff --git a/src/mpi/f77/error_class_f.c b/ompi/mpi/f77/error_class_f.c
similarity index 100%
rename from src/mpi/f77/error_class_f.c
rename to ompi/mpi/f77/error_class_f.c
diff --git a/src/mpi/f77/error_string_f.c b/ompi/mpi/f77/error_string_f.c
similarity index 100%
rename from src/mpi/f77/error_string_f.c
rename to ompi/mpi/f77/error_string_f.c
diff --git a/src/mpi/f77/exscan_f.c b/ompi/mpi/f77/exscan_f.c
similarity index 100%
rename from src/mpi/f77/exscan_f.c
rename to ompi/mpi/f77/exscan_f.c
diff --git a/src/mpi/f77/file_call_errhandler_f.c b/ompi/mpi/f77/file_call_errhandler_f.c
similarity index 100%
rename from src/mpi/f77/file_call_errhandler_f.c
rename to ompi/mpi/f77/file_call_errhandler_f.c
diff --git a/src/mpi/f77/file_close_f.c b/ompi/mpi/f77/file_close_f.c
similarity index 100%
rename from src/mpi/f77/file_close_f.c
rename to ompi/mpi/f77/file_close_f.c
diff --git a/src/mpi/f77/file_create_errhandler_f.c b/ompi/mpi/f77/file_create_errhandler_f.c
similarity index 100%
rename from src/mpi/f77/file_create_errhandler_f.c
rename to ompi/mpi/f77/file_create_errhandler_f.c
diff --git a/src/mpi/f77/file_delete_f.c b/ompi/mpi/f77/file_delete_f.c
similarity index 100%
rename from src/mpi/f77/file_delete_f.c
rename to ompi/mpi/f77/file_delete_f.c
diff --git a/src/mpi/f77/file_get_amode_f.c b/ompi/mpi/f77/file_get_amode_f.c
similarity index 100%
rename from src/mpi/f77/file_get_amode_f.c
rename to ompi/mpi/f77/file_get_amode_f.c
diff --git a/src/mpi/f77/file_get_atomicity_f.c b/ompi/mpi/f77/file_get_atomicity_f.c
similarity index 100%
rename from src/mpi/f77/file_get_atomicity_f.c
rename to ompi/mpi/f77/file_get_atomicity_f.c
diff --git a/src/mpi/f77/file_get_byte_offset_f.c b/ompi/mpi/f77/file_get_byte_offset_f.c
similarity index 100%
rename from src/mpi/f77/file_get_byte_offset_f.c
rename to ompi/mpi/f77/file_get_byte_offset_f.c
diff --git a/src/mpi/f77/file_get_errhandler_f.c b/ompi/mpi/f77/file_get_errhandler_f.c
similarity index 100%
rename from src/mpi/f77/file_get_errhandler_f.c
rename to ompi/mpi/f77/file_get_errhandler_f.c
diff --git a/src/mpi/f77/file_get_group_f.c b/ompi/mpi/f77/file_get_group_f.c
similarity index 100%
rename from src/mpi/f77/file_get_group_f.c
rename to ompi/mpi/f77/file_get_group_f.c
diff --git a/src/mpi/f77/file_get_info_f.c b/ompi/mpi/f77/file_get_info_f.c
similarity index 100%
rename from src/mpi/f77/file_get_info_f.c
rename to ompi/mpi/f77/file_get_info_f.c
diff --git a/src/mpi/f77/file_get_position_f.c b/ompi/mpi/f77/file_get_position_f.c
similarity index 100%
rename from src/mpi/f77/file_get_position_f.c
rename to ompi/mpi/f77/file_get_position_f.c
diff --git a/src/mpi/f77/file_get_position_shared_f.c b/ompi/mpi/f77/file_get_position_shared_f.c
similarity index 100%
rename from src/mpi/f77/file_get_position_shared_f.c
rename to ompi/mpi/f77/file_get_position_shared_f.c
diff --git a/src/mpi/f77/file_get_size_f.c b/ompi/mpi/f77/file_get_size_f.c
similarity index 100%
rename from src/mpi/f77/file_get_size_f.c
rename to ompi/mpi/f77/file_get_size_f.c
diff --git a/src/mpi/f77/file_get_type_extent_f.c b/ompi/mpi/f77/file_get_type_extent_f.c
similarity index 100%
rename from src/mpi/f77/file_get_type_extent_f.c
rename to ompi/mpi/f77/file_get_type_extent_f.c
diff --git a/src/mpi/f77/file_get_view_f.c b/ompi/mpi/f77/file_get_view_f.c
similarity index 100%
rename from src/mpi/f77/file_get_view_f.c
rename to ompi/mpi/f77/file_get_view_f.c
diff --git a/src/mpi/f77/file_iread_at_f.c b/ompi/mpi/f77/file_iread_at_f.c
similarity index 100%
rename from src/mpi/f77/file_iread_at_f.c
rename to ompi/mpi/f77/file_iread_at_f.c
diff --git a/src/mpi/f77/file_iread_f.c b/ompi/mpi/f77/file_iread_f.c
similarity index 100%
rename from src/mpi/f77/file_iread_f.c
rename to ompi/mpi/f77/file_iread_f.c
diff --git a/src/mpi/f77/file_iread_shared_f.c b/ompi/mpi/f77/file_iread_shared_f.c
similarity index 100%
rename from src/mpi/f77/file_iread_shared_f.c
rename to ompi/mpi/f77/file_iread_shared_f.c
diff --git a/src/mpi/f77/file_iwrite_at_f.c b/ompi/mpi/f77/file_iwrite_at_f.c
similarity index 100%
rename from src/mpi/f77/file_iwrite_at_f.c
rename to ompi/mpi/f77/file_iwrite_at_f.c
diff --git a/src/mpi/f77/file_iwrite_f.c b/ompi/mpi/f77/file_iwrite_f.c
similarity index 100%
rename from src/mpi/f77/file_iwrite_f.c
rename to ompi/mpi/f77/file_iwrite_f.c
diff --git a/src/mpi/f77/file_iwrite_shared_f.c b/ompi/mpi/f77/file_iwrite_shared_f.c
similarity index 100%
rename from src/mpi/f77/file_iwrite_shared_f.c
rename to ompi/mpi/f77/file_iwrite_shared_f.c
diff --git a/src/mpi/f77/file_open_f.c b/ompi/mpi/f77/file_open_f.c
similarity index 100%
rename from src/mpi/f77/file_open_f.c
rename to ompi/mpi/f77/file_open_f.c
diff --git a/src/mpi/f77/file_preallocate_f.c b/ompi/mpi/f77/file_preallocate_f.c
similarity index 100%
rename from src/mpi/f77/file_preallocate_f.c
rename to ompi/mpi/f77/file_preallocate_f.c
diff --git a/src/mpi/f77/file_read_all_begin_f.c b/ompi/mpi/f77/file_read_all_begin_f.c
similarity index 100%
rename from src/mpi/f77/file_read_all_begin_f.c
rename to ompi/mpi/f77/file_read_all_begin_f.c
diff --git a/src/mpi/f77/file_read_all_end_f.c b/ompi/mpi/f77/file_read_all_end_f.c
similarity index 100%
rename from src/mpi/f77/file_read_all_end_f.c
rename to ompi/mpi/f77/file_read_all_end_f.c
diff --git a/src/mpi/f77/file_read_all_f.c b/ompi/mpi/f77/file_read_all_f.c
similarity index 100%
rename from src/mpi/f77/file_read_all_f.c
rename to ompi/mpi/f77/file_read_all_f.c
diff --git a/src/mpi/f77/file_read_at_all_begin_f.c b/ompi/mpi/f77/file_read_at_all_begin_f.c
similarity index 100%
rename from src/mpi/f77/file_read_at_all_begin_f.c
rename to ompi/mpi/f77/file_read_at_all_begin_f.c
diff --git a/src/mpi/f77/file_read_at_all_end_f.c b/ompi/mpi/f77/file_read_at_all_end_f.c
similarity index 100%
rename from src/mpi/f77/file_read_at_all_end_f.c
rename to ompi/mpi/f77/file_read_at_all_end_f.c
diff --git a/src/mpi/f77/file_read_at_all_f.c b/ompi/mpi/f77/file_read_at_all_f.c
similarity index 100%
rename from src/mpi/f77/file_read_at_all_f.c
rename to ompi/mpi/f77/file_read_at_all_f.c
diff --git a/src/mpi/f77/file_read_at_f.c b/ompi/mpi/f77/file_read_at_f.c
similarity index 100%
rename from src/mpi/f77/file_read_at_f.c
rename to ompi/mpi/f77/file_read_at_f.c
diff --git a/src/mpi/f77/file_read_f.c b/ompi/mpi/f77/file_read_f.c
similarity index 100%
rename from src/mpi/f77/file_read_f.c
rename to ompi/mpi/f77/file_read_f.c
diff --git a/src/mpi/f77/file_read_ordered_begin_f.c b/ompi/mpi/f77/file_read_ordered_begin_f.c
similarity index 100%
rename from src/mpi/f77/file_read_ordered_begin_f.c
rename to ompi/mpi/f77/file_read_ordered_begin_f.c
diff --git a/src/mpi/f77/file_read_ordered_end_f.c b/ompi/mpi/f77/file_read_ordered_end_f.c
similarity index 100%
rename from src/mpi/f77/file_read_ordered_end_f.c
rename to ompi/mpi/f77/file_read_ordered_end_f.c
diff --git a/src/mpi/f77/file_read_ordered_f.c b/ompi/mpi/f77/file_read_ordered_f.c
similarity index 100%
rename from src/mpi/f77/file_read_ordered_f.c
rename to ompi/mpi/f77/file_read_ordered_f.c
diff --git a/src/mpi/f77/file_read_shared_f.c b/ompi/mpi/f77/file_read_shared_f.c
similarity index 100%
rename from src/mpi/f77/file_read_shared_f.c
rename to ompi/mpi/f77/file_read_shared_f.c
diff --git a/src/mpi/f77/file_seek_f.c b/ompi/mpi/f77/file_seek_f.c
similarity index 100%
rename from src/mpi/f77/file_seek_f.c
rename to ompi/mpi/f77/file_seek_f.c
diff --git a/src/mpi/f77/file_seek_shared_f.c b/ompi/mpi/f77/file_seek_shared_f.c
similarity index 100%
rename from src/mpi/f77/file_seek_shared_f.c
rename to ompi/mpi/f77/file_seek_shared_f.c
diff --git a/src/mpi/f77/file_set_atomicity_f.c b/ompi/mpi/f77/file_set_atomicity_f.c
similarity index 100%
rename from src/mpi/f77/file_set_atomicity_f.c
rename to ompi/mpi/f77/file_set_atomicity_f.c
diff --git a/src/mpi/f77/file_set_errhandler_f.c b/ompi/mpi/f77/file_set_errhandler_f.c
similarity index 100%
rename from src/mpi/f77/file_set_errhandler_f.c
rename to ompi/mpi/f77/file_set_errhandler_f.c
diff --git a/src/mpi/f77/file_set_info_f.c b/ompi/mpi/f77/file_set_info_f.c
similarity index 100%
rename from src/mpi/f77/file_set_info_f.c
rename to ompi/mpi/f77/file_set_info_f.c
diff --git a/src/mpi/f77/file_set_size_f.c b/ompi/mpi/f77/file_set_size_f.c
similarity index 100%
rename from src/mpi/f77/file_set_size_f.c
rename to ompi/mpi/f77/file_set_size_f.c
diff --git a/src/mpi/f77/file_set_view_f.c b/ompi/mpi/f77/file_set_view_f.c
similarity index 100%
rename from src/mpi/f77/file_set_view_f.c
rename to ompi/mpi/f77/file_set_view_f.c
diff --git a/src/mpi/f77/file_sync_f.c b/ompi/mpi/f77/file_sync_f.c
similarity index 100%
rename from src/mpi/f77/file_sync_f.c
rename to ompi/mpi/f77/file_sync_f.c
diff --git a/src/mpi/f77/file_write_all_begin_f.c b/ompi/mpi/f77/file_write_all_begin_f.c
similarity index 100%
rename from src/mpi/f77/file_write_all_begin_f.c
rename to ompi/mpi/f77/file_write_all_begin_f.c
diff --git a/src/mpi/f77/file_write_all_end_f.c b/ompi/mpi/f77/file_write_all_end_f.c
similarity index 100%
rename from src/mpi/f77/file_write_all_end_f.c
rename to ompi/mpi/f77/file_write_all_end_f.c
diff --git a/src/mpi/f77/file_write_all_f.c b/ompi/mpi/f77/file_write_all_f.c
similarity index 100%
rename from src/mpi/f77/file_write_all_f.c
rename to ompi/mpi/f77/file_write_all_f.c
diff --git a/src/mpi/f77/file_write_at_all_begin_f.c b/ompi/mpi/f77/file_write_at_all_begin_f.c
similarity index 100%
rename from src/mpi/f77/file_write_at_all_begin_f.c
rename to ompi/mpi/f77/file_write_at_all_begin_f.c
diff --git a/src/mpi/f77/file_write_at_all_end_f.c b/ompi/mpi/f77/file_write_at_all_end_f.c
similarity index 100%
rename from src/mpi/f77/file_write_at_all_end_f.c
rename to ompi/mpi/f77/file_write_at_all_end_f.c
diff --git a/src/mpi/f77/file_write_at_all_f.c b/ompi/mpi/f77/file_write_at_all_f.c
similarity index 100%
rename from src/mpi/f77/file_write_at_all_f.c
rename to ompi/mpi/f77/file_write_at_all_f.c
diff --git a/src/mpi/f77/file_write_at_f.c b/ompi/mpi/f77/file_write_at_f.c
similarity index 100%
rename from src/mpi/f77/file_write_at_f.c
rename to ompi/mpi/f77/file_write_at_f.c
diff --git a/src/mpi/f77/file_write_f.c b/ompi/mpi/f77/file_write_f.c
similarity index 100%
rename from src/mpi/f77/file_write_f.c
rename to ompi/mpi/f77/file_write_f.c
diff --git a/src/mpi/f77/file_write_ordered_begin_f.c b/ompi/mpi/f77/file_write_ordered_begin_f.c
similarity index 100%
rename from src/mpi/f77/file_write_ordered_begin_f.c
rename to ompi/mpi/f77/file_write_ordered_begin_f.c
diff --git a/src/mpi/f77/file_write_ordered_end_f.c b/ompi/mpi/f77/file_write_ordered_end_f.c
similarity index 100%
rename from src/mpi/f77/file_write_ordered_end_f.c
rename to ompi/mpi/f77/file_write_ordered_end_f.c
diff --git a/src/mpi/f77/file_write_ordered_f.c b/ompi/mpi/f77/file_write_ordered_f.c
similarity index 100%
rename from src/mpi/f77/file_write_ordered_f.c
rename to ompi/mpi/f77/file_write_ordered_f.c
diff --git a/src/mpi/f77/file_write_shared_f.c b/ompi/mpi/f77/file_write_shared_f.c
similarity index 100%
rename from src/mpi/f77/file_write_shared_f.c
rename to ompi/mpi/f77/file_write_shared_f.c
diff --git a/src/mpi/f77/finalize_f.c b/ompi/mpi/f77/finalize_f.c
similarity index 100%
rename from src/mpi/f77/finalize_f.c
rename to ompi/mpi/f77/finalize_f.c
diff --git a/src/mpi/f77/finalized_f.c b/ompi/mpi/f77/finalized_f.c
similarity index 100%
rename from src/mpi/f77/finalized_f.c
rename to ompi/mpi/f77/finalized_f.c
diff --git a/src/mpi/f77/fint_2_int.h b/ompi/mpi/f77/fint_2_int.h
similarity index 100%
rename from src/mpi/f77/fint_2_int.h
rename to ompi/mpi/f77/fint_2_int.h
diff --git a/src/mpi/f77/free_mem_f.c b/ompi/mpi/f77/free_mem_f.c
similarity index 100%
rename from src/mpi/f77/free_mem_f.c
rename to ompi/mpi/f77/free_mem_f.c
diff --git a/src/mpi/f77/gather_f.c b/ompi/mpi/f77/gather_f.c
similarity index 100%
rename from src/mpi/f77/gather_f.c
rename to ompi/mpi/f77/gather_f.c
diff --git a/src/mpi/f77/gatherv_f.c b/ompi/mpi/f77/gatherv_f.c
similarity index 100%
rename from src/mpi/f77/gatherv_f.c
rename to ompi/mpi/f77/gatherv_f.c
diff --git a/src/mpi/f77/get_address_f.c b/ompi/mpi/f77/get_address_f.c
similarity index 100%
rename from src/mpi/f77/get_address_f.c
rename to ompi/mpi/f77/get_address_f.c
diff --git a/src/mpi/f77/get_count_f.c b/ompi/mpi/f77/get_count_f.c
similarity index 100%
rename from src/mpi/f77/get_count_f.c
rename to ompi/mpi/f77/get_count_f.c
diff --git a/src/mpi/f77/get_elements_f.c b/ompi/mpi/f77/get_elements_f.c
similarity index 100%
rename from src/mpi/f77/get_elements_f.c
rename to ompi/mpi/f77/get_elements_f.c
diff --git a/src/mpi/f77/get_f.c b/ompi/mpi/f77/get_f.c
similarity index 100%
rename from src/mpi/f77/get_f.c
rename to ompi/mpi/f77/get_f.c
diff --git a/src/mpi/f77/get_processor_name_f.c b/ompi/mpi/f77/get_processor_name_f.c
similarity index 100%
rename from src/mpi/f77/get_processor_name_f.c
rename to ompi/mpi/f77/get_processor_name_f.c
diff --git a/src/mpi/f77/get_version_f.c b/ompi/mpi/f77/get_version_f.c
similarity index 100%
rename from src/mpi/f77/get_version_f.c
rename to ompi/mpi/f77/get_version_f.c
diff --git a/src/mpi/f77/graph_create_f.c b/ompi/mpi/f77/graph_create_f.c
similarity index 100%
rename from src/mpi/f77/graph_create_f.c
rename to ompi/mpi/f77/graph_create_f.c
diff --git a/src/mpi/f77/graph_get_f.c b/ompi/mpi/f77/graph_get_f.c
similarity index 100%
rename from src/mpi/f77/graph_get_f.c
rename to ompi/mpi/f77/graph_get_f.c
diff --git a/src/mpi/f77/graph_map_f.c b/ompi/mpi/f77/graph_map_f.c
similarity index 100%
rename from src/mpi/f77/graph_map_f.c
rename to ompi/mpi/f77/graph_map_f.c
diff --git a/src/mpi/f77/graph_neighbors_count_f.c b/ompi/mpi/f77/graph_neighbors_count_f.c
similarity index 100%
rename from src/mpi/f77/graph_neighbors_count_f.c
rename to ompi/mpi/f77/graph_neighbors_count_f.c
diff --git a/src/mpi/f77/graph_neighbors_f.c b/ompi/mpi/f77/graph_neighbors_f.c
similarity index 100%
rename from src/mpi/f77/graph_neighbors_f.c
rename to ompi/mpi/f77/graph_neighbors_f.c
diff --git a/src/mpi/f77/graphdims_get_f.c b/ompi/mpi/f77/graphdims_get_f.c
similarity index 100%
rename from src/mpi/f77/graphdims_get_f.c
rename to ompi/mpi/f77/graphdims_get_f.c
diff --git a/src/mpi/f77/grequest_complete_f.c b/ompi/mpi/f77/grequest_complete_f.c
similarity index 100%
rename from src/mpi/f77/grequest_complete_f.c
rename to ompi/mpi/f77/grequest_complete_f.c
diff --git a/src/mpi/f77/grequest_start_f.c b/ompi/mpi/f77/grequest_start_f.c
similarity index 100%
rename from src/mpi/f77/grequest_start_f.c
rename to ompi/mpi/f77/grequest_start_f.c
diff --git a/src/mpi/f77/group_compare_f.c b/ompi/mpi/f77/group_compare_f.c
similarity index 100%
rename from src/mpi/f77/group_compare_f.c
rename to ompi/mpi/f77/group_compare_f.c
diff --git a/src/mpi/f77/group_difference_f.c b/ompi/mpi/f77/group_difference_f.c
similarity index 100%
rename from src/mpi/f77/group_difference_f.c
rename to ompi/mpi/f77/group_difference_f.c
diff --git a/src/mpi/f77/group_excl_f.c b/ompi/mpi/f77/group_excl_f.c
similarity index 100%
rename from src/mpi/f77/group_excl_f.c
rename to ompi/mpi/f77/group_excl_f.c
diff --git a/src/mpi/f77/group_free_f.c b/ompi/mpi/f77/group_free_f.c
similarity index 100%
rename from src/mpi/f77/group_free_f.c
rename to ompi/mpi/f77/group_free_f.c
diff --git a/src/mpi/f77/group_incl_f.c b/ompi/mpi/f77/group_incl_f.c
similarity index 100%
rename from src/mpi/f77/group_incl_f.c
rename to ompi/mpi/f77/group_incl_f.c
diff --git a/src/mpi/f77/group_intersection_f.c b/ompi/mpi/f77/group_intersection_f.c
similarity index 100%
rename from src/mpi/f77/group_intersection_f.c
rename to ompi/mpi/f77/group_intersection_f.c
diff --git a/src/mpi/f77/group_range_excl_f.c b/ompi/mpi/f77/group_range_excl_f.c
similarity index 100%
rename from src/mpi/f77/group_range_excl_f.c
rename to ompi/mpi/f77/group_range_excl_f.c
diff --git a/src/mpi/f77/group_range_incl_f.c b/ompi/mpi/f77/group_range_incl_f.c
similarity index 100%
rename from src/mpi/f77/group_range_incl_f.c
rename to ompi/mpi/f77/group_range_incl_f.c
diff --git a/src/mpi/f77/group_rank_f.c b/ompi/mpi/f77/group_rank_f.c
similarity index 100%
rename from src/mpi/f77/group_rank_f.c
rename to ompi/mpi/f77/group_rank_f.c
diff --git a/src/mpi/f77/group_size_f.c b/ompi/mpi/f77/group_size_f.c
similarity index 100%
rename from src/mpi/f77/group_size_f.c
rename to ompi/mpi/f77/group_size_f.c
diff --git a/src/mpi/f77/group_translate_ranks_f.c b/ompi/mpi/f77/group_translate_ranks_f.c
similarity index 100%
rename from src/mpi/f77/group_translate_ranks_f.c
rename to ompi/mpi/f77/group_translate_ranks_f.c
diff --git a/src/mpi/f77/group_union_f.c b/ompi/mpi/f77/group_union_f.c
similarity index 100%
rename from src/mpi/f77/group_union_f.c
rename to ompi/mpi/f77/group_union_f.c
diff --git a/src/mpi/f77/ibsend_f.c b/ompi/mpi/f77/ibsend_f.c
similarity index 100%
rename from src/mpi/f77/ibsend_f.c
rename to ompi/mpi/f77/ibsend_f.c
diff --git a/src/mpi/f77/info_create_f.c b/ompi/mpi/f77/info_create_f.c
similarity index 100%
rename from src/mpi/f77/info_create_f.c
rename to ompi/mpi/f77/info_create_f.c
diff --git a/src/mpi/f77/info_delete_f.c b/ompi/mpi/f77/info_delete_f.c
similarity index 100%
rename from src/mpi/f77/info_delete_f.c
rename to ompi/mpi/f77/info_delete_f.c
diff --git a/src/mpi/f77/info_dup_f.c b/ompi/mpi/f77/info_dup_f.c
similarity index 100%
rename from src/mpi/f77/info_dup_f.c
rename to ompi/mpi/f77/info_dup_f.c
diff --git a/src/mpi/f77/info_free_f.c b/ompi/mpi/f77/info_free_f.c
similarity index 100%
rename from src/mpi/f77/info_free_f.c
rename to ompi/mpi/f77/info_free_f.c
diff --git a/src/mpi/f77/info_get_f.c b/ompi/mpi/f77/info_get_f.c
similarity index 100%
rename from src/mpi/f77/info_get_f.c
rename to ompi/mpi/f77/info_get_f.c
diff --git a/src/mpi/f77/info_get_nkeys_f.c b/ompi/mpi/f77/info_get_nkeys_f.c
similarity index 100%
rename from src/mpi/f77/info_get_nkeys_f.c
rename to ompi/mpi/f77/info_get_nkeys_f.c
diff --git a/src/mpi/f77/info_get_nthkey_f.c b/ompi/mpi/f77/info_get_nthkey_f.c
similarity index 100%
rename from src/mpi/f77/info_get_nthkey_f.c
rename to ompi/mpi/f77/info_get_nthkey_f.c
diff --git a/src/mpi/f77/info_get_valuelen_f.c b/ompi/mpi/f77/info_get_valuelen_f.c
similarity index 100%
rename from src/mpi/f77/info_get_valuelen_f.c
rename to ompi/mpi/f77/info_get_valuelen_f.c
diff --git a/src/mpi/f77/info_set_f.c b/ompi/mpi/f77/info_set_f.c
similarity index 100%
rename from src/mpi/f77/info_set_f.c
rename to ompi/mpi/f77/info_set_f.c
diff --git a/src/mpi/f77/init_f.c b/ompi/mpi/f77/init_f.c
similarity index 100%
rename from src/mpi/f77/init_f.c
rename to ompi/mpi/f77/init_f.c
diff --git a/src/mpi/f77/init_thread_f.c b/ompi/mpi/f77/init_thread_f.c
similarity index 100%
rename from src/mpi/f77/init_thread_f.c
rename to ompi/mpi/f77/init_thread_f.c
diff --git a/src/mpi/f77/initialized_f.c b/ompi/mpi/f77/initialized_f.c
similarity index 100%
rename from src/mpi/f77/initialized_f.c
rename to ompi/mpi/f77/initialized_f.c
diff --git a/src/mpi/f77/intercomm_create_f.c b/ompi/mpi/f77/intercomm_create_f.c
similarity index 100%
rename from src/mpi/f77/intercomm_create_f.c
rename to ompi/mpi/f77/intercomm_create_f.c
diff --git a/src/mpi/f77/intercomm_merge_f.c b/ompi/mpi/f77/intercomm_merge_f.c
similarity index 100%
rename from src/mpi/f77/intercomm_merge_f.c
rename to ompi/mpi/f77/intercomm_merge_f.c
diff --git a/src/mpi/f77/iprobe_f.c b/ompi/mpi/f77/iprobe_f.c
similarity index 100%
rename from src/mpi/f77/iprobe_f.c
rename to ompi/mpi/f77/iprobe_f.c
diff --git a/src/mpi/f77/irecv_f.c b/ompi/mpi/f77/irecv_f.c
similarity index 100%
rename from src/mpi/f77/irecv_f.c
rename to ompi/mpi/f77/irecv_f.c
diff --git a/src/mpi/f77/irsend_f.c b/ompi/mpi/f77/irsend_f.c
similarity index 100%
rename from src/mpi/f77/irsend_f.c
rename to ompi/mpi/f77/irsend_f.c
diff --git a/src/mpi/f77/is_thread_main_f.c b/ompi/mpi/f77/is_thread_main_f.c
similarity index 100%
rename from src/mpi/f77/is_thread_main_f.c
rename to ompi/mpi/f77/is_thread_main_f.c
diff --git a/src/mpi/f77/isend_f.c b/ompi/mpi/f77/isend_f.c
similarity index 100%
rename from src/mpi/f77/isend_f.c
rename to ompi/mpi/f77/isend_f.c
diff --git a/src/mpi/f77/issend_f.c b/ompi/mpi/f77/issend_f.c
similarity index 100%
rename from src/mpi/f77/issend_f.c
rename to ompi/mpi/f77/issend_f.c
diff --git a/src/mpi/f77/keyval_create_f.c b/ompi/mpi/f77/keyval_create_f.c
similarity index 100%
rename from src/mpi/f77/keyval_create_f.c
rename to ompi/mpi/f77/keyval_create_f.c
diff --git a/src/mpi/f77/keyval_free_f.c b/ompi/mpi/f77/keyval_free_f.c
similarity index 100%
rename from src/mpi/f77/keyval_free_f.c
rename to ompi/mpi/f77/keyval_free_f.c
diff --git a/src/mpi/f77/lookup_name_f.c b/ompi/mpi/f77/lookup_name_f.c
similarity index 100%
rename from src/mpi/f77/lookup_name_f.c
rename to ompi/mpi/f77/lookup_name_f.c
diff --git a/src/mpi/f77/op_create_f.c b/ompi/mpi/f77/op_create_f.c
similarity index 100%
rename from src/mpi/f77/op_create_f.c
rename to ompi/mpi/f77/op_create_f.c
diff --git a/src/mpi/f77/op_free_f.c b/ompi/mpi/f77/op_free_f.c
similarity index 100%
rename from src/mpi/f77/op_free_f.c
rename to ompi/mpi/f77/op_free_f.c
diff --git a/src/mpi/f77/open_port_f.c b/ompi/mpi/f77/open_port_f.c
similarity index 100%
rename from src/mpi/f77/open_port_f.c
rename to ompi/mpi/f77/open_port_f.c
diff --git a/src/mpi/f77/pack_external_f.c b/ompi/mpi/f77/pack_external_f.c
similarity index 100%
rename from src/mpi/f77/pack_external_f.c
rename to ompi/mpi/f77/pack_external_f.c
diff --git a/src/mpi/f77/pack_external_size_f.c b/ompi/mpi/f77/pack_external_size_f.c
similarity index 100%
rename from src/mpi/f77/pack_external_size_f.c
rename to ompi/mpi/f77/pack_external_size_f.c
diff --git a/src/mpi/f77/pack_f.c b/ompi/mpi/f77/pack_f.c
similarity index 100%
rename from src/mpi/f77/pack_f.c
rename to ompi/mpi/f77/pack_f.c
diff --git a/src/mpi/f77/pack_size_f.c b/ompi/mpi/f77/pack_size_f.c
similarity index 100%
rename from src/mpi/f77/pack_size_f.c
rename to ompi/mpi/f77/pack_size_f.c
diff --git a/src/mpi/f77/pcontrol_f.c b/ompi/mpi/f77/pcontrol_f.c
similarity index 100%
rename from src/mpi/f77/pcontrol_f.c
rename to ompi/mpi/f77/pcontrol_f.c
diff --git a/src/mpi/f77/probe_f.c b/ompi/mpi/f77/probe_f.c
similarity index 100%
rename from src/mpi/f77/probe_f.c
rename to ompi/mpi/f77/probe_f.c
diff --git a/src/mpi/f77/profile/Makefile.am b/ompi/mpi/f77/profile/Makefile.am
similarity index 100%
rename from src/mpi/f77/profile/Makefile.am
rename to ompi/mpi/f77/profile/Makefile.am
diff --git a/src/mpi/f77/profile/defines.h b/ompi/mpi/f77/profile/defines.h
similarity index 100%
rename from src/mpi/f77/profile/defines.h
rename to ompi/mpi/f77/profile/defines.h
diff --git a/src/mpi/f77/profile/prototypes_pmpi.h b/ompi/mpi/f77/profile/prototypes_pmpi.h
similarity index 100%
rename from src/mpi/f77/profile/prototypes_pmpi.h
rename to ompi/mpi/f77/profile/prototypes_pmpi.h
diff --git a/src/mpi/f77/prototypes_mpi.h b/ompi/mpi/f77/prototypes_mpi.h
similarity index 100%
rename from src/mpi/f77/prototypes_mpi.h
rename to ompi/mpi/f77/prototypes_mpi.h
diff --git a/src/mpi/f77/publish_name_f.c b/ompi/mpi/f77/publish_name_f.c
similarity index 100%
rename from src/mpi/f77/publish_name_f.c
rename to ompi/mpi/f77/publish_name_f.c
diff --git a/src/mpi/f77/put_f.c b/ompi/mpi/f77/put_f.c
similarity index 100%
rename from src/mpi/f77/put_f.c
rename to ompi/mpi/f77/put_f.c
diff --git a/src/mpi/f77/query_thread_f.c b/ompi/mpi/f77/query_thread_f.c
similarity index 100%
rename from src/mpi/f77/query_thread_f.c
rename to ompi/mpi/f77/query_thread_f.c
diff --git a/src/mpi/f77/recv_f.c b/ompi/mpi/f77/recv_f.c
similarity index 100%
rename from src/mpi/f77/recv_f.c
rename to ompi/mpi/f77/recv_f.c
diff --git a/src/mpi/f77/recv_init_f.c b/ompi/mpi/f77/recv_init_f.c
similarity index 100%
rename from src/mpi/f77/recv_init_f.c
rename to ompi/mpi/f77/recv_init_f.c
diff --git a/src/mpi/f77/reduce_f.c b/ompi/mpi/f77/reduce_f.c
similarity index 100%
rename from src/mpi/f77/reduce_f.c
rename to ompi/mpi/f77/reduce_f.c
diff --git a/src/mpi/f77/reduce_scatter_f.c b/ompi/mpi/f77/reduce_scatter_f.c
similarity index 100%
rename from src/mpi/f77/reduce_scatter_f.c
rename to ompi/mpi/f77/reduce_scatter_f.c
diff --git a/src/mpi/f77/register_datarep_f.c b/ompi/mpi/f77/register_datarep_f.c
similarity index 100%
rename from src/mpi/f77/register_datarep_f.c
rename to ompi/mpi/f77/register_datarep_f.c
diff --git a/src/mpi/f77/request_free_f.c b/ompi/mpi/f77/request_free_f.c
similarity index 100%
rename from src/mpi/f77/request_free_f.c
rename to ompi/mpi/f77/request_free_f.c
diff --git a/src/mpi/f77/request_get_status_f.c b/ompi/mpi/f77/request_get_status_f.c
similarity index 100%
rename from src/mpi/f77/request_get_status_f.c
rename to ompi/mpi/f77/request_get_status_f.c
diff --git a/src/mpi/f77/rsend_f.c b/ompi/mpi/f77/rsend_f.c
similarity index 100%
rename from src/mpi/f77/rsend_f.c
rename to ompi/mpi/f77/rsend_f.c
diff --git a/src/mpi/f77/rsend_init_f.c b/ompi/mpi/f77/rsend_init_f.c
similarity index 100%
rename from src/mpi/f77/rsend_init_f.c
rename to ompi/mpi/f77/rsend_init_f.c
diff --git a/src/mpi/f77/scan_f.c b/ompi/mpi/f77/scan_f.c
similarity index 100%
rename from src/mpi/f77/scan_f.c
rename to ompi/mpi/f77/scan_f.c
diff --git a/src/mpi/f77/scatter_f.c b/ompi/mpi/f77/scatter_f.c
similarity index 100%
rename from src/mpi/f77/scatter_f.c
rename to ompi/mpi/f77/scatter_f.c
diff --git a/src/mpi/f77/scatterv_f.c b/ompi/mpi/f77/scatterv_f.c
similarity index 100%
rename from src/mpi/f77/scatterv_f.c
rename to ompi/mpi/f77/scatterv_f.c
diff --git a/src/mpi/f77/send_f.c b/ompi/mpi/f77/send_f.c
similarity index 100%
rename from src/mpi/f77/send_f.c
rename to ompi/mpi/f77/send_f.c
diff --git a/src/mpi/f77/send_init_f.c b/ompi/mpi/f77/send_init_f.c
similarity index 100%
rename from src/mpi/f77/send_init_f.c
rename to ompi/mpi/f77/send_init_f.c
diff --git a/src/mpi/f77/sendrecv_f.c b/ompi/mpi/f77/sendrecv_f.c
similarity index 100%
rename from src/mpi/f77/sendrecv_f.c
rename to ompi/mpi/f77/sendrecv_f.c
diff --git a/src/mpi/f77/sendrecv_replace_f.c b/ompi/mpi/f77/sendrecv_replace_f.c
similarity index 100%
rename from src/mpi/f77/sendrecv_replace_f.c
rename to ompi/mpi/f77/sendrecv_replace_f.c
diff --git a/src/mpi/f77/ssend_f.c b/ompi/mpi/f77/ssend_f.c
similarity index 100%
rename from src/mpi/f77/ssend_f.c
rename to ompi/mpi/f77/ssend_f.c
diff --git a/src/mpi/f77/ssend_init_f.c b/ompi/mpi/f77/ssend_init_f.c
similarity index 100%
rename from src/mpi/f77/ssend_init_f.c
rename to ompi/mpi/f77/ssend_init_f.c
diff --git a/src/mpi/f77/start_f.c b/ompi/mpi/f77/start_f.c
similarity index 100%
rename from src/mpi/f77/start_f.c
rename to ompi/mpi/f77/start_f.c
diff --git a/src/mpi/f77/startall_f.c b/ompi/mpi/f77/startall_f.c
similarity index 100%
rename from src/mpi/f77/startall_f.c
rename to ompi/mpi/f77/startall_f.c
diff --git a/src/mpi/f77/status_set_cancelled_f.c b/ompi/mpi/f77/status_set_cancelled_f.c
similarity index 100%
rename from src/mpi/f77/status_set_cancelled_f.c
rename to ompi/mpi/f77/status_set_cancelled_f.c
diff --git a/src/mpi/f77/status_set_elements_f.c b/ompi/mpi/f77/status_set_elements_f.c
similarity index 100%
rename from src/mpi/f77/status_set_elements_f.c
rename to ompi/mpi/f77/status_set_elements_f.c
diff --git a/src/mpi/f77/strings.c b/ompi/mpi/f77/strings.c
similarity index 100%
rename from src/mpi/f77/strings.c
rename to ompi/mpi/f77/strings.c
diff --git a/src/mpi/f77/strings.h b/ompi/mpi/f77/strings.h
similarity index 100%
rename from src/mpi/f77/strings.h
rename to ompi/mpi/f77/strings.h
diff --git a/src/mpi/f77/test_cancelled_f.c b/ompi/mpi/f77/test_cancelled_f.c
similarity index 100%
rename from src/mpi/f77/test_cancelled_f.c
rename to ompi/mpi/f77/test_cancelled_f.c
diff --git a/src/mpi/f77/test_f.c b/ompi/mpi/f77/test_f.c
similarity index 100%
rename from src/mpi/f77/test_f.c
rename to ompi/mpi/f77/test_f.c
diff --git a/src/mpi/f77/testall_f.c b/ompi/mpi/f77/testall_f.c
similarity index 100%
rename from src/mpi/f77/testall_f.c
rename to ompi/mpi/f77/testall_f.c
diff --git a/src/mpi/f77/testany_f.c b/ompi/mpi/f77/testany_f.c
similarity index 100%
rename from src/mpi/f77/testany_f.c
rename to ompi/mpi/f77/testany_f.c
diff --git a/src/mpi/f77/testsome_f.c b/ompi/mpi/f77/testsome_f.c
similarity index 100%
rename from src/mpi/f77/testsome_f.c
rename to ompi/mpi/f77/testsome_f.c
diff --git a/src/mpi/f77/topo_test_f.c b/ompi/mpi/f77/topo_test_f.c
similarity index 100%
rename from src/mpi/f77/topo_test_f.c
rename to ompi/mpi/f77/topo_test_f.c
diff --git a/src/mpi/f77/type_commit_f.c b/ompi/mpi/f77/type_commit_f.c
similarity index 100%
rename from src/mpi/f77/type_commit_f.c
rename to ompi/mpi/f77/type_commit_f.c
diff --git a/src/mpi/f77/type_contiguous_f.c b/ompi/mpi/f77/type_contiguous_f.c
similarity index 100%
rename from src/mpi/f77/type_contiguous_f.c
rename to ompi/mpi/f77/type_contiguous_f.c
diff --git a/src/mpi/f77/type_create_darray_f.c b/ompi/mpi/f77/type_create_darray_f.c
similarity index 100%
rename from src/mpi/f77/type_create_darray_f.c
rename to ompi/mpi/f77/type_create_darray_f.c
diff --git a/src/mpi/f77/type_create_f90_complex_f.c b/ompi/mpi/f77/type_create_f90_complex_f.c
similarity index 100%
rename from src/mpi/f77/type_create_f90_complex_f.c
rename to ompi/mpi/f77/type_create_f90_complex_f.c
diff --git a/src/mpi/f77/type_create_f90_integer_f.c b/ompi/mpi/f77/type_create_f90_integer_f.c
similarity index 100%
rename from src/mpi/f77/type_create_f90_integer_f.c
rename to ompi/mpi/f77/type_create_f90_integer_f.c
diff --git a/src/mpi/f77/type_create_f90_real_f.c b/ompi/mpi/f77/type_create_f90_real_f.c
similarity index 100%
rename from src/mpi/f77/type_create_f90_real_f.c
rename to ompi/mpi/f77/type_create_f90_real_f.c
diff --git a/src/mpi/f77/type_create_hindexed_f.c b/ompi/mpi/f77/type_create_hindexed_f.c
similarity index 100%
rename from src/mpi/f77/type_create_hindexed_f.c
rename to ompi/mpi/f77/type_create_hindexed_f.c
diff --git a/src/mpi/f77/type_create_hvector_f.c b/ompi/mpi/f77/type_create_hvector_f.c
similarity index 100%
rename from src/mpi/f77/type_create_hvector_f.c
rename to ompi/mpi/f77/type_create_hvector_f.c
diff --git a/src/mpi/f77/type_create_indexed_block_f.c b/ompi/mpi/f77/type_create_indexed_block_f.c
similarity index 100%
rename from src/mpi/f77/type_create_indexed_block_f.c
rename to ompi/mpi/f77/type_create_indexed_block_f.c
diff --git a/src/mpi/f77/type_create_keyval_f.c b/ompi/mpi/f77/type_create_keyval_f.c
similarity index 100%
rename from src/mpi/f77/type_create_keyval_f.c
rename to ompi/mpi/f77/type_create_keyval_f.c
diff --git a/src/mpi/f77/type_create_resized_f.c b/ompi/mpi/f77/type_create_resized_f.c
similarity index 100%
rename from src/mpi/f77/type_create_resized_f.c
rename to ompi/mpi/f77/type_create_resized_f.c
diff --git a/src/mpi/f77/type_create_struct_f.c b/ompi/mpi/f77/type_create_struct_f.c
similarity index 100%
rename from src/mpi/f77/type_create_struct_f.c
rename to ompi/mpi/f77/type_create_struct_f.c
diff --git a/src/mpi/f77/type_create_subarray_f.c b/ompi/mpi/f77/type_create_subarray_f.c
similarity index 100%
rename from src/mpi/f77/type_create_subarray_f.c
rename to ompi/mpi/f77/type_create_subarray_f.c
diff --git a/src/mpi/f77/type_delete_attr_f.c b/ompi/mpi/f77/type_delete_attr_f.c
similarity index 100%
rename from src/mpi/f77/type_delete_attr_f.c
rename to ompi/mpi/f77/type_delete_attr_f.c
diff --git a/src/mpi/f77/type_dup_f.c b/ompi/mpi/f77/type_dup_f.c
similarity index 100%
rename from src/mpi/f77/type_dup_f.c
rename to ompi/mpi/f77/type_dup_f.c
diff --git a/src/mpi/f77/type_extent_f.c b/ompi/mpi/f77/type_extent_f.c
similarity index 100%
rename from src/mpi/f77/type_extent_f.c
rename to ompi/mpi/f77/type_extent_f.c
diff --git a/src/mpi/f77/type_free_f.c b/ompi/mpi/f77/type_free_f.c
similarity index 100%
rename from src/mpi/f77/type_free_f.c
rename to ompi/mpi/f77/type_free_f.c
diff --git a/src/mpi/f77/type_free_keyval_f.c b/ompi/mpi/f77/type_free_keyval_f.c
similarity index 100%
rename from src/mpi/f77/type_free_keyval_f.c
rename to ompi/mpi/f77/type_free_keyval_f.c
diff --git a/src/mpi/f77/type_get_attr_f.c b/ompi/mpi/f77/type_get_attr_f.c
similarity index 100%
rename from src/mpi/f77/type_get_attr_f.c
rename to ompi/mpi/f77/type_get_attr_f.c
diff --git a/src/mpi/f77/type_get_contents_f.c b/ompi/mpi/f77/type_get_contents_f.c
similarity index 100%
rename from src/mpi/f77/type_get_contents_f.c
rename to ompi/mpi/f77/type_get_contents_f.c
diff --git a/src/mpi/f77/type_get_envelope_f.c b/ompi/mpi/f77/type_get_envelope_f.c
similarity index 100%
rename from src/mpi/f77/type_get_envelope_f.c
rename to ompi/mpi/f77/type_get_envelope_f.c
diff --git a/src/mpi/f77/type_get_extent_f.c b/ompi/mpi/f77/type_get_extent_f.c
similarity index 100%
rename from src/mpi/f77/type_get_extent_f.c
rename to ompi/mpi/f77/type_get_extent_f.c
diff --git a/src/mpi/f77/type_get_name_f.c b/ompi/mpi/f77/type_get_name_f.c
similarity index 100%
rename from src/mpi/f77/type_get_name_f.c
rename to ompi/mpi/f77/type_get_name_f.c
diff --git a/src/mpi/f77/type_get_true_extent_f.c b/ompi/mpi/f77/type_get_true_extent_f.c
similarity index 100%
rename from src/mpi/f77/type_get_true_extent_f.c
rename to ompi/mpi/f77/type_get_true_extent_f.c
diff --git a/src/mpi/f77/type_hindexed_f.c b/ompi/mpi/f77/type_hindexed_f.c
similarity index 100%
rename from src/mpi/f77/type_hindexed_f.c
rename to ompi/mpi/f77/type_hindexed_f.c
diff --git a/src/mpi/f77/type_hvector_f.c b/ompi/mpi/f77/type_hvector_f.c
similarity index 100%
rename from src/mpi/f77/type_hvector_f.c
rename to ompi/mpi/f77/type_hvector_f.c
diff --git a/src/mpi/f77/type_indexed_f.c b/ompi/mpi/f77/type_indexed_f.c
similarity index 100%
rename from src/mpi/f77/type_indexed_f.c
rename to ompi/mpi/f77/type_indexed_f.c
diff --git a/src/mpi/f77/type_lb_f.c b/ompi/mpi/f77/type_lb_f.c
similarity index 100%
rename from src/mpi/f77/type_lb_f.c
rename to ompi/mpi/f77/type_lb_f.c
diff --git a/src/mpi/f77/type_match_size_f.c b/ompi/mpi/f77/type_match_size_f.c
similarity index 100%
rename from src/mpi/f77/type_match_size_f.c
rename to ompi/mpi/f77/type_match_size_f.c
diff --git a/src/mpi/f77/type_set_attr_f.c b/ompi/mpi/f77/type_set_attr_f.c
similarity index 100%
rename from src/mpi/f77/type_set_attr_f.c
rename to ompi/mpi/f77/type_set_attr_f.c
diff --git a/src/mpi/f77/type_set_name_f.c b/ompi/mpi/f77/type_set_name_f.c
similarity index 100%
rename from src/mpi/f77/type_set_name_f.c
rename to ompi/mpi/f77/type_set_name_f.c
diff --git a/src/mpi/f77/type_size_f.c b/ompi/mpi/f77/type_size_f.c
similarity index 100%
rename from src/mpi/f77/type_size_f.c
rename to ompi/mpi/f77/type_size_f.c
diff --git a/src/mpi/f77/type_struct_f.c b/ompi/mpi/f77/type_struct_f.c
similarity index 100%
rename from src/mpi/f77/type_struct_f.c
rename to ompi/mpi/f77/type_struct_f.c
diff --git a/src/mpi/f77/type_ub_f.c b/ompi/mpi/f77/type_ub_f.c
similarity index 100%
rename from src/mpi/f77/type_ub_f.c
rename to ompi/mpi/f77/type_ub_f.c
diff --git a/src/mpi/f77/type_vector_f.c b/ompi/mpi/f77/type_vector_f.c
similarity index 100%
rename from src/mpi/f77/type_vector_f.c
rename to ompi/mpi/f77/type_vector_f.c
diff --git a/src/mpi/f77/unpack_external_f.c b/ompi/mpi/f77/unpack_external_f.c
similarity index 100%
rename from src/mpi/f77/unpack_external_f.c
rename to ompi/mpi/f77/unpack_external_f.c
diff --git a/src/mpi/f77/unpack_f.c b/ompi/mpi/f77/unpack_f.c
similarity index 100%
rename from src/mpi/f77/unpack_f.c
rename to ompi/mpi/f77/unpack_f.c
diff --git a/src/mpi/f77/unpublish_name_f.c b/ompi/mpi/f77/unpublish_name_f.c
similarity index 100%
rename from src/mpi/f77/unpublish_name_f.c
rename to ompi/mpi/f77/unpublish_name_f.c
diff --git a/src/mpi/f77/wait_f.c b/ompi/mpi/f77/wait_f.c
similarity index 100%
rename from src/mpi/f77/wait_f.c
rename to ompi/mpi/f77/wait_f.c
diff --git a/src/mpi/f77/waitall_f.c b/ompi/mpi/f77/waitall_f.c
similarity index 100%
rename from src/mpi/f77/waitall_f.c
rename to ompi/mpi/f77/waitall_f.c
diff --git a/src/mpi/f77/waitany_f.c b/ompi/mpi/f77/waitany_f.c
similarity index 100%
rename from src/mpi/f77/waitany_f.c
rename to ompi/mpi/f77/waitany_f.c
diff --git a/src/mpi/f77/waitsome_f.c b/ompi/mpi/f77/waitsome_f.c
similarity index 100%
rename from src/mpi/f77/waitsome_f.c
rename to ompi/mpi/f77/waitsome_f.c
diff --git a/src/mpi/f77/win_call_errhandler_f.c b/ompi/mpi/f77/win_call_errhandler_f.c
similarity index 100%
rename from src/mpi/f77/win_call_errhandler_f.c
rename to ompi/mpi/f77/win_call_errhandler_f.c
diff --git a/src/mpi/f77/win_complete_f.c b/ompi/mpi/f77/win_complete_f.c
similarity index 100%
rename from src/mpi/f77/win_complete_f.c
rename to ompi/mpi/f77/win_complete_f.c
diff --git a/src/mpi/f77/win_create_errhandler_f.c b/ompi/mpi/f77/win_create_errhandler_f.c
similarity index 100%
rename from src/mpi/f77/win_create_errhandler_f.c
rename to ompi/mpi/f77/win_create_errhandler_f.c
diff --git a/src/mpi/f77/win_create_f.c b/ompi/mpi/f77/win_create_f.c
similarity index 100%
rename from src/mpi/f77/win_create_f.c
rename to ompi/mpi/f77/win_create_f.c
diff --git a/src/mpi/f77/win_create_keyval_f.c b/ompi/mpi/f77/win_create_keyval_f.c
similarity index 100%
rename from src/mpi/f77/win_create_keyval_f.c
rename to ompi/mpi/f77/win_create_keyval_f.c
diff --git a/src/mpi/f77/win_delete_attr_f.c b/ompi/mpi/f77/win_delete_attr_f.c
similarity index 100%
rename from src/mpi/f77/win_delete_attr_f.c
rename to ompi/mpi/f77/win_delete_attr_f.c
diff --git a/src/mpi/f77/win_fence_f.c b/ompi/mpi/f77/win_fence_f.c
similarity index 100%
rename from src/mpi/f77/win_fence_f.c
rename to ompi/mpi/f77/win_fence_f.c
diff --git a/src/mpi/f77/win_free_f.c b/ompi/mpi/f77/win_free_f.c
similarity index 100%
rename from src/mpi/f77/win_free_f.c
rename to ompi/mpi/f77/win_free_f.c
diff --git a/src/mpi/f77/win_free_keyval_f.c b/ompi/mpi/f77/win_free_keyval_f.c
similarity index 100%
rename from src/mpi/f77/win_free_keyval_f.c
rename to ompi/mpi/f77/win_free_keyval_f.c
diff --git a/src/mpi/f77/win_get_attr_f.c b/ompi/mpi/f77/win_get_attr_f.c
similarity index 100%
rename from src/mpi/f77/win_get_attr_f.c
rename to ompi/mpi/f77/win_get_attr_f.c
diff --git a/src/mpi/f77/win_get_errhandler_f.c b/ompi/mpi/f77/win_get_errhandler_f.c
similarity index 100%
rename from src/mpi/f77/win_get_errhandler_f.c
rename to ompi/mpi/f77/win_get_errhandler_f.c
diff --git a/src/mpi/f77/win_get_group_f.c b/ompi/mpi/f77/win_get_group_f.c
similarity index 100%
rename from src/mpi/f77/win_get_group_f.c
rename to ompi/mpi/f77/win_get_group_f.c
diff --git a/src/mpi/f77/win_get_name_f.c b/ompi/mpi/f77/win_get_name_f.c
similarity index 100%
rename from src/mpi/f77/win_get_name_f.c
rename to ompi/mpi/f77/win_get_name_f.c
diff --git a/src/mpi/f77/win_lock_f.c b/ompi/mpi/f77/win_lock_f.c
similarity index 100%
rename from src/mpi/f77/win_lock_f.c
rename to ompi/mpi/f77/win_lock_f.c
diff --git a/src/mpi/f77/win_post_f.c b/ompi/mpi/f77/win_post_f.c
similarity index 100%
rename from src/mpi/f77/win_post_f.c
rename to ompi/mpi/f77/win_post_f.c
diff --git a/src/mpi/f77/win_set_attr_f.c b/ompi/mpi/f77/win_set_attr_f.c
similarity index 100%
rename from src/mpi/f77/win_set_attr_f.c
rename to ompi/mpi/f77/win_set_attr_f.c
diff --git a/src/mpi/f77/win_set_errhandler_f.c b/ompi/mpi/f77/win_set_errhandler_f.c
similarity index 100%
rename from src/mpi/f77/win_set_errhandler_f.c
rename to ompi/mpi/f77/win_set_errhandler_f.c
diff --git a/src/mpi/f77/win_set_name_f.c b/ompi/mpi/f77/win_set_name_f.c
similarity index 100%
rename from src/mpi/f77/win_set_name_f.c
rename to ompi/mpi/f77/win_set_name_f.c
diff --git a/src/mpi/f77/win_start_f.c b/ompi/mpi/f77/win_start_f.c
similarity index 100%
rename from src/mpi/f77/win_start_f.c
rename to ompi/mpi/f77/win_start_f.c
diff --git a/src/mpi/f77/win_test_f.c b/ompi/mpi/f77/win_test_f.c
similarity index 100%
rename from src/mpi/f77/win_test_f.c
rename to ompi/mpi/f77/win_test_f.c
diff --git a/src/mpi/f77/win_unlock_f.c b/ompi/mpi/f77/win_unlock_f.c
similarity index 100%
rename from src/mpi/f77/win_unlock_f.c
rename to ompi/mpi/f77/win_unlock_f.c
diff --git a/src/mpi/f77/win_wait_f.c b/ompi/mpi/f77/win_wait_f.c
similarity index 100%
rename from src/mpi/f77/win_wait_f.c
rename to ompi/mpi/f77/win_wait_f.c
diff --git a/src/mpi/f77/wtick_f.c b/ompi/mpi/f77/wtick_f.c
similarity index 100%
rename from src/mpi/f77/wtick_f.c
rename to ompi/mpi/f77/wtick_f.c
diff --git a/src/mpi/f77/wtime_f.c b/ompi/mpi/f77/wtime_f.c
similarity index 100%
rename from src/mpi/f77/wtime_f.c
rename to ompi/mpi/f77/wtime_f.c
diff --git a/src/mpi/f90/Makefile.am b/ompi/mpi/f90/Makefile.am
similarity index 100%
rename from src/mpi/f90/Makefile.am
rename to ompi/mpi/f90/Makefile.am
diff --git a/src/mpi/f90/fortran_kinds.sh.in b/ompi/mpi/f90/fortran_kinds.sh.in
similarity index 100%
rename from src/mpi/f90/fortran_kinds.sh.in
rename to ompi/mpi/f90/fortran_kinds.sh.in
diff --git a/src/mpi/f90/fortran_sizes.h.in b/ompi/mpi/f90/fortran_sizes.h.in
similarity index 100%
rename from src/mpi/f90/fortran_sizes.h.in
rename to ompi/mpi/f90/fortran_sizes.h.in
diff --git a/src/mpi/f90/mpi.f90 b/ompi/mpi/f90/mpi.f90
similarity index 100%
rename from src/mpi/f90/mpi.f90
rename to ompi/mpi/f90/mpi.f90
diff --git a/src/mpi/f90/mpi_kinds.f90 b/ompi/mpi/f90/mpi_kinds.f90
similarity index 100%
rename from src/mpi/f90/mpi_kinds.f90
rename to ompi/mpi/f90/mpi_kinds.f90
diff --git a/src/mpi/f90/scripts/Makefile.am b/ompi/mpi/f90/scripts/Makefile.am
similarity index 100%
rename from src/mpi/f90/scripts/Makefile.am
rename to ompi/mpi/f90/scripts/Makefile.am
diff --git a/src/mpi/f90/scripts/mpi-f90-interfaces.h.sh b/ompi/mpi/f90/scripts/mpi-f90-interfaces.h.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi-f90-interfaces.h.sh
rename to ompi/mpi/f90/scripts/mpi-f90-interfaces.h.sh
diff --git a/src/mpi/f90/scripts/mpi.f90.sh b/ompi/mpi/f90/scripts/mpi.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi.f90.sh
rename to ompi/mpi/f90/scripts/mpi.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_accumulate_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_accumulate_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_accumulate_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_accumulate_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_address_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_address_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_address_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_address_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_allocate_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_allocate_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_allocate_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_allocate_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_allreduce_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_allreduce_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_allreduce_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_allreduce_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_bcast_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_bcast_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_bcast_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_bcast_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_bsend_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_bsend_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_bsend_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_bsend_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_bsend_init_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_bsend_init_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_bsend_init_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_bsend_init_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_buffer_attach_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_buffer_attach_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_buffer_attach_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_buffer_attach_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_buffer_detach_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_buffer_detach_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_buffer_detach_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_buffer_detach_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_iread_at_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_iread_at_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_iread_at_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_iread_at_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_iread_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_iread_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_iread_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_iread_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_iread_shared_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_iread_shared_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_iread_shared_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_iread_shared_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_iwrite_at_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_iwrite_at_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_iwrite_at_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_iwrite_at_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_iwrite_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_iwrite_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_iwrite_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_iwrite_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_iwrite_shared_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_iwrite_shared_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_iwrite_shared_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_iwrite_shared_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_read_all_begin_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_read_all_begin_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_read_all_begin_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_read_all_begin_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_read_all_end_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_read_all_end_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_read_all_end_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_read_all_end_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_read_all_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_read_all_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_read_all_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_read_all_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_read_at_all_begin_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_read_at_all_begin_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_read_at_all_begin_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_read_at_all_begin_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_read_at_all_end_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_read_at_all_end_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_read_at_all_end_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_read_at_all_end_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_read_at_all_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_read_at_all_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_read_at_all_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_read_at_all_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_read_at_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_read_at_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_read_at_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_read_at_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_read_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_read_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_read_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_read_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_read_ordered_begin_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_read_ordered_begin_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_read_ordered_begin_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_read_ordered_begin_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_read_ordered_end_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_read_ordered_end_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_read_ordered_end_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_read_ordered_end_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_read_ordered_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_read_ordered_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_read_ordered_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_read_ordered_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_read_shared_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_read_shared_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_read_shared_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_read_shared_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_write_all_begin_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_write_all_begin_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_write_all_begin_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_write_all_begin_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_write_all_end_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_write_all_end_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_write_all_end_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_write_all_end_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_write_all_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_write_all_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_write_all_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_write_all_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_write_at_all_begin_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_write_at_all_begin_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_write_at_all_begin_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_write_at_all_begin_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_write_at_all_end_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_write_at_all_end_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_write_at_all_end_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_write_at_all_end_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_write_at_all_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_write_at_all_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_write_at_all_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_write_at_all_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_write_at_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_write_at_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_write_at_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_write_at_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_write_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_write_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_write_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_write_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_write_ordered_begin_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_write_ordered_begin_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_write_ordered_begin_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_write_ordered_begin_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_write_ordered_end_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_write_ordered_end_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_write_ordered_end_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_write_ordered_end_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_write_ordered_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_write_ordered_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_write_ordered_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_write_ordered_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_file_write_shared_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_file_write_shared_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_file_write_shared_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_file_write_shared_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_get_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_get_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_get_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_get_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_ibsend_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_ibsend_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_ibsend_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_ibsend_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_irecv_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_irecv_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_irecv_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_irecv_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_irsend_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_irsend_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_irsend_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_irsend_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_isend_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_isend_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_isend_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_isend_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_issend_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_issend_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_issend_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_issend_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_put_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_put_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_put_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_put_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_recv_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_recv_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_recv_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_recv_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_recv_init_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_recv_init_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_recv_init_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_recv_init_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_rsend_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_rsend_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_rsend_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_rsend_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_rsend_init_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_rsend_init_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_rsend_init_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_rsend_init_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_send_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_send_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_send_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_send_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_send_init_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_send_init_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_send_init_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_send_init_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_sendrecv_replace_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_sendrecv_replace_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_sendrecv_replace_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_sendrecv_replace_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_sizeof.f90.sh b/ompi/mpi/f90/scripts/mpi_sizeof.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_sizeof.f90.sh
rename to ompi/mpi/f90/scripts/mpi_sizeof.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_ssend_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_ssend_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_ssend_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_ssend_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_ssend_init_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_ssend_init_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_ssend_init_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_ssend_init_f90.f90.sh
diff --git a/src/mpi/f90/scripts/mpi_win_create_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_win_create_f90.f90.sh
similarity index 100%
rename from src/mpi/f90/scripts/mpi_win_create_f90.f90.sh
rename to ompi/mpi/f90/scripts/mpi_win_create_f90.f90.sh
diff --git a/src/mpi/f90/test/align_c.c b/ompi/mpi/f90/test/align_c.c
similarity index 100%
rename from src/mpi/f90/test/align_c.c
rename to ompi/mpi/f90/test/align_c.c
diff --git a/src/mpi/f90/test/print_align.f90 b/ompi/mpi/f90/test/print_align.f90
similarity index 100%
rename from src/mpi/f90/test/print_align.f90
rename to ompi/mpi/f90/test/print_align.f90
diff --git a/src/mpi/f90/test/print_ikinds.f90 b/ompi/mpi/f90/test/print_ikinds.f90
similarity index 100%
rename from src/mpi/f90/test/print_ikinds.f90
rename to ompi/mpi/f90/test/print_ikinds.f90
diff --git a/src/mpi/f90/test/print_prec_range.f90 b/ompi/mpi/f90/test/print_prec_range.f90
similarity index 100%
rename from src/mpi/f90/test/print_prec_range.f90
rename to ompi/mpi/f90/test/print_prec_range.f90
diff --git a/src/mpi/f90/test/print_rkinds.f90 b/ompi/mpi/f90/test/print_rkinds.f90
similarity index 100%
rename from src/mpi/f90/test/print_rkinds.f90
rename to ompi/mpi/f90/test/print_rkinds.f90
diff --git a/src/mpi/f90/test/send_t.c b/ompi/mpi/f90/test/send_t.c
similarity index 100%
rename from src/mpi/f90/test/send_t.c
rename to ompi/mpi/f90/test/send_t.c
diff --git a/src/mpi/f90/test/test_send.f90 b/ompi/mpi/f90/test/test_send.f90
similarity index 100%
rename from src/mpi/f90/test/test_send.f90
rename to ompi/mpi/f90/test/test_send.f90
diff --git a/src/mpi/f90/xml/chasm-mpi-test.c.xsl b/ompi/mpi/f90/xml/chasm-mpi-test.c.xsl
similarity index 100%
rename from src/mpi/f90/xml/chasm-mpi-test.c.xsl
rename to ompi/mpi/f90/xml/chasm-mpi-test.c.xsl
diff --git a/src/mpi/f90/xml/chasm-mpi-test.f90.xsl b/ompi/mpi/f90/xml/chasm-mpi-test.f90.xsl
similarity index 100%
rename from src/mpi/f90/xml/chasm-mpi-test.f90.xsl
rename to ompi/mpi/f90/xml/chasm-mpi-test.f90.xsl
diff --git a/src/mpi/f90/xml/chasm-mpi.f90.xsl b/ompi/mpi/f90/xml/chasm-mpi.f90.xsl
similarity index 100%
rename from src/mpi/f90/xml/chasm-mpi.f90.xsl
rename to ompi/mpi/f90/xml/chasm-mpi.f90.xsl
diff --git a/src/mpi/f90/xml/chasm-mpi.i.f90.xsl b/ompi/mpi/f90/xml/chasm-mpi.i.f90.xsl
similarity index 100%
rename from src/mpi/f90/xml/chasm-mpi.i.f90.xsl
rename to ompi/mpi/f90/xml/chasm-mpi.i.f90.xsl
diff --git a/src/mpi/f90/xml/mpi.h.xml b/ompi/mpi/f90/xml/mpi.h.xml
similarity index 100%
rename from src/mpi/f90/xml/mpi.h.xml
rename to ompi/mpi/f90/xml/mpi.h.xml
diff --git a/src/mpi/runtime/Makefile.am b/ompi/mpi/runtime/Makefile.am
similarity index 100%
rename from src/mpi/runtime/Makefile.am
rename to ompi/mpi/runtime/Makefile.am
diff --git a/src/mpi/runtime/help-mpi-runtime.txt b/ompi/mpi/runtime/help-mpi-runtime.txt
similarity index 100%
rename from src/mpi/runtime/help-mpi-runtime.txt
rename to ompi/mpi/runtime/help-mpi-runtime.txt
diff --git a/src/mpi/runtime/mpiruntime.h b/ompi/mpi/runtime/mpiruntime.h
similarity index 100%
rename from src/mpi/runtime/mpiruntime.h
rename to ompi/mpi/runtime/mpiruntime.h
diff --git a/src/mpi/runtime/ompi_mpi_abort.c b/ompi/mpi/runtime/ompi_mpi_abort.c
similarity index 100%
rename from src/mpi/runtime/ompi_mpi_abort.c
rename to ompi/mpi/runtime/ompi_mpi_abort.c
diff --git a/src/mpi/runtime/ompi_mpi_finalize.c b/ompi/mpi/runtime/ompi_mpi_finalize.c
similarity index 100%
rename from src/mpi/runtime/ompi_mpi_finalize.c
rename to ompi/mpi/runtime/ompi_mpi_finalize.c
diff --git a/src/mpi/runtime/ompi_mpi_init.c b/ompi/mpi/runtime/ompi_mpi_init.c
similarity index 100%
rename from src/mpi/runtime/ompi_mpi_init.c
rename to ompi/mpi/runtime/ompi_mpi_init.c
diff --git a/src/mpi/runtime/ompi_mpi_io.c b/ompi/mpi/runtime/ompi_mpi_io.c
similarity index 100%
rename from src/mpi/runtime/ompi_mpi_io.c
rename to ompi/mpi/runtime/ompi_mpi_io.c
diff --git a/src/mpi/runtime/ompi_mpi_params.c b/ompi/mpi/runtime/ompi_mpi_params.c
similarity index 100%
rename from src/mpi/runtime/ompi_mpi_params.c
rename to ompi/mpi/runtime/ompi_mpi_params.c
diff --git a/src/mpi/runtime/params.h b/ompi/mpi/runtime/params.h
similarity index 100%
rename from src/mpi/runtime/params.h
rename to ompi/mpi/runtime/params.h
diff --git a/src/op/Makefile.am b/ompi/op/Makefile.am
similarity index 100%
rename from src/op/Makefile.am
rename to ompi/op/Makefile.am
diff --git a/src/op/op.c b/ompi/op/op.c
similarity index 100%
rename from src/op/op.c
rename to ompi/op/op.c
diff --git a/src/op/op.h b/ompi/op/op.h
similarity index 100%
rename from src/op/op.h
rename to ompi/op/op.h
diff --git a/src/op/op_predefined.c b/ompi/op/op_predefined.c
similarity index 100%
rename from src/op/op_predefined.c
rename to ompi/op/op_predefined.c
diff --git a/src/op/op_predefined.h b/ompi/op/op_predefined.h
similarity index 100%
rename from src/op/op_predefined.h
rename to ompi/op/op_predefined.h
diff --git a/src/proc/Makefile.am b/ompi/proc/Makefile.am
similarity index 100%
rename from src/proc/Makefile.am
rename to ompi/proc/Makefile.am
diff --git a/src/proc/proc.c b/ompi/proc/proc.c
similarity index 100%
rename from src/proc/proc.c
rename to ompi/proc/proc.c
diff --git a/src/proc/proc.h b/ompi/proc/proc.h
similarity index 100%
rename from src/proc/proc.h
rename to ompi/proc/proc.h
diff --git a/src/request/Makefile.am b/ompi/request/Makefile.am
similarity index 100%
rename from src/request/Makefile.am
rename to ompi/request/Makefile.am
diff --git a/src/request/grequest.c b/ompi/request/grequest.c
similarity index 100%
rename from src/request/grequest.c
rename to ompi/request/grequest.c
diff --git a/src/request/grequest.h b/ompi/request/grequest.h
similarity index 100%
rename from src/request/grequest.h
rename to ompi/request/grequest.h
diff --git a/src/request/req_test.c b/ompi/request/req_test.c
similarity index 100%
rename from src/request/req_test.c
rename to ompi/request/req_test.c
diff --git a/src/request/req_wait.c b/ompi/request/req_wait.c
similarity index 100%
rename from src/request/req_wait.c
rename to ompi/request/req_wait.c
diff --git a/src/request/request.c b/ompi/request/request.c
similarity index 100%
rename from src/request/request.c
rename to ompi/request/request.c
diff --git a/src/request/request.h b/ompi/request/request.h
similarity index 100%
rename from src/request/request.h
rename to ompi/request/request.h
diff --git a/src/tools/Makefile.am b/ompi/tools/Makefile.am
similarity index 100%
rename from src/tools/Makefile.am
rename to ompi/tools/Makefile.am
diff --git a/src/tools/ompi_info/Makefile.am b/ompi/tools/ompi_info/Makefile.am
similarity index 100%
rename from src/tools/ompi_info/Makefile.am
rename to ompi/tools/ompi_info/Makefile.am
diff --git a/src/tools/ompi_info/components.cc b/ompi/tools/ompi_info/components.cc
similarity index 100%
rename from src/tools/ompi_info/components.cc
rename to ompi/tools/ompi_info/components.cc
diff --git a/src/tools/ompi_info/help-ompi_info.txt b/ompi/tools/ompi_info/help-ompi_info.txt
similarity index 100%
rename from src/tools/ompi_info/help-ompi_info.txt
rename to ompi/tools/ompi_info/help-ompi_info.txt
diff --git a/src/tools/ompi_info/ompi_info.cc b/ompi/tools/ompi_info/ompi_info.cc
similarity index 100%
rename from src/tools/ompi_info/ompi_info.cc
rename to ompi/tools/ompi_info/ompi_info.cc
diff --git a/src/tools/ompi_info/ompi_info.h b/ompi/tools/ompi_info/ompi_info.h
similarity index 100%
rename from src/tools/ompi_info/ompi_info.h
rename to ompi/tools/ompi_info/ompi_info.h
diff --git a/src/tools/ompi_info/output.cc b/ompi/tools/ompi_info/output.cc
similarity index 100%
rename from src/tools/ompi_info/output.cc
rename to ompi/tools/ompi_info/output.cc
diff --git a/src/tools/ompi_info/param.cc b/ompi/tools/ompi_info/param.cc
similarity index 100%
rename from src/tools/ompi_info/param.cc
rename to ompi/tools/ompi_info/param.cc
diff --git a/src/tools/ompi_info/version.cc b/ompi/tools/ompi_info/version.cc
similarity index 100%
rename from src/tools/ompi_info/version.cc
rename to ompi/tools/ompi_info/version.cc
diff --git a/src/tools/openmpi/Makefile.am b/ompi/tools/openmpi/Makefile.am
similarity index 100%
rename from src/tools/openmpi/Makefile.am
rename to ompi/tools/openmpi/Makefile.am
diff --git a/src/tools/openmpi/openmpi.c b/ompi/tools/openmpi/openmpi.c
similarity index 100%
rename from src/tools/openmpi/openmpi.c
rename to ompi/tools/openmpi/openmpi.c
diff --git a/src/tools/openmpi/openmpi.h b/ompi/tools/openmpi/openmpi.h
similarity index 100%
rename from src/tools/openmpi/openmpi.h
rename to ompi/tools/openmpi/openmpi.h
diff --git a/src/tools/win_makefile b/ompi/tools/win_makefile
similarity index 100%
rename from src/tools/win_makefile
rename to ompi/tools/win_makefile
diff --git a/src/tools/wrappers/Makefile.am b/ompi/tools/wrappers/Makefile.am
similarity index 100%
rename from src/tools/wrappers/Makefile.am
rename to ompi/tools/wrappers/Makefile.am
diff --git a/src/tools/wrappers/help-wrapper.txt b/ompi/tools/wrappers/help-wrapper.txt
similarity index 100%
rename from src/tools/wrappers/help-wrapper.txt
rename to ompi/tools/wrappers/help-wrapper.txt
diff --git a/src/tools/wrappers/mpicc.cc b/ompi/tools/wrappers/mpicc.cc
similarity index 100%
rename from src/tools/wrappers/mpicc.cc
rename to ompi/tools/wrappers/mpicc.cc
diff --git a/src/tools/wrappers/mpicxx.cc b/ompi/tools/wrappers/mpicxx.cc
similarity index 100%
rename from src/tools/wrappers/mpicxx.cc
rename to ompi/tools/wrappers/mpicxx.cc
diff --git a/src/tools/wrappers/mpif77.cc b/ompi/tools/wrappers/mpif77.cc
similarity index 100%
rename from src/tools/wrappers/mpif77.cc
rename to ompi/tools/wrappers/mpif77.cc
diff --git a/src/tools/wrappers/mpif90.cc b/ompi/tools/wrappers/mpif90.cc
similarity index 100%
rename from src/tools/wrappers/mpif90.cc
rename to ompi/tools/wrappers/mpif90.cc
diff --git a/src/tools/wrappers/ompi_wrap.h b/ompi/tools/wrappers/ompi_wrap.h
similarity index 100%
rename from src/tools/wrappers/ompi_wrap.h
rename to ompi/tools/wrappers/ompi_wrap.h
diff --git a/src/tools/wrappers/wrap.cc b/ompi/tools/wrappers/wrap.cc
similarity index 100%
rename from src/tools/wrappers/wrap.cc
rename to ompi/tools/wrappers/wrap.cc
diff --git a/src/tools/wrappers/wrap_engine.cc b/ompi/tools/wrappers/wrap_engine.cc
similarity index 100%
rename from src/tools/wrappers/wrap_engine.cc
rename to ompi/tools/wrappers/wrap_engine.cc
diff --git a/src/win/Makefile.am b/ompi/win/Makefile.am
similarity index 100%
rename from src/win/Makefile.am
rename to ompi/win/Makefile.am
diff --git a/src/win/win.c b/ompi/win/win.c
similarity index 100%
rename from src/win/win.c
rename to ompi/win/win.c
diff --git a/src/win/win.h b/ompi/win/win.h
similarity index 100%
rename from src/win/win.h
rename to ompi/win/win.h
diff --git a/src/win32/generated_include/allocator_static-components.h b/ompi/win32/generated_include/allocator_static-components.h
similarity index 100%
rename from src/win32/generated_include/allocator_static-components.h
rename to ompi/win32/generated_include/allocator_static-components.h
diff --git a/src/win32/generated_include/coll-basic-version.h b/ompi/win32/generated_include/coll-basic-version.h
similarity index 100%
rename from src/win32/generated_include/coll-basic-version.h
rename to ompi/win32/generated_include/coll-basic-version.h
diff --git a/src/win32/generated_include/coll_static-components.h b/ompi/win32/generated_include/coll_static-components.h
similarity index 100%
rename from src/win32/generated_include/coll_static-components.h
rename to ompi/win32/generated_include/coll_static-components.h
diff --git a/src/win32/generated_include/config.h b/ompi/win32/generated_include/config.h
similarity index 100%
rename from src/win32/generated_include/config.h
rename to ompi/win32/generated_include/config.h
diff --git a/src/win32/generated_include/errmgr_static-components.h b/ompi/win32/generated_include/errmgr_static-components.h
similarity index 100%
rename from src/win32/generated_include/errmgr_static-components.h
rename to ompi/win32/generated_include/errmgr_static-components.h
diff --git a/src/win32/generated_include/gpr_static-components.h b/ompi/win32/generated_include/gpr_static-components.h
similarity index 100%
rename from src/win32/generated_include/gpr_static-components.h
rename to ompi/win32/generated_include/gpr_static-components.h
diff --git a/src/win32/generated_include/io-romio-version.h b/ompi/win32/generated_include/io-romio-version.h
similarity index 100%
rename from src/win32/generated_include/io-romio-version.h
rename to ompi/win32/generated_include/io-romio-version.h
diff --git a/src/win32/generated_include/iof_static-components.h b/ompi/win32/generated_include/iof_static-components.h
similarity index 100%
rename from src/win32/generated_include/iof_static-components.h
rename to ompi/win32/generated_include/iof_static-components.h
diff --git a/src/win32/generated_include/libltdl/ltdl.h b/ompi/win32/generated_include/libltdl/ltdl.h
similarity index 100%
rename from src/win32/generated_include/libltdl/ltdl.h
rename to ompi/win32/generated_include/libltdl/ltdl.h
diff --git a/src/win32/generated_include/llm-hostfile-version.h b/ompi/win32/generated_include/llm-hostfile-version.h
similarity index 100%
rename from src/win32/generated_include/llm-hostfile-version.h
rename to ompi/win32/generated_include/llm-hostfile-version.h
diff --git a/src/win32/generated_include/llm_static-components.h b/ompi/win32/generated_include/llm_static-components.h
similarity index 100%
rename from src/win32/generated_include/llm_static-components.h
rename to ompi/win32/generated_include/llm_static-components.h
diff --git a/src/win32/generated_include/ns_static-components.h b/ompi/win32/generated_include/ns_static-components.h
similarity index 100%
rename from src/win32/generated_include/ns_static-components.h
rename to ompi/win32/generated_include/ns_static-components.h
diff --git a/src/win32/generated_include/ompi_config.h b/ompi/win32/generated_include/ompi_config.h
similarity index 100%
rename from src/win32/generated_include/ompi_config.h
rename to ompi/win32/generated_include/ompi_config.h
diff --git a/src/win32/generated_include/oob_static-components.h b/ompi/win32/generated_include/oob_static-components.h
similarity index 100%
rename from src/win32/generated_include/oob_static-components.h
rename to ompi/win32/generated_include/oob_static-components.h
diff --git a/src/win32/generated_include/pcm_static-components.h b/ompi/win32/generated_include/pcm_static-components.h
similarity index 100%
rename from src/win32/generated_include/pcm_static-components.h
rename to ompi/win32/generated_include/pcm_static-components.h
diff --git a/src/win32/generated_include/pcmclient-env-version.h b/ompi/win32/generated_include/pcmclient-env-version.h
similarity index 100%
rename from src/win32/generated_include/pcmclient-env-version.h
rename to ompi/win32/generated_include/pcmclient-env-version.h
diff --git a/src/win32/generated_include/pcmclient-rms-version.h b/ompi/win32/generated_include/pcmclient-rms-version.h
similarity index 100%
rename from src/win32/generated_include/pcmclient-rms-version.h
rename to ompi/win32/generated_include/pcmclient-rms-version.h
diff --git a/src/win32/generated_include/pcmclient-seed-version.h b/ompi/win32/generated_include/pcmclient-seed-version.h
similarity index 100%
rename from src/win32/generated_include/pcmclient-seed-version.h
rename to ompi/win32/generated_include/pcmclient-seed-version.h
diff --git a/src/win32/generated_include/pcmclient-singleton-version.h b/ompi/win32/generated_include/pcmclient-singleton-version.h
similarity index 100%
rename from src/win32/generated_include/pcmclient-singleton-version.h
rename to ompi/win32/generated_include/pcmclient-singleton-version.h
diff --git a/src/win32/generated_include/pcmclient-slurm-version.h b/ompi/win32/generated_include/pcmclient-slurm-version.h
similarity index 100%
rename from src/win32/generated_include/pcmclient-slurm-version.h
rename to ompi/win32/generated_include/pcmclient-slurm-version.h
diff --git a/src/win32/generated_include/pcmclient_static-components.h b/ompi/win32/generated_include/pcmclient_static-components.h
similarity index 100%
rename from src/win32/generated_include/pcmclient_static-components.h
rename to ompi/win32/generated_include/pcmclient_static-components.h
diff --git a/src/win32/generated_include/pls-fork-version.h b/ompi/win32/generated_include/pls-fork-version.h
similarity index 100%
rename from src/win32/generated_include/pls-fork-version.h
rename to ompi/win32/generated_include/pls-fork-version.h
diff --git a/src/win32/generated_include/pls-proxy-version.h b/ompi/win32/generated_include/pls-proxy-version.h
similarity index 100%
rename from src/win32/generated_include/pls-proxy-version.h
rename to ompi/win32/generated_include/pls-proxy-version.h
diff --git a/src/win32/generated_include/pls-rsh-version.h b/ompi/win32/generated_include/pls-rsh-version.h
similarity index 100%
rename from src/win32/generated_include/pls-rsh-version.h
rename to ompi/win32/generated_include/pls-rsh-version.h
diff --git a/src/win32/generated_include/pls_static-components.h b/ompi/win32/generated_include/pls_static-components.h
similarity index 100%
rename from src/win32/generated_include/pls_static-components.h
rename to ompi/win32/generated_include/pls_static-components.h
diff --git a/src/win32/generated_include/pml_static-components.h b/ompi/win32/generated_include/pml_static-components.h
similarity index 100%
rename from src/win32/generated_include/pml_static-components.h
rename to ompi/win32/generated_include/pml_static-components.h
diff --git a/src/win32/generated_include/ptl-prof-version.h b/ompi/win32/generated_include/ptl-prof-version.h
similarity index 100%
rename from src/win32/generated_include/ptl-prof-version.h
rename to ompi/win32/generated_include/ptl-prof-version.h
diff --git a/src/win32/generated_include/ptl_static-components.h b/ompi/win32/generated_include/ptl_static-components.h
similarity index 100%
rename from src/win32/generated_include/ptl_static-components.h
rename to ompi/win32/generated_include/ptl_static-components.h
diff --git a/src/win32/generated_include/ras_static-components.h b/ompi/win32/generated_include/ras_static-components.h
similarity index 100%
rename from src/win32/generated_include/ras_static-components.h
rename to ompi/win32/generated_include/ras_static-components.h
diff --git a/src/win32/generated_include/rds_static-components.h b/ompi/win32/generated_include/rds_static-components.h
similarity index 100%
rename from src/win32/generated_include/rds_static-components.h
rename to ompi/win32/generated_include/rds_static-components.h
diff --git a/src/win32/generated_include/rmaps_static-components.h b/ompi/win32/generated_include/rmaps_static-components.h
similarity index 100%
rename from src/win32/generated_include/rmaps_static-components.h
rename to ompi/win32/generated_include/rmaps_static-components.h
diff --git a/src/win32/generated_include/rmgr_static-components.h b/ompi/win32/generated_include/rmgr_static-components.h
similarity index 100%
rename from src/win32/generated_include/rmgr_static-components.h
rename to ompi/win32/generated_include/rmgr_static-components.h
diff --git a/src/win32/generated_include/rml_static-components.h b/ompi/win32/generated_include/rml_static-components.h
similarity index 100%
rename from src/win32/generated_include/rml_static-components.h
rename to ompi/win32/generated_include/rml_static-components.h
diff --git a/src/win32/generated_include/schema_static-components.h b/ompi/win32/generated_include/schema_static-components.h
similarity index 100%
rename from src/win32/generated_include/schema_static-components.h
rename to ompi/win32/generated_include/schema_static-components.h
diff --git a/src/win32/generated_include/soh_static-components.h b/ompi/win32/generated_include/soh_static-components.h
similarity index 100%
rename from src/win32/generated_include/soh_static-components.h
rename to ompi/win32/generated_include/soh_static-components.h
diff --git a/src/win32/generated_include/topo-unity-version.h b/ompi/win32/generated_include/topo-unity-version.h
similarity index 100%
rename from src/win32/generated_include/topo-unity-version.h
rename to ompi/win32/generated_include/topo-unity-version.h
diff --git a/src/win32/generated_include/topo_static-components.h b/ompi/win32/generated_include/topo_static-components.h
similarity index 100%
rename from src/win32/generated_include/topo_static-components.h
rename to ompi/win32/generated_include/topo_static-components.h
diff --git a/src/win32/generated_source/ltdl.c b/ompi/win32/generated_source/ltdl.c
similarity index 100%
rename from src/win32/generated_source/ltdl.c
rename to ompi/win32/generated_source/ltdl.c
diff --git a/src/win32/ompi_declspec.h b/ompi/win32/ompi_declspec.h
similarity index 100%
rename from src/win32/ompi_declspec.h
rename to ompi/win32/ompi_declspec.h
diff --git a/src/win32/ompi_misc.h b/ompi/win32/ompi_misc.h
similarity index 100%
rename from src/win32/ompi_misc.h
rename to ompi/win32/ompi_misc.h
diff --git a/src/win32/ompi_process.c b/ompi/win32/ompi_process.c
similarity index 100%
rename from src/win32/ompi_process.c
rename to ompi/win32/ompi_process.c
diff --git a/src/win32/ompi_process.h b/ompi/win32/ompi_process.h
similarity index 100%
rename from src/win32/ompi_process.h
rename to ompi/win32/ompi_process.h
diff --git a/src/win32/ompi_time.c b/ompi/win32/ompi_time.c
similarity index 100%
rename from src/win32/ompi_time.c
rename to ompi/win32/ompi_time.c
diff --git a/src/win32/ompi_time.h b/ompi/win32/ompi_time.h
similarity index 100%
rename from src/win32/ompi_time.h
rename to ompi/win32/ompi_time.h
diff --git a/src/win32/ompi_uio.c b/ompi/win32/ompi_uio.c
similarity index 100%
rename from src/win32/ompi_uio.c
rename to ompi/win32/ompi_uio.c
diff --git a/src/win32/ompi_uio.h b/ompi/win32/ompi_uio.h
similarity index 100%
rename from src/win32/ompi_uio.h
rename to ompi/win32/ompi_uio.h
diff --git a/src/win32/ompi_util.h b/ompi/win32/ompi_util.h
similarity index 100%
rename from src/win32/ompi_util.h
rename to ompi/win32/ompi_util.h
diff --git a/src/win32/ompi_utsname.c b/ompi/win32/ompi_utsname.c
similarity index 100%
rename from src/win32/ompi_utsname.c
rename to ompi/win32/ompi_utsname.c
diff --git a/src/win32/ompi_utsname.h b/ompi/win32/ompi_utsname.h
similarity index 100%
rename from src/win32/ompi_utsname.h
rename to ompi/win32/ompi_utsname.h
diff --git a/src/win32/win_compat.h b/ompi/win32/win_compat.h
similarity index 100%
rename from src/win32/win_compat.h
rename to ompi/win32/win_compat.h
diff --git a/src/win_makefile b/ompi/win_makefile
similarity index 100%
rename from src/win_makefile
rename to ompi/win_makefile