diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b048a0fa164c1..c6b5b3ddd815b9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -620,10 +620,9 @@ add_subdirectory(providers/rxe/man)
 add_subdirectory(libibmad)
 add_subdirectory(libibnetdisc)
 add_subdirectory(libibnetdisc/man)
-add_subdirectory(ibdiags/src)
-add_subdirectory(ibdiags/scripts)
-add_subdirectory(ibdiags/man)
-add_subdirectory(ibdiags/doc/rst)
+add_subdirectory(infiniband-diags)
+add_subdirectory(infiniband-diags/scripts)
+add_subdirectory(infiniband-diags/man)
 
 if (CYTHON_EXECUTABLE)
   add_subdirectory(pyverbs)
diff --git a/ibdiags/man/CMakeLists.txt b/ibdiags/man/CMakeLists.txt
deleted file mode 100644
index 2446acbb522c86..00000000000000
diff --git a/ibdiags/src/CMakeLists.txt b/infiniband-diags/CMakeLists.txt
similarity index 86%
rename from ibdiags/src/CMakeLists.txt
rename to infiniband-diags/CMakeLists.txt
index b28f543f2f0699..6301e8e0210af7 100644
--- a/ibdiags/src/CMakeLists.txt
+++ b/infiniband-diags/CMakeLists.txt
@@ -1,8 +1,13 @@
 publish_internal_headers(""
-  ../include/ibdiag_common.h
-  ../include/ibdiag_sa.h
+  ibdiag_common.h
+  ibdiag_sa.h
   )
 
+install(FILES
+  etc/error_thresholds
+  etc/ibdiag.conf
+  DESTINATION "${IBDIAG_CONFIG_PATH}")
+
 add_library(ibdiags_tools STATIC
   ibdiag_common.c
   ibdiag_sa.c
diff --git a/ibdiags/src/dump_fts.c b/infiniband-diags/dump_fts.c
similarity index 100%
rename from ibdiags/src/dump_fts.c
rename to infiniband-diags/dump_fts.c
diff --git a/ibdiags/etc/error_thresholds b/infiniband-diags/etc/error_thresholds
similarity index 100%
rename from ibdiags/etc/error_thresholds
rename to infiniband-diags/etc/error_thresholds
diff --git a/ibdiags/etc/ibdiag.conf b/infiniband-diags/etc/ibdiag.conf
similarity index 100%
rename from ibdiags/etc/ibdiag.conf
rename to infiniband-diags/etc/ibdiag.conf
diff --git a/ibdiags/src/ibaddr.c b/infiniband-diags/ibaddr.c
similarity index 100%
rename from ibdiags/src/ibaddr.c
rename to infiniband-diags/ibaddr.c
diff --git a/ibdiags/src/ibcacheedit.c b/infiniband-diags/ibcacheedit.c
similarity index 100%
rename from ibdiags/src/ibcacheedit.c
rename to infiniband-diags/ibcacheedit.c
diff --git a/ibdiags/src/ibccconfig.c b/infiniband-diags/ibccconfig.c
similarity index 100%
rename from ibdiags/src/ibccconfig.c
rename to infiniband-diags/ibccconfig.c
diff --git a/ibdiags/src/ibccquery.c b/infiniband-diags/ibccquery.c
similarity index 100%
rename from ibdiags/src/ibccquery.c
rename to infiniband-diags/ibccquery.c
diff --git a/ibdiags/src/ibdiag_common.c b/infiniband-diags/ibdiag_common.c
similarity index 100%
rename from ibdiags/src/ibdiag_common.c
rename to infiniband-diags/ibdiag_common.c
diff --git a/ibdiags/include/ibdiag_common.h b/infiniband-diags/ibdiag_common.h
similarity index 100%
rename from ibdiags/include/ibdiag_common.h
rename to infiniband-diags/ibdiag_common.h
diff --git a/ibdiags/src/ibdiag_sa.c b/infiniband-diags/ibdiag_sa.c
similarity index 100%
rename from ibdiags/src/ibdiag_sa.c
rename to infiniband-diags/ibdiag_sa.c
diff --git a/ibdiags/include/ibdiag_sa.h b/infiniband-diags/ibdiag_sa.h
similarity index 100%
rename from ibdiags/include/ibdiag_sa.h
rename to infiniband-diags/ibdiag_sa.h
diff --git a/ibdiags/src/iblinkinfo.c b/infiniband-diags/iblinkinfo.c
similarity index 100%
rename from ibdiags/src/iblinkinfo.c
rename to infiniband-diags/iblinkinfo.c
diff --git a/ibdiags/src/ibnetdiscover.c b/infiniband-diags/ibnetdiscover.c
similarity index 100%
rename from ibdiags/src/ibnetdiscover.c
rename to infiniband-diags/ibnetdiscover.c
diff --git a/ibdiags/src/ibping.c b/infiniband-diags/ibping.c
similarity index 100%
rename from ibdiags/src/ibping.c
rename to infiniband-diags/ibping.c
diff --git a/ibdiags/src/ibportstate.c b/infiniband-diags/ibportstate.c
similarity index 100%
rename from ibdiags/src/ibportstate.c
rename to infiniband-diags/ibportstate.c
diff --git a/ibdiags/src/ibqueryerrors.c b/infiniband-diags/ibqueryerrors.c
similarity index 100%
rename from ibdiags/src/ibqueryerrors.c
rename to infiniband-diags/ibqueryerrors.c
diff --git a/ibdiags/src/ibroute.c b/infiniband-diags/ibroute.c
similarity index 100%
rename from ibdiags/src/ibroute.c
rename to infiniband-diags/ibroute.c
diff --git a/ibdiags/src/ibsendtrap.c b/infiniband-diags/ibsendtrap.c
similarity index 100%
rename from ibdiags/src/ibsendtrap.c
rename to infiniband-diags/ibsendtrap.c
diff --git a/ibdiags/src/ibstat.c b/infiniband-diags/ibstat.c
similarity index 100%
rename from ibdiags/src/ibstat.c
rename to infiniband-diags/ibstat.c
diff --git a/ibdiags/src/ibsysstat.c b/infiniband-diags/ibsysstat.c
similarity index 100%
rename from ibdiags/src/ibsysstat.c
rename to infiniband-diags/ibsysstat.c
diff --git a/ibdiags/src/ibtracert.c b/infiniband-diags/ibtracert.c
similarity index 100%
rename from ibdiags/src/ibtracert.c
rename to infiniband-diags/ibtracert.c
diff --git a/ibdiags/doc/rst/CMakeLists.txt b/infiniband-diags/man/CMakeLists.txt
similarity index 68%
rename from ibdiags/doc/rst/CMakeLists.txt
rename to infiniband-diags/man/CMakeLists.txt
index f0e4072306a57c..845fff675f23d4 100644
--- a/ibdiags/doc/rst/CMakeLists.txt
+++ b/infiniband-diags/man/CMakeLists.txt
@@ -39,3 +39,26 @@ rdma_alias_man_pages(
   dump_fts.8 dump_lfts.8
   dump_fts.8 dump_mfts.8
   )
+
+if (WITH_IBDIAGS_COMPAT)
+  rdma_man_pages(
+    ibcheckerrors.8
+    ibcheckerrs.8
+    ibchecknet.8
+    ibchecknode.8
+    ibcheckport.8
+    ibcheckportstate.8
+    ibcheckportwidth.8
+    ibcheckstate.8
+    ibcheckwidth.8
+    ibclearcounters.8
+    ibclearerrors.8
+    ibdatacounters.8
+    ibdatacounts.8
+    ibdiscover.8
+    ibprintca.8
+    ibprintrt.8
+    ibprintswitch.8
+    ibswportwatch.8
+    )
+endif()
diff --git a/ibdiags/doc/rst/check_lft_balance.8.in.rst b/infiniband-diags/man/check_lft_balance.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/check_lft_balance.8.in.rst
rename to infiniband-diags/man/check_lft_balance.8.in.rst
diff --git a/ibdiags/doc/rst/common/opt_C.rst b/infiniband-diags/man/common/opt_C.rst
similarity index 100%
rename from ibdiags/doc/rst/common/opt_C.rst
rename to infiniband-diags/man/common/opt_C.rst
diff --git a/ibdiags/doc/rst/common/opt_D.rst b/infiniband-diags/man/common/opt_D.rst
similarity index 100%
rename from ibdiags/doc/rst/common/opt_D.rst
rename to infiniband-diags/man/common/opt_D.rst
diff --git a/ibdiags/doc/rst/common/opt_D_with_param.rst b/infiniband-diags/man/common/opt_D_with_param.rst
similarity index 100%
rename from ibdiags/doc/rst/common/opt_D_with_param.rst
rename to infiniband-diags/man/common/opt_D_with_param.rst
diff --git a/ibdiags/doc/rst/common/opt_G.rst b/infiniband-diags/man/common/opt_G.rst
similarity index 100%
rename from ibdiags/doc/rst/common/opt_G.rst
rename to infiniband-diags/man/common/opt_G.rst
diff --git a/ibdiags/doc/rst/common/opt_G_with_param.rst b/infiniband-diags/man/common/opt_G_with_param.rst
similarity index 100%
rename from ibdiags/doc/rst/common/opt_G_with_param.rst
rename to infiniband-diags/man/common/opt_G_with_param.rst
diff --git a/ibdiags/doc/rst/common/opt_K.rst b/infiniband-diags/man/common/opt_K.rst
similarity index 100%
rename from ibdiags/doc/rst/common/opt_K.rst
rename to infiniband-diags/man/common/opt_K.rst
diff --git a/ibdiags/doc/rst/common/opt_L.rst b/infiniband-diags/man/common/opt_L.rst
similarity index 100%
rename from ibdiags/doc/rst/common/opt_L.rst
rename to infiniband-diags/man/common/opt_L.rst
diff --git a/ibdiags/doc/rst/common/opt_P.rst b/infiniband-diags/man/common/opt_P.rst
similarity index 100%
rename from ibdiags/doc/rst/common/opt_P.rst
rename to infiniband-diags/man/common/opt_P.rst
diff --git a/ibdiags/doc/rst/common/opt_V.rst b/infiniband-diags/man/common/opt_V.rst
similarity index 100%
rename from ibdiags/doc/rst/common/opt_V.rst
rename to infiniband-diags/man/common/opt_V.rst
diff --git a/ibdiags/doc/rst/common/opt_cache.rst b/infiniband-diags/man/common/opt_cache.rst
similarity index 100%
rename from ibdiags/doc/rst/common/opt_cache.rst
rename to infiniband-diags/man/common/opt_cache.rst
diff --git a/ibdiags/doc/rst/common/opt_d.rst b/infiniband-diags/man/common/opt_d.rst
similarity index 100%
rename from ibdiags/doc/rst/common/opt_d.rst
rename to infiniband-diags/man/common/opt_d.rst
diff --git a/ibdiags/doc/rst/common/opt_diff.rst b/infiniband-diags/man/common/opt_diff.rst
similarity index 100%
rename from ibdiags/doc/rst/common/opt_diff.rst
rename to infiniband-diags/man/common/opt_diff.rst
diff --git a/ibdiags/doc/rst/common/opt_diffcheck.rst b/infiniband-diags/man/common/opt_diffcheck.rst
similarity index 100%
rename from ibdiags/doc/rst/common/opt_diffcheck.rst
rename to infiniband-diags/man/common/opt_diffcheck.rst
diff --git a/ibdiags/doc/rst/common/opt_e.rst b/infiniband-diags/man/common/opt_e.rst
similarity index 100%
rename from ibdiags/doc/rst/common/opt_e.rst
rename to infiniband-diags/man/common/opt_e.rst
diff --git a/ibdiags/doc/rst/common/opt_h.rst b/infiniband-diags/man/common/opt_h.rst
similarity index 100%
rename from ibdiags/doc/rst/common/opt_h.rst
rename to infiniband-diags/man/common/opt_h.rst
diff --git a/ibdiags/doc/rst/common/opt_load-cache.rst b/infiniband-diags/man/common/opt_load-cache.rst
similarity index 100%
rename from ibdiags/doc/rst/common/opt_load-cache.rst
rename to infiniband-diags/man/common/opt_load-cache.rst
diff --git a/ibdiags/doc/rst/common/opt_node_name_map.rst b/infiniband-diags/man/common/opt_node_name_map.rst
similarity index 100%
rename from ibdiags/doc/rst/common/opt_node_name_map.rst
rename to infiniband-diags/man/common/opt_node_name_map.rst
diff --git a/ibdiags/doc/rst/common/opt_o-outstanding_smps.rst b/infiniband-diags/man/common/opt_o-outstanding_smps.rst
similarity index 100%
rename from ibdiags/doc/rst/common/opt_o-outstanding_smps.rst
rename to infiniband-diags/man/common/opt_o-outstanding_smps.rst
diff --git a/ibdiags/doc/rst/common/opt_ports-file.rst b/infiniband-diags/man/common/opt_ports-file.rst
similarity index 100%
rename from ibdiags/doc/rst/common/opt_ports-file.rst
rename to infiniband-diags/man/common/opt_ports-file.rst
diff --git a/ibdiags/doc/rst/common/opt_s.rst b/infiniband-diags/man/common/opt_s.rst
similarity index 100%
rename from ibdiags/doc/rst/common/opt_s.rst
rename to infiniband-diags/man/common/opt_s.rst
diff --git a/ibdiags/doc/rst/common/opt_t.rst b/infiniband-diags/man/common/opt_t.rst
similarity index 100%
rename from ibdiags/doc/rst/common/opt_t.rst
rename to infiniband-diags/man/common/opt_t.rst
diff --git a/ibdiags/doc/rst/common/opt_v.rst b/infiniband-diags/man/common/opt_v.rst
similarity index 100%
rename from ibdiags/doc/rst/common/opt_v.rst
rename to infiniband-diags/man/common/opt_v.rst
diff --git a/ibdiags/doc/rst/common/opt_y.rst b/infiniband-diags/man/common/opt_y.rst
similarity index 100%
rename from ibdiags/doc/rst/common/opt_y.rst
rename to infiniband-diags/man/common/opt_y.rst
diff --git a/ibdiags/doc/rst/common/opt_z-config.rst b/infiniband-diags/man/common/opt_z-config.rst
similarity index 100%
rename from ibdiags/doc/rst/common/opt_z-config.rst
rename to infiniband-diags/man/common/opt_z-config.rst
diff --git a/ibdiags/doc/rst/common/sec_config-file.rst b/infiniband-diags/man/common/sec_config-file.rst
similarity index 100%
rename from ibdiags/doc/rst/common/sec_config-file.rst
rename to infiniband-diags/man/common/sec_config-file.rst
diff --git a/ibdiags/doc/rst/common/sec_node-name-map.rst b/infiniband-diags/man/common/sec_node-name-map.rst
similarity index 100%
rename from ibdiags/doc/rst/common/sec_node-name-map.rst
rename to infiniband-diags/man/common/sec_node-name-map.rst
diff --git a/ibdiags/doc/rst/common/sec_ports-file.rst b/infiniband-diags/man/common/sec_ports-file.rst
similarity index 100%
rename from ibdiags/doc/rst/common/sec_ports-file.rst
rename to infiniband-diags/man/common/sec_ports-file.rst
diff --git a/ibdiags/doc/rst/common/sec_portselection.rst b/infiniband-diags/man/common/sec_portselection.rst
similarity index 100%
rename from ibdiags/doc/rst/common/sec_portselection.rst
rename to infiniband-diags/man/common/sec_portselection.rst
diff --git a/ibdiags/doc/rst/common/sec_topology-file.rst b/infiniband-diags/man/common/sec_topology-file.rst
similarity index 100%
rename from ibdiags/doc/rst/common/sec_topology-file.rst
rename to infiniband-diags/man/common/sec_topology-file.rst
diff --git a/ibdiags/doc/rst/dump_fts.8.in.rst b/infiniband-diags/man/dump_fts.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/dump_fts.8.in.rst
rename to infiniband-diags/man/dump_fts.8.in.rst
diff --git a/ibdiags/doc/rst/ibaddr.8.in.rst b/infiniband-diags/man/ibaddr.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/ibaddr.8.in.rst
rename to infiniband-diags/man/ibaddr.8.in.rst
diff --git a/ibdiags/doc/rst/ibcacheedit.8.in.rst b/infiniband-diags/man/ibcacheedit.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/ibcacheedit.8.in.rst
rename to infiniband-diags/man/ibcacheedit.8.in.rst
diff --git a/ibdiags/doc/rst/ibccconfig.8.in.rst b/infiniband-diags/man/ibccconfig.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/ibccconfig.8.in.rst
rename to infiniband-diags/man/ibccconfig.8.in.rst
diff --git a/ibdiags/doc/rst/ibccquery.8.in.rst b/infiniband-diags/man/ibccquery.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/ibccquery.8.in.rst
rename to infiniband-diags/man/ibccquery.8.in.rst
diff --git a/ibdiags/man/ibcheckerrors.8 b/infiniband-diags/man/ibcheckerrors.8
similarity index 100%
rename from ibdiags/man/ibcheckerrors.8
rename to infiniband-diags/man/ibcheckerrors.8
diff --git a/ibdiags/man/ibcheckerrs.8 b/infiniband-diags/man/ibcheckerrs.8
similarity index 100%
rename from ibdiags/man/ibcheckerrs.8
rename to infiniband-diags/man/ibcheckerrs.8
diff --git a/ibdiags/man/ibchecknet.8 b/infiniband-diags/man/ibchecknet.8
similarity index 100%
rename from ibdiags/man/ibchecknet.8
rename to infiniband-diags/man/ibchecknet.8
diff --git a/ibdiags/man/ibchecknode.8 b/infiniband-diags/man/ibchecknode.8
similarity index 100%
rename from ibdiags/man/ibchecknode.8
rename to infiniband-diags/man/ibchecknode.8
diff --git a/ibdiags/man/ibcheckport.8 b/infiniband-diags/man/ibcheckport.8
similarity index 100%
rename from ibdiags/man/ibcheckport.8
rename to infiniband-diags/man/ibcheckport.8
diff --git a/ibdiags/man/ibcheckportstate.8 b/infiniband-diags/man/ibcheckportstate.8
similarity index 100%
rename from ibdiags/man/ibcheckportstate.8
rename to infiniband-diags/man/ibcheckportstate.8
diff --git a/ibdiags/man/ibcheckportwidth.8 b/infiniband-diags/man/ibcheckportwidth.8
similarity index 100%
rename from ibdiags/man/ibcheckportwidth.8
rename to infiniband-diags/man/ibcheckportwidth.8
diff --git a/ibdiags/man/ibcheckstate.8 b/infiniband-diags/man/ibcheckstate.8
similarity index 100%
rename from ibdiags/man/ibcheckstate.8
rename to infiniband-diags/man/ibcheckstate.8
diff --git a/ibdiags/man/ibcheckwidth.8 b/infiniband-diags/man/ibcheckwidth.8
similarity index 100%
rename from ibdiags/man/ibcheckwidth.8
rename to infiniband-diags/man/ibcheckwidth.8
diff --git a/ibdiags/man/ibclearcounters.8 b/infiniband-diags/man/ibclearcounters.8
similarity index 100%
rename from ibdiags/man/ibclearcounters.8
rename to infiniband-diags/man/ibclearcounters.8
diff --git a/ibdiags/man/ibclearerrors.8 b/infiniband-diags/man/ibclearerrors.8
similarity index 100%
rename from ibdiags/man/ibclearerrors.8
rename to infiniband-diags/man/ibclearerrors.8
diff --git a/ibdiags/man/ibdatacounters.8 b/infiniband-diags/man/ibdatacounters.8
similarity index 100%
rename from ibdiags/man/ibdatacounters.8
rename to infiniband-diags/man/ibdatacounters.8
diff --git a/ibdiags/man/ibdatacounts.8 b/infiniband-diags/man/ibdatacounts.8
similarity index 100%
rename from ibdiags/man/ibdatacounts.8
rename to infiniband-diags/man/ibdatacounts.8
diff --git a/ibdiags/man/ibdiscover.8 b/infiniband-diags/man/ibdiscover.8
similarity index 100%
rename from ibdiags/man/ibdiscover.8
rename to infiniband-diags/man/ibdiscover.8
diff --git a/ibdiags/doc/rst/ibfindnodesusing.8.in.rst b/infiniband-diags/man/ibfindnodesusing.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/ibfindnodesusing.8.in.rst
rename to infiniband-diags/man/ibfindnodesusing.8.in.rst
diff --git a/ibdiags/doc/rst/ibhosts.8.in.rst b/infiniband-diags/man/ibhosts.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/ibhosts.8.in.rst
rename to infiniband-diags/man/ibhosts.8.in.rst
diff --git a/ibdiags/doc/rst/ibidsverify.8.in.rst b/infiniband-diags/man/ibidsverify.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/ibidsverify.8.in.rst
rename to infiniband-diags/man/ibidsverify.8.in.rst
diff --git a/ibdiags/doc/rst/iblinkinfo.8.in.rst b/infiniband-diags/man/iblinkinfo.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/iblinkinfo.8.in.rst
rename to infiniband-diags/man/iblinkinfo.8.in.rst
diff --git a/ibdiags/doc/rst/ibnetdiscover.8.in.rst b/infiniband-diags/man/ibnetdiscover.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/ibnetdiscover.8.in.rst
rename to infiniband-diags/man/ibnetdiscover.8.in.rst
diff --git a/ibdiags/doc/rst/ibnodes.8.in.rst b/infiniband-diags/man/ibnodes.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/ibnodes.8.in.rst
rename to infiniband-diags/man/ibnodes.8.in.rst
diff --git a/ibdiags/doc/rst/ibping.8.in.rst b/infiniband-diags/man/ibping.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/ibping.8.in.rst
rename to infiniband-diags/man/ibping.8.in.rst
diff --git a/ibdiags/doc/rst/ibportstate.8.in.rst b/infiniband-diags/man/ibportstate.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/ibportstate.8.in.rst
rename to infiniband-diags/man/ibportstate.8.in.rst
diff --git a/ibdiags/man/ibprintca.8 b/infiniband-diags/man/ibprintca.8
similarity index 100%
rename from ibdiags/man/ibprintca.8
rename to infiniband-diags/man/ibprintca.8
diff --git a/ibdiags/man/ibprintrt.8 b/infiniband-diags/man/ibprintrt.8
similarity index 100%
rename from ibdiags/man/ibprintrt.8
rename to infiniband-diags/man/ibprintrt.8
diff --git a/ibdiags/man/ibprintswitch.8 b/infiniband-diags/man/ibprintswitch.8
similarity index 100%
rename from ibdiags/man/ibprintswitch.8
rename to infiniband-diags/man/ibprintswitch.8
diff --git a/ibdiags/doc/rst/ibqueryerrors.8.in.rst b/infiniband-diags/man/ibqueryerrors.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/ibqueryerrors.8.in.rst
rename to infiniband-diags/man/ibqueryerrors.8.in.rst
diff --git a/ibdiags/doc/rst/ibroute.8.in.rst b/infiniband-diags/man/ibroute.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/ibroute.8.in.rst
rename to infiniband-diags/man/ibroute.8.in.rst
diff --git a/ibdiags/doc/rst/ibrouters.8.in.rst b/infiniband-diags/man/ibrouters.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/ibrouters.8.in.rst
rename to infiniband-diags/man/ibrouters.8.in.rst
diff --git a/ibdiags/doc/rst/ibstat.8.in.rst b/infiniband-diags/man/ibstat.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/ibstat.8.in.rst
rename to infiniband-diags/man/ibstat.8.in.rst
diff --git a/ibdiags/doc/rst/ibstatus.8.in.rst b/infiniband-diags/man/ibstatus.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/ibstatus.8.in.rst
rename to infiniband-diags/man/ibstatus.8.in.rst
diff --git a/ibdiags/doc/rst/ibswitches.8.in.rst b/infiniband-diags/man/ibswitches.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/ibswitches.8.in.rst
rename to infiniband-diags/man/ibswitches.8.in.rst
diff --git a/ibdiags/man/ibswportwatch.8 b/infiniband-diags/man/ibswportwatch.8
similarity index 100%
rename from ibdiags/man/ibswportwatch.8
rename to infiniband-diags/man/ibswportwatch.8
diff --git a/ibdiags/doc/rst/ibsysstat.8.in.rst b/infiniband-diags/man/ibsysstat.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/ibsysstat.8.in.rst
rename to infiniband-diags/man/ibsysstat.8.in.rst
diff --git a/ibdiags/doc/rst/ibtracert.8.in.rst b/infiniband-diags/man/ibtracert.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/ibtracert.8.in.rst
rename to infiniband-diags/man/ibtracert.8.in.rst
diff --git a/ibdiags/doc/rst/infiniband-diags.8.in.rst b/infiniband-diags/man/infiniband-diags.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/infiniband-diags.8.in.rst
rename to infiniband-diags/man/infiniband-diags.8.in.rst
diff --git a/ibdiags/doc/rst/perfquery.8.in.rst b/infiniband-diags/man/perfquery.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/perfquery.8.in.rst
rename to infiniband-diags/man/perfquery.8.in.rst
diff --git a/ibdiags/doc/rst/saquery.8.in.rst b/infiniband-diags/man/saquery.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/saquery.8.in.rst
rename to infiniband-diags/man/saquery.8.in.rst
diff --git a/ibdiags/doc/rst/sminfo.8.in.rst b/infiniband-diags/man/sminfo.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/sminfo.8.in.rst
rename to infiniband-diags/man/sminfo.8.in.rst
diff --git a/ibdiags/doc/rst/smpdump.8.in.rst b/infiniband-diags/man/smpdump.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/smpdump.8.in.rst
rename to infiniband-diags/man/smpdump.8.in.rst
diff --git a/ibdiags/doc/rst/smpquery.8.in.rst b/infiniband-diags/man/smpquery.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/smpquery.8.in.rst
rename to infiniband-diags/man/smpquery.8.in.rst
diff --git a/ibdiags/doc/rst/vendstat.8.in.rst b/infiniband-diags/man/vendstat.8.in.rst
similarity index 100%
rename from ibdiags/doc/rst/vendstat.8.in.rst
rename to infiniband-diags/man/vendstat.8.in.rst
diff --git a/ibdiags/src/mcm_rereg_test.c b/infiniband-diags/mcm_rereg_test.c
similarity index 100%
rename from ibdiags/src/mcm_rereg_test.c
rename to infiniband-diags/mcm_rereg_test.c
diff --git a/ibdiags/src/perfquery.c b/infiniband-diags/perfquery.c
similarity index 100%
rename from ibdiags/src/perfquery.c
rename to infiniband-diags/perfquery.c
diff --git a/ibdiags/src/saquery.c b/infiniband-diags/saquery.c
similarity index 100%
rename from ibdiags/src/saquery.c
rename to infiniband-diags/saquery.c
diff --git a/ibdiags/scripts/CMakeLists.txt b/infiniband-diags/scripts/CMakeLists.txt
similarity index 96%
rename from ibdiags/scripts/CMakeLists.txt
rename to infiniband-diags/scripts/CMakeLists.txt
index 3d65ed837a2d83..ae4dcc5b7d9cbe 100644
--- a/ibdiags/scripts/CMakeLists.txt
+++ b/infiniband-diags/scripts/CMakeLists.txt
@@ -84,11 +84,6 @@ rdma_sbin_perl_program(
 install(FILES "IBswcountlimits.pm"
   DESTINATION "${CMAKE_INSTALL_PERLDIR}")
 
-install(FILES
-  "../etc/error_thresholds"
-  "../etc/ibdiag.conf"
-  DESTINATION "${IBDIAG_CONFIG_PATH}")
-
 if (WITH_IBDIAGS_COMPAT)
   rdma_sbin_shell_program(
     ibcheckerrors.in
diff --git a/ibdiags/scripts/IBswcountlimits.pm b/infiniband-diags/scripts/IBswcountlimits.pm
similarity index 100%
rename from ibdiags/scripts/IBswcountlimits.pm
rename to infiniband-diags/scripts/IBswcountlimits.pm
diff --git a/ibdiags/scripts/check_lft_balance.pl b/infiniband-diags/scripts/check_lft_balance.pl
similarity index 100%
rename from ibdiags/scripts/check_lft_balance.pl
rename to infiniband-diags/scripts/check_lft_balance.pl
diff --git a/ibdiags/scripts/dump_lfts.sh.in b/infiniband-diags/scripts/dump_lfts.sh.in
similarity index 100%
rename from ibdiags/scripts/dump_lfts.sh.in
rename to infiniband-diags/scripts/dump_lfts.sh.in
diff --git a/ibdiags/scripts/dump_mfts.sh.in b/infiniband-diags/scripts/dump_mfts.sh.in
similarity index 100%
rename from ibdiags/scripts/dump_mfts.sh.in
rename to infiniband-diags/scripts/dump_mfts.sh.in
diff --git a/ibdiags/scripts/ibcheckerrors.in b/infiniband-diags/scripts/ibcheckerrors.in
similarity index 100%
rename from ibdiags/scripts/ibcheckerrors.in
rename to infiniband-diags/scripts/ibcheckerrors.in
diff --git a/ibdiags/scripts/ibcheckerrs.in b/infiniband-diags/scripts/ibcheckerrs.in
similarity index 100%
rename from ibdiags/scripts/ibcheckerrs.in
rename to infiniband-diags/scripts/ibcheckerrs.in
diff --git a/ibdiags/scripts/ibchecknet.in b/infiniband-diags/scripts/ibchecknet.in
similarity index 100%
rename from ibdiags/scripts/ibchecknet.in
rename to infiniband-diags/scripts/ibchecknet.in
diff --git a/ibdiags/scripts/ibchecknode.in b/infiniband-diags/scripts/ibchecknode.in
similarity index 100%
rename from ibdiags/scripts/ibchecknode.in
rename to infiniband-diags/scripts/ibchecknode.in
diff --git a/ibdiags/scripts/ibcheckport.in b/infiniband-diags/scripts/ibcheckport.in
similarity index 100%
rename from ibdiags/scripts/ibcheckport.in
rename to infiniband-diags/scripts/ibcheckport.in
diff --git a/ibdiags/scripts/ibcheckportstate.in b/infiniband-diags/scripts/ibcheckportstate.in
similarity index 100%
rename from ibdiags/scripts/ibcheckportstate.in
rename to infiniband-diags/scripts/ibcheckportstate.in
diff --git a/ibdiags/scripts/ibcheckportwidth.in b/infiniband-diags/scripts/ibcheckportwidth.in
similarity index 100%
rename from ibdiags/scripts/ibcheckportwidth.in
rename to infiniband-diags/scripts/ibcheckportwidth.in
diff --git a/ibdiags/scripts/ibcheckstate.in b/infiniband-diags/scripts/ibcheckstate.in
similarity index 100%
rename from ibdiags/scripts/ibcheckstate.in
rename to infiniband-diags/scripts/ibcheckstate.in
diff --git a/ibdiags/scripts/ibcheckwidth.in b/infiniband-diags/scripts/ibcheckwidth.in
similarity index 100%
rename from ibdiags/scripts/ibcheckwidth.in
rename to infiniband-diags/scripts/ibcheckwidth.in
diff --git a/ibdiags/scripts/ibclearcounters.in b/infiniband-diags/scripts/ibclearcounters.in
similarity index 100%
rename from ibdiags/scripts/ibclearcounters.in
rename to infiniband-diags/scripts/ibclearcounters.in
diff --git a/ibdiags/scripts/ibclearerrors.in b/infiniband-diags/scripts/ibclearerrors.in
similarity index 100%
rename from ibdiags/scripts/ibclearerrors.in
rename to infiniband-diags/scripts/ibclearerrors.in
diff --git a/ibdiags/scripts/ibdatacounters.in b/infiniband-diags/scripts/ibdatacounters.in
similarity index 100%
rename from ibdiags/scripts/ibdatacounters.in
rename to infiniband-diags/scripts/ibdatacounters.in
diff --git a/ibdiags/scripts/ibdatacounts.in b/infiniband-diags/scripts/ibdatacounts.in
similarity index 100%
rename from ibdiags/scripts/ibdatacounts.in
rename to infiniband-diags/scripts/ibdatacounts.in
diff --git a/ibdiags/scripts/ibdiscover.map b/infiniband-diags/scripts/ibdiscover.map
similarity index 100%
rename from ibdiags/scripts/ibdiscover.map
rename to infiniband-diags/scripts/ibdiscover.map
diff --git a/ibdiags/scripts/ibdiscover.pl b/infiniband-diags/scripts/ibdiscover.pl
similarity index 100%
rename from ibdiags/scripts/ibdiscover.pl
rename to infiniband-diags/scripts/ibdiscover.pl
diff --git a/ibdiags/scripts/ibfindnodesusing.pl b/infiniband-diags/scripts/ibfindnodesusing.pl
similarity index 100%
rename from ibdiags/scripts/ibfindnodesusing.pl
rename to infiniband-diags/scripts/ibfindnodesusing.pl
diff --git a/ibdiags/scripts/ibhosts.in b/infiniband-diags/scripts/ibhosts.in
similarity index 100%
rename from ibdiags/scripts/ibhosts.in
rename to infiniband-diags/scripts/ibhosts.in
diff --git a/ibdiags/scripts/ibidsverify.pl b/infiniband-diags/scripts/ibidsverify.pl
similarity index 100%
rename from ibdiags/scripts/ibidsverify.pl
rename to infiniband-diags/scripts/ibidsverify.pl
diff --git a/ibdiags/scripts/iblinkinfo.pl.in b/infiniband-diags/scripts/iblinkinfo.pl.in
similarity index 100%
rename from ibdiags/scripts/iblinkinfo.pl.in
rename to infiniband-diags/scripts/iblinkinfo.pl.in
diff --git a/ibdiags/scripts/ibnodes.in b/infiniband-diags/scripts/ibnodes.in
similarity index 100%
rename from ibdiags/scripts/ibnodes.in
rename to infiniband-diags/scripts/ibnodes.in
diff --git a/ibdiags/scripts/ibprintca.pl b/infiniband-diags/scripts/ibprintca.pl
similarity index 100%
rename from ibdiags/scripts/ibprintca.pl
rename to infiniband-diags/scripts/ibprintca.pl
diff --git a/ibdiags/scripts/ibprintrt.pl b/infiniband-diags/scripts/ibprintrt.pl
similarity index 100%
rename from ibdiags/scripts/ibprintrt.pl
rename to infiniband-diags/scripts/ibprintrt.pl
diff --git a/ibdiags/scripts/ibprintswitch.pl b/infiniband-diags/scripts/ibprintswitch.pl
similarity index 100%
rename from ibdiags/scripts/ibprintswitch.pl
rename to infiniband-diags/scripts/ibprintswitch.pl
diff --git a/ibdiags/scripts/ibqueryerrors.pl.in b/infiniband-diags/scripts/ibqueryerrors.pl.in
similarity index 100%
rename from ibdiags/scripts/ibqueryerrors.pl.in
rename to infiniband-diags/scripts/ibqueryerrors.pl.in
diff --git a/ibdiags/scripts/ibrouters.in b/infiniband-diags/scripts/ibrouters.in
similarity index 100%
rename from ibdiags/scripts/ibrouters.in
rename to infiniband-diags/scripts/ibrouters.in
diff --git a/ibdiags/scripts/ibstatus b/infiniband-diags/scripts/ibstatus
similarity index 100%
rename from ibdiags/scripts/ibstatus
rename to infiniband-diags/scripts/ibstatus
diff --git a/ibdiags/scripts/ibswitches.in b/infiniband-diags/scripts/ibswitches.in
similarity index 100%
rename from ibdiags/scripts/ibswitches.in
rename to infiniband-diags/scripts/ibswitches.in
diff --git a/ibdiags/scripts/ibswportwatch.pl b/infiniband-diags/scripts/ibswportwatch.pl
similarity index 100%
rename from ibdiags/scripts/ibswportwatch.pl
rename to infiniband-diags/scripts/ibswportwatch.pl
diff --git a/ibdiags/scripts/set_nodedesc.sh b/infiniband-diags/scripts/set_nodedesc.sh
similarity index 100%
rename from ibdiags/scripts/set_nodedesc.sh
rename to infiniband-diags/scripts/set_nodedesc.sh
diff --git a/ibdiags/src/sminfo.c b/infiniband-diags/sminfo.c
similarity index 100%
rename from ibdiags/src/sminfo.c
rename to infiniband-diags/sminfo.c
diff --git a/ibdiags/src/smpdump.c b/infiniband-diags/smpdump.c
similarity index 100%
rename from ibdiags/src/smpdump.c
rename to infiniband-diags/smpdump.c
diff --git a/ibdiags/src/smpquery.c b/infiniband-diags/smpquery.c
similarity index 100%
rename from ibdiags/src/smpquery.c
rename to infiniband-diags/smpquery.c
diff --git a/ibdiags/src/vendstat.c b/infiniband-diags/vendstat.c
similarity index 100%
rename from ibdiags/src/vendstat.c
rename to infiniband-diags/vendstat.c
