diff --git a/ipmitool/AUTHORS b/AUTHORS
similarity index 100%
rename from ipmitool/AUTHORS
rename to AUTHORS
diff --git a/ipmitool/COPYING b/COPYING
similarity index 100%
rename from ipmitool/COPYING
rename to COPYING
diff --git a/ipmitool/ChangeLog b/ChangeLog
similarity index 100%
rename from ipmitool/ChangeLog
rename to ChangeLog
diff --git a/ipmitool/Makefile.am b/Makefile.am
similarity index 100%
rename from ipmitool/Makefile.am
rename to Makefile.am
diff --git a/ipmitool/README b/README
similarity index 100%
rename from ipmitool/README
rename to README
diff --git a/ipmitool/bootstrap b/bootstrap
similarity index 100%
rename from ipmitool/bootstrap
rename to bootstrap
diff --git a/ipmitool/configure.in b/configure.in
similarity index 100%
rename from ipmitool/configure.in
rename to configure.in
diff --git a/ipmitool/contrib/Makefile.am b/contrib/Makefile.am
similarity index 100%
rename from ipmitool/contrib/Makefile.am
rename to contrib/Makefile.am
diff --git a/ipmitool/contrib/README b/contrib/README
similarity index 100%
rename from ipmitool/contrib/README
rename to contrib/README
diff --git a/ipmitool/contrib/bmc-snmp-proxy b/contrib/bmc-snmp-proxy
similarity index 100%
rename from ipmitool/contrib/bmc-snmp-proxy
rename to contrib/bmc-snmp-proxy
diff --git a/ipmitool/contrib/bmc-snmp-proxy.service b/contrib/bmc-snmp-proxy.service
similarity index 100%
rename from ipmitool/contrib/bmc-snmp-proxy.service
rename to contrib/bmc-snmp-proxy.service
diff --git a/ipmitool/contrib/bmc-snmp-proxy.sysconf b/contrib/bmc-snmp-proxy.sysconf
similarity index 100%
rename from ipmitool/contrib/bmc-snmp-proxy.sysconf
rename to contrib/bmc-snmp-proxy.sysconf
diff --git a/ipmitool/contrib/bmclanconf b/contrib/bmclanconf
similarity index 100%
rename from ipmitool/contrib/bmclanconf
rename to contrib/bmclanconf
diff --git a/ipmitool/contrib/collect_data.sh b/contrib/collect_data.sh
similarity index 100%
rename from ipmitool/contrib/collect_data.sh
rename to contrib/collect_data.sh
diff --git a/ipmitool/contrib/create_rrds.sh b/contrib/create_rrds.sh
similarity index 100%
rename from ipmitool/contrib/create_rrds.sh
rename to contrib/create_rrds.sh
diff --git a/ipmitool/contrib/create_webpage.sh b/contrib/create_webpage.sh
similarity index 100%
rename from ipmitool/contrib/create_webpage.sh
rename to contrib/create_webpage.sh
diff --git a/ipmitool/contrib/create_webpage_compact.sh b/contrib/create_webpage_compact.sh
similarity index 100%
rename from ipmitool/contrib/create_webpage_compact.sh
rename to contrib/create_webpage_compact.sh
diff --git a/ipmitool/contrib/exchange-bmc-os-info.init.redhat b/contrib/exchange-bmc-os-info.init.redhat
similarity index 100%
rename from ipmitool/contrib/exchange-bmc-os-info.init.redhat
rename to contrib/exchange-bmc-os-info.init.redhat
diff --git a/ipmitool/contrib/exchange-bmc-os-info.service.redhat b/contrib/exchange-bmc-os-info.service.redhat
similarity index 100%
rename from ipmitool/contrib/exchange-bmc-os-info.service.redhat
rename to contrib/exchange-bmc-os-info.service.redhat
diff --git a/ipmitool/contrib/exchange-bmc-os-info.sysconf b/contrib/exchange-bmc-os-info.sysconf
similarity index 100%
rename from ipmitool/contrib/exchange-bmc-os-info.sysconf
rename to contrib/exchange-bmc-os-info.sysconf
diff --git a/ipmitool/contrib/ipmi.init.basic b/contrib/ipmi.init.basic
similarity index 100%
rename from ipmitool/contrib/ipmi.init.basic
rename to contrib/ipmi.init.basic
diff --git a/ipmitool/contrib/ipmi.init.redhat b/contrib/ipmi.init.redhat
similarity index 100%
rename from ipmitool/contrib/ipmi.init.redhat
rename to contrib/ipmi.init.redhat
diff --git a/ipmitool/contrib/ipmievd.init.debian b/contrib/ipmievd.init.debian
similarity index 100%
rename from ipmitool/contrib/ipmievd.init.debian
rename to contrib/ipmievd.init.debian
diff --git a/ipmitool/contrib/ipmievd.init.redhat b/contrib/ipmievd.init.redhat
similarity index 100%
rename from ipmitool/contrib/ipmievd.init.redhat
rename to contrib/ipmievd.init.redhat
diff --git a/ipmitool/contrib/ipmievd.init.suse b/contrib/ipmievd.init.suse
similarity index 100%
rename from ipmitool/contrib/ipmievd.init.suse
rename to contrib/ipmievd.init.suse
diff --git a/ipmitool/contrib/oem_ibm_sel_map b/contrib/oem_ibm_sel_map
similarity index 100%
rename from ipmitool/contrib/oem_ibm_sel_map
rename to contrib/oem_ibm_sel_map
diff --git a/ipmitool/control/Makefile.am b/control/Makefile.am
similarity index 100%
rename from ipmitool/control/Makefile.am
rename to control/Makefile.am
diff --git a/ipmitool/control/ipmitool.spec.in b/control/ipmitool.spec.in
similarity index 100%
rename from ipmitool/control/ipmitool.spec.in
rename to control/ipmitool.spec.in
diff --git a/ipmitool/control/pkginfo.in b/control/pkginfo.in
similarity index 100%
rename from ipmitool/control/pkginfo.in
rename to control/pkginfo.in
diff --git a/ipmitool/control/prototype.in b/control/prototype.in
similarity index 100%
rename from ipmitool/control/prototype.in
rename to control/prototype.in
diff --git a/ipmitool/control/rpmmacros.in b/control/rpmmacros.in
similarity index 100%
rename from ipmitool/control/rpmmacros.in
rename to control/rpmmacros.in
diff --git a/ipmitool/control/rpmrc b/control/rpmrc
similarity index 100%
rename from ipmitool/control/rpmrc
rename to control/rpmrc
diff --git a/ipmitool/debian/README.Debian b/debian/README.Debian
similarity index 100%
rename from ipmitool/debian/README.Debian
rename to debian/README.Debian
diff --git a/ipmitool/debian/changelog b/debian/changelog
similarity index 100%
rename from ipmitool/debian/changelog
rename to debian/changelog
diff --git a/ipmitool/debian/control b/debian/control
similarity index 100%
rename from ipmitool/debian/control
rename to debian/control
diff --git a/ipmitool/debian/copyright b/debian/copyright
similarity index 100%
rename from ipmitool/debian/copyright
rename to debian/copyright
diff --git a/ipmitool/debian/dirs b/debian/dirs
similarity index 100%
rename from ipmitool/debian/dirs
rename to debian/dirs
diff --git a/ipmitool/debian/docs b/debian/docs
similarity index 100%
rename from ipmitool/debian/docs
rename to debian/docs
diff --git a/ipmitool/debian/ipmitool.ipmievd.init b/debian/ipmitool.ipmievd.init
similarity index 100%
rename from ipmitool/debian/ipmitool.ipmievd.init
rename to debian/ipmitool.ipmievd.init
diff --git a/ipmitool/debian/rules b/debian/rules
similarity index 100%
rename from ipmitool/debian/rules
rename to debian/rules
diff --git a/ipmitool/debian/watch b/debian/watch
similarity index 100%
rename from ipmitool/debian/watch
rename to debian/watch
diff --git a/ipmitool/doc/Makefile.am b/doc/Makefile.am
similarity index 100%
rename from ipmitool/doc/Makefile.am
rename to doc/Makefile.am
diff --git a/ipmitool/doc/ipmievd.8 b/doc/ipmievd.8
similarity index 100%
rename from ipmitool/doc/ipmievd.8
rename to doc/ipmievd.8
diff --git a/ipmitool/doc/ipmitool.1 b/doc/ipmitool.1
similarity index 100%
rename from ipmitool/doc/ipmitool.1
rename to doc/ipmitool.1
diff --git a/ipmitool/include/Makefile.am b/include/Makefile.am
similarity index 100%
rename from ipmitool/include/Makefile.am
rename to include/Makefile.am
diff --git a/ipmitool/include/ipmitool/Makefile.am b/include/ipmitool/Makefile.am
similarity index 100%
rename from ipmitool/include/ipmitool/Makefile.am
rename to include/ipmitool/Makefile.am
diff --git a/ipmitool/include/ipmitool/bswap.h b/include/ipmitool/bswap.h
similarity index 100%
rename from ipmitool/include/ipmitool/bswap.h
rename to include/ipmitool/bswap.h
diff --git a/ipmitool/include/ipmitool/helper.h b/include/ipmitool/helper.h
similarity index 100%
rename from ipmitool/include/ipmitool/helper.h
rename to include/ipmitool/helper.h
diff --git a/ipmitool/include/ipmitool/ipmi.h b/include/ipmitool/ipmi.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi.h
rename to include/ipmitool/ipmi.h
diff --git a/ipmitool/include/ipmitool/ipmi_cc.h b/include/ipmitool/ipmi_cc.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_cc.h
rename to include/ipmitool/ipmi_cc.h
diff --git a/ipmitool/include/ipmitool/ipmi_channel.h b/include/ipmitool/ipmi_channel.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_channel.h
rename to include/ipmitool/ipmi_channel.h
diff --git a/ipmitool/include/ipmitool/ipmi_chassis.h b/include/ipmitool/ipmi_chassis.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_chassis.h
rename to include/ipmitool/ipmi_chassis.h
diff --git a/ipmitool/include/ipmitool/ipmi_constants.h b/include/ipmitool/ipmi_constants.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_constants.h
rename to include/ipmitool/ipmi_constants.h
diff --git a/ipmitool/include/ipmitool/ipmi_dcmi.h b/include/ipmitool/ipmi_dcmi.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_dcmi.h
rename to include/ipmitool/ipmi_dcmi.h
diff --git a/ipmitool/include/ipmitool/ipmi_delloem.h b/include/ipmitool/ipmi_delloem.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_delloem.h
rename to include/ipmitool/ipmi_delloem.h
diff --git a/ipmitool/include/ipmitool/ipmi_ekanalyzer.h b/include/ipmitool/ipmi_ekanalyzer.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_ekanalyzer.h
rename to include/ipmitool/ipmi_ekanalyzer.h
diff --git a/ipmitool/include/ipmitool/ipmi_entity.h b/include/ipmitool/ipmi_entity.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_entity.h
rename to include/ipmitool/ipmi_entity.h
diff --git a/ipmitool/include/ipmitool/ipmi_event.h b/include/ipmitool/ipmi_event.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_event.h
rename to include/ipmitool/ipmi_event.h
diff --git a/ipmitool/include/ipmitool/ipmi_firewall.h b/include/ipmitool/ipmi_firewall.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_firewall.h
rename to include/ipmitool/ipmi_firewall.h
diff --git a/ipmitool/include/ipmitool/ipmi_fru.h b/include/ipmitool/ipmi_fru.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_fru.h
rename to include/ipmitool/ipmi_fru.h
diff --git a/ipmitool/include/ipmitool/ipmi_fwum.h b/include/ipmitool/ipmi_fwum.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_fwum.h
rename to include/ipmitool/ipmi_fwum.h
diff --git a/ipmitool/include/ipmitool/ipmi_gendev.h b/include/ipmitool/ipmi_gendev.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_gendev.h
rename to include/ipmitool/ipmi_gendev.h
diff --git a/ipmitool/include/ipmitool/ipmi_hpmfwupg.h b/include/ipmitool/ipmi_hpmfwupg.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_hpmfwupg.h
rename to include/ipmitool/ipmi_hpmfwupg.h
diff --git a/ipmitool/include/ipmitool/ipmi_ime.h b/include/ipmitool/ipmi_ime.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_ime.h
rename to include/ipmitool/ipmi_ime.h
diff --git a/ipmitool/include/ipmitool/ipmi_intf.h b/include/ipmitool/ipmi_intf.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_intf.h
rename to include/ipmitool/ipmi_intf.h
diff --git a/ipmitool/include/ipmitool/ipmi_isol.h b/include/ipmitool/ipmi_isol.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_isol.h
rename to include/ipmitool/ipmi_isol.h
diff --git a/ipmitool/include/ipmitool/ipmi_kontronoem.h b/include/ipmitool/ipmi_kontronoem.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_kontronoem.h
rename to include/ipmitool/ipmi_kontronoem.h
diff --git a/ipmitool/include/ipmitool/ipmi_lanp.h b/include/ipmitool/ipmi_lanp.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_lanp.h
rename to include/ipmitool/ipmi_lanp.h
diff --git a/ipmitool/include/ipmitool/ipmi_main.h b/include/ipmitool/ipmi_main.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_main.h
rename to include/ipmitool/ipmi_main.h
diff --git a/ipmitool/include/ipmitool/ipmi_mc.h b/include/ipmitool/ipmi_mc.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_mc.h
rename to include/ipmitool/ipmi_mc.h
diff --git a/ipmitool/include/ipmitool/ipmi_oem.h b/include/ipmitool/ipmi_oem.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_oem.h
rename to include/ipmitool/ipmi_oem.h
diff --git a/ipmitool/include/ipmitool/ipmi_pef.h b/include/ipmitool/ipmi_pef.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_pef.h
rename to include/ipmitool/ipmi_pef.h
diff --git a/ipmitool/include/ipmitool/ipmi_picmg.h b/include/ipmitool/ipmi_picmg.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_picmg.h
rename to include/ipmitool/ipmi_picmg.h
diff --git a/ipmitool/include/ipmitool/ipmi_raw.h b/include/ipmitool/ipmi_raw.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_raw.h
rename to include/ipmitool/ipmi_raw.h
diff --git a/ipmitool/include/ipmitool/ipmi_sdr.h b/include/ipmitool/ipmi_sdr.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_sdr.h
rename to include/ipmitool/ipmi_sdr.h
diff --git a/ipmitool/include/ipmitool/ipmi_sdradd.h b/include/ipmitool/ipmi_sdradd.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_sdradd.h
rename to include/ipmitool/ipmi_sdradd.h
diff --git a/ipmitool/include/ipmitool/ipmi_sel.h b/include/ipmitool/ipmi_sel.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_sel.h
rename to include/ipmitool/ipmi_sel.h
diff --git a/ipmitool/include/ipmitool/ipmi_sensor.h b/include/ipmitool/ipmi_sensor.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_sensor.h
rename to include/ipmitool/ipmi_sensor.h
diff --git a/ipmitool/include/ipmitool/ipmi_session.h b/include/ipmitool/ipmi_session.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_session.h
rename to include/ipmitool/ipmi_session.h
diff --git a/ipmitool/include/ipmitool/ipmi_sol.h b/include/ipmitool/ipmi_sol.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_sol.h
rename to include/ipmitool/ipmi_sol.h
diff --git a/ipmitool/include/ipmitool/ipmi_strings.h b/include/ipmitool/ipmi_strings.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_strings.h
rename to include/ipmitool/ipmi_strings.h
diff --git a/ipmitool/include/ipmitool/ipmi_sunoem.h b/include/ipmitool/ipmi_sunoem.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_sunoem.h
rename to include/ipmitool/ipmi_sunoem.h
diff --git a/ipmitool/include/ipmitool/ipmi_tsol.h b/include/ipmitool/ipmi_tsol.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_tsol.h
rename to include/ipmitool/ipmi_tsol.h
diff --git a/ipmitool/include/ipmitool/ipmi_user.h b/include/ipmitool/ipmi_user.h
similarity index 100%
rename from ipmitool/include/ipmitool/ipmi_user.h
rename to include/ipmitool/ipmi_user.h
diff --git a/ipmitool/include/ipmitool/log.h b/include/ipmitool/log.h
similarity index 100%
rename from ipmitool/include/ipmitool/log.h
rename to include/ipmitool/log.h
diff --git a/ipmitool/lib/Makefile.am b/lib/Makefile.am
similarity index 100%
rename from ipmitool/lib/Makefile.am
rename to lib/Makefile.am
diff --git a/ipmitool/lib/dimm_spd.c b/lib/dimm_spd.c
similarity index 100%
rename from ipmitool/lib/dimm_spd.c
rename to lib/dimm_spd.c
diff --git a/ipmitool/lib/helper.c b/lib/helper.c
similarity index 100%
rename from ipmitool/lib/helper.c
rename to lib/helper.c
diff --git a/ipmitool/lib/ipmi_channel.c b/lib/ipmi_channel.c
similarity index 100%
rename from ipmitool/lib/ipmi_channel.c
rename to lib/ipmi_channel.c
diff --git a/ipmitool/lib/ipmi_chassis.c b/lib/ipmi_chassis.c
similarity index 100%
rename from ipmitool/lib/ipmi_chassis.c
rename to lib/ipmi_chassis.c
diff --git a/ipmitool/lib/ipmi_dcmi.c b/lib/ipmi_dcmi.c
similarity index 100%
rename from ipmitool/lib/ipmi_dcmi.c
rename to lib/ipmi_dcmi.c
diff --git a/ipmitool/lib/ipmi_delloem.c b/lib/ipmi_delloem.c
similarity index 100%
rename from ipmitool/lib/ipmi_delloem.c
rename to lib/ipmi_delloem.c
diff --git a/ipmitool/lib/ipmi_ekanalyzer.c b/lib/ipmi_ekanalyzer.c
similarity index 100%
rename from ipmitool/lib/ipmi_ekanalyzer.c
rename to lib/ipmi_ekanalyzer.c
diff --git a/ipmitool/lib/ipmi_event.c b/lib/ipmi_event.c
similarity index 100%
rename from ipmitool/lib/ipmi_event.c
rename to lib/ipmi_event.c
diff --git a/ipmitool/lib/ipmi_firewall.c b/lib/ipmi_firewall.c
similarity index 100%
rename from ipmitool/lib/ipmi_firewall.c
rename to lib/ipmi_firewall.c
diff --git a/ipmitool/lib/ipmi_fru.c b/lib/ipmi_fru.c
similarity index 100%
rename from ipmitool/lib/ipmi_fru.c
rename to lib/ipmi_fru.c
diff --git a/ipmitool/lib/ipmi_fwum.c b/lib/ipmi_fwum.c
similarity index 100%
rename from ipmitool/lib/ipmi_fwum.c
rename to lib/ipmi_fwum.c
diff --git a/ipmitool/lib/ipmi_gendev.c b/lib/ipmi_gendev.c
similarity index 100%
rename from ipmitool/lib/ipmi_gendev.c
rename to lib/ipmi_gendev.c
diff --git a/ipmitool/lib/ipmi_hpmfwupg.c b/lib/ipmi_hpmfwupg.c
similarity index 100%
rename from ipmitool/lib/ipmi_hpmfwupg.c
rename to lib/ipmi_hpmfwupg.c
diff --git a/ipmitool/lib/ipmi_ime.c b/lib/ipmi_ime.c
similarity index 100%
rename from ipmitool/lib/ipmi_ime.c
rename to lib/ipmi_ime.c
diff --git a/ipmitool/lib/ipmi_isol.c b/lib/ipmi_isol.c
similarity index 100%
rename from ipmitool/lib/ipmi_isol.c
rename to lib/ipmi_isol.c
diff --git a/ipmitool/lib/ipmi_kontronoem.c b/lib/ipmi_kontronoem.c
similarity index 100%
rename from ipmitool/lib/ipmi_kontronoem.c
rename to lib/ipmi_kontronoem.c
diff --git a/ipmitool/lib/ipmi_lanp.c b/lib/ipmi_lanp.c
similarity index 100%
rename from ipmitool/lib/ipmi_lanp.c
rename to lib/ipmi_lanp.c
diff --git a/ipmitool/lib/ipmi_main.c b/lib/ipmi_main.c
similarity index 100%
rename from ipmitool/lib/ipmi_main.c
rename to lib/ipmi_main.c
diff --git a/ipmitool/lib/ipmi_mc.c b/lib/ipmi_mc.c
similarity index 100%
rename from ipmitool/lib/ipmi_mc.c
rename to lib/ipmi_mc.c
diff --git a/ipmitool/lib/ipmi_oem.c b/lib/ipmi_oem.c
similarity index 100%
rename from ipmitool/lib/ipmi_oem.c
rename to lib/ipmi_oem.c
diff --git a/ipmitool/lib/ipmi_pef.c b/lib/ipmi_pef.c
similarity index 100%
rename from ipmitool/lib/ipmi_pef.c
rename to lib/ipmi_pef.c
diff --git a/ipmitool/lib/ipmi_picmg.c b/lib/ipmi_picmg.c
similarity index 100%
rename from ipmitool/lib/ipmi_picmg.c
rename to lib/ipmi_picmg.c
diff --git a/ipmitool/lib/ipmi_raw.c b/lib/ipmi_raw.c
similarity index 100%
rename from ipmitool/lib/ipmi_raw.c
rename to lib/ipmi_raw.c
diff --git a/ipmitool/lib/ipmi_sdr.c b/lib/ipmi_sdr.c
similarity index 100%
rename from ipmitool/lib/ipmi_sdr.c
rename to lib/ipmi_sdr.c
diff --git a/ipmitool/lib/ipmi_sdradd.c b/lib/ipmi_sdradd.c
similarity index 100%
rename from ipmitool/lib/ipmi_sdradd.c
rename to lib/ipmi_sdradd.c
diff --git a/ipmitool/lib/ipmi_sel.c b/lib/ipmi_sel.c
similarity index 100%
rename from ipmitool/lib/ipmi_sel.c
rename to lib/ipmi_sel.c
diff --git a/ipmitool/lib/ipmi_sensor.c b/lib/ipmi_sensor.c
similarity index 100%
rename from ipmitool/lib/ipmi_sensor.c
rename to lib/ipmi_sensor.c
diff --git a/ipmitool/lib/ipmi_session.c b/lib/ipmi_session.c
similarity index 100%
rename from ipmitool/lib/ipmi_session.c
rename to lib/ipmi_session.c
diff --git a/ipmitool/lib/ipmi_sol.c b/lib/ipmi_sol.c
similarity index 100%
rename from ipmitool/lib/ipmi_sol.c
rename to lib/ipmi_sol.c
diff --git a/ipmitool/lib/ipmi_strings.c b/lib/ipmi_strings.c
similarity index 100%
rename from ipmitool/lib/ipmi_strings.c
rename to lib/ipmi_strings.c
diff --git a/ipmitool/lib/ipmi_sunoem.c b/lib/ipmi_sunoem.c
similarity index 100%
rename from ipmitool/lib/ipmi_sunoem.c
rename to lib/ipmi_sunoem.c
diff --git a/ipmitool/lib/ipmi_tsol.c b/lib/ipmi_tsol.c
similarity index 100%
rename from ipmitool/lib/ipmi_tsol.c
rename to lib/ipmi_tsol.c
diff --git a/ipmitool/lib/ipmi_user.c b/lib/ipmi_user.c
similarity index 100%
rename from ipmitool/lib/ipmi_user.c
rename to lib/ipmi_user.c
diff --git a/ipmitool/lib/log.c b/lib/log.c
similarity index 100%
rename from ipmitool/lib/log.c
rename to lib/log.c
diff --git a/ipmitool/src/Makefile.am b/src/Makefile.am
similarity index 100%
rename from ipmitool/src/Makefile.am
rename to src/Makefile.am
diff --git a/ipmitool/src/ipmievd.c b/src/ipmievd.c
similarity index 100%
rename from ipmitool/src/ipmievd.c
rename to src/ipmievd.c
diff --git a/ipmitool/src/ipmishell.c b/src/ipmishell.c
similarity index 100%
rename from ipmitool/src/ipmishell.c
rename to src/ipmishell.c
diff --git a/ipmitool/src/ipmitool.c b/src/ipmitool.c
similarity index 100%
rename from ipmitool/src/ipmitool.c
rename to src/ipmitool.c
diff --git a/ipmitool/src/plugins/Makefile.am b/src/plugins/Makefile.am
similarity index 100%
rename from ipmitool/src/plugins/Makefile.am
rename to src/plugins/Makefile.am
diff --git a/ipmitool/src/plugins/bmc/Makefile.am b/src/plugins/bmc/Makefile.am
similarity index 100%
rename from ipmitool/src/plugins/bmc/Makefile.am
rename to src/plugins/bmc/Makefile.am
diff --git a/ipmitool/src/plugins/bmc/bmc.c b/src/plugins/bmc/bmc.c
similarity index 100%
rename from ipmitool/src/plugins/bmc/bmc.c
rename to src/plugins/bmc/bmc.c
diff --git a/ipmitool/src/plugins/bmc/bmc.h b/src/plugins/bmc/bmc.h
similarity index 100%
rename from ipmitool/src/plugins/bmc/bmc.h
rename to src/plugins/bmc/bmc.h
diff --git a/ipmitool/src/plugins/bmc/bmc_intf.h b/src/plugins/bmc/bmc_intf.h
similarity index 100%
rename from ipmitool/src/plugins/bmc/bmc_intf.h
rename to src/plugins/bmc/bmc_intf.h
diff --git a/ipmitool/src/plugins/dummy/Makefile.am b/src/plugins/dummy/Makefile.am
similarity index 100%
rename from ipmitool/src/plugins/dummy/Makefile.am
rename to src/plugins/dummy/Makefile.am
diff --git a/ipmitool/src/plugins/dummy/dummy.c b/src/plugins/dummy/dummy.c
similarity index 100%
rename from ipmitool/src/plugins/dummy/dummy.c
rename to src/plugins/dummy/dummy.c
diff --git a/ipmitool/src/plugins/dummy/dummy.h b/src/plugins/dummy/dummy.h
similarity index 100%
rename from ipmitool/src/plugins/dummy/dummy.h
rename to src/plugins/dummy/dummy.h
diff --git a/ipmitool/src/plugins/free/Makefile.am b/src/plugins/free/Makefile.am
similarity index 100%
rename from ipmitool/src/plugins/free/Makefile.am
rename to src/plugins/free/Makefile.am
diff --git a/ipmitool/src/plugins/free/free.c b/src/plugins/free/free.c
similarity index 100%
rename from ipmitool/src/plugins/free/free.c
rename to src/plugins/free/free.c
diff --git a/ipmitool/src/plugins/imb/Makefile.am b/src/plugins/imb/Makefile.am
similarity index 100%
rename from ipmitool/src/plugins/imb/Makefile.am
rename to src/plugins/imb/Makefile.am
diff --git a/ipmitool/src/plugins/imb/imb.c b/src/plugins/imb/imb.c
similarity index 100%
rename from ipmitool/src/plugins/imb/imb.c
rename to src/plugins/imb/imb.c
diff --git a/ipmitool/src/plugins/imb/imbapi.c b/src/plugins/imb/imbapi.c
similarity index 100%
rename from ipmitool/src/plugins/imb/imbapi.c
rename to src/plugins/imb/imbapi.c
diff --git a/ipmitool/src/plugins/imb/imbapi.h b/src/plugins/imb/imbapi.h
similarity index 100%
rename from ipmitool/src/plugins/imb/imbapi.h
rename to src/plugins/imb/imbapi.h
diff --git a/ipmitool/src/plugins/ipmi_intf.c b/src/plugins/ipmi_intf.c
similarity index 100%
rename from ipmitool/src/plugins/ipmi_intf.c
rename to src/plugins/ipmi_intf.c
diff --git a/ipmitool/src/plugins/lan/Makefile.am b/src/plugins/lan/Makefile.am
similarity index 100%
rename from ipmitool/src/plugins/lan/Makefile.am
rename to src/plugins/lan/Makefile.am
diff --git a/ipmitool/src/plugins/lan/asf.h b/src/plugins/lan/asf.h
similarity index 100%
rename from ipmitool/src/plugins/lan/asf.h
rename to src/plugins/lan/asf.h
diff --git a/ipmitool/src/plugins/lan/auth.c b/src/plugins/lan/auth.c
similarity index 100%
rename from ipmitool/src/plugins/lan/auth.c
rename to src/plugins/lan/auth.c
diff --git a/ipmitool/src/plugins/lan/auth.h b/src/plugins/lan/auth.h
similarity index 100%
rename from ipmitool/src/plugins/lan/auth.h
rename to src/plugins/lan/auth.h
diff --git a/ipmitool/src/plugins/lan/lan.c b/src/plugins/lan/lan.c
similarity index 100%
rename from ipmitool/src/plugins/lan/lan.c
rename to src/plugins/lan/lan.c
diff --git a/ipmitool/src/plugins/lan/lan.h b/src/plugins/lan/lan.h
similarity index 100%
rename from ipmitool/src/plugins/lan/lan.h
rename to src/plugins/lan/lan.h
diff --git a/ipmitool/src/plugins/lan/md5.c b/src/plugins/lan/md5.c
similarity index 100%
rename from ipmitool/src/plugins/lan/md5.c
rename to src/plugins/lan/md5.c
diff --git a/ipmitool/src/plugins/lan/md5.h b/src/plugins/lan/md5.h
similarity index 100%
rename from ipmitool/src/plugins/lan/md5.h
rename to src/plugins/lan/md5.h
diff --git a/ipmitool/src/plugins/lan/rmcp.h b/src/plugins/lan/rmcp.h
similarity index 100%
rename from ipmitool/src/plugins/lan/rmcp.h
rename to src/plugins/lan/rmcp.h
diff --git a/ipmitool/src/plugins/lanplus/Makefile.am b/src/plugins/lanplus/Makefile.am
similarity index 100%
rename from ipmitool/src/plugins/lanplus/Makefile.am
rename to src/plugins/lanplus/Makefile.am
diff --git a/ipmitool/src/plugins/lanplus/README.lanplus b/src/plugins/lanplus/README.lanplus
similarity index 100%
rename from ipmitool/src/plugins/lanplus/README.lanplus
rename to src/plugins/lanplus/README.lanplus
diff --git a/ipmitool/src/plugins/lanplus/README.sol b/src/plugins/lanplus/README.sol
similarity index 100%
rename from ipmitool/src/plugins/lanplus/README.sol
rename to src/plugins/lanplus/README.sol
diff --git a/ipmitool/src/plugins/lanplus/asf.h b/src/plugins/lanplus/asf.h
similarity index 100%
rename from ipmitool/src/plugins/lanplus/asf.h
rename to src/plugins/lanplus/asf.h
diff --git a/ipmitool/src/plugins/lanplus/lanplus.c b/src/plugins/lanplus/lanplus.c
similarity index 100%
rename from ipmitool/src/plugins/lanplus/lanplus.c
rename to src/plugins/lanplus/lanplus.c
diff --git a/ipmitool/src/plugins/lanplus/lanplus.h b/src/plugins/lanplus/lanplus.h
similarity index 100%
rename from ipmitool/src/plugins/lanplus/lanplus.h
rename to src/plugins/lanplus/lanplus.h
diff --git a/ipmitool/src/plugins/lanplus/lanplus_crypt.c b/src/plugins/lanplus/lanplus_crypt.c
similarity index 100%
rename from ipmitool/src/plugins/lanplus/lanplus_crypt.c
rename to src/plugins/lanplus/lanplus_crypt.c
diff --git a/ipmitool/src/plugins/lanplus/lanplus_crypt.h b/src/plugins/lanplus/lanplus_crypt.h
similarity index 100%
rename from ipmitool/src/plugins/lanplus/lanplus_crypt.h
rename to src/plugins/lanplus/lanplus_crypt.h
diff --git a/ipmitool/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c
similarity index 100%
rename from ipmitool/src/plugins/lanplus/lanplus_crypt_impl.c
rename to src/plugins/lanplus/lanplus_crypt_impl.c
diff --git a/ipmitool/src/plugins/lanplus/lanplus_crypt_impl.h b/src/plugins/lanplus/lanplus_crypt_impl.h
similarity index 100%
rename from ipmitool/src/plugins/lanplus/lanplus_crypt_impl.h
rename to src/plugins/lanplus/lanplus_crypt_impl.h
diff --git a/ipmitool/src/plugins/lanplus/lanplus_dump.c b/src/plugins/lanplus/lanplus_dump.c
similarity index 100%
rename from ipmitool/src/plugins/lanplus/lanplus_dump.c
rename to src/plugins/lanplus/lanplus_dump.c
diff --git a/ipmitool/src/plugins/lanplus/lanplus_dump.h b/src/plugins/lanplus/lanplus_dump.h
similarity index 100%
rename from ipmitool/src/plugins/lanplus/lanplus_dump.h
rename to src/plugins/lanplus/lanplus_dump.h
diff --git a/ipmitool/src/plugins/lanplus/lanplus_strings.c b/src/plugins/lanplus/lanplus_strings.c
similarity index 100%
rename from ipmitool/src/plugins/lanplus/lanplus_strings.c
rename to src/plugins/lanplus/lanplus_strings.c
diff --git a/ipmitool/src/plugins/lanplus/rmcp.h b/src/plugins/lanplus/rmcp.h
similarity index 100%
rename from ipmitool/src/plugins/lanplus/rmcp.h
rename to src/plugins/lanplus/rmcp.h
diff --git a/ipmitool/src/plugins/lipmi/Makefile.am b/src/plugins/lipmi/Makefile.am
similarity index 100%
rename from ipmitool/src/plugins/lipmi/Makefile.am
rename to src/plugins/lipmi/Makefile.am
diff --git a/ipmitool/src/plugins/lipmi/lipmi.c b/src/plugins/lipmi/lipmi.c
similarity index 100%
rename from ipmitool/src/plugins/lipmi/lipmi.c
rename to src/plugins/lipmi/lipmi.c
diff --git a/ipmitool/src/plugins/lipmi/lipmi.h b/src/plugins/lipmi/lipmi.h
similarity index 100%
rename from ipmitool/src/plugins/lipmi/lipmi.h
rename to src/plugins/lipmi/lipmi.h
diff --git a/ipmitool/src/plugins/open/Makefile.am b/src/plugins/open/Makefile.am
similarity index 100%
rename from ipmitool/src/plugins/open/Makefile.am
rename to src/plugins/open/Makefile.am
diff --git a/ipmitool/src/plugins/open/open.c b/src/plugins/open/open.c
similarity index 100%
rename from ipmitool/src/plugins/open/open.c
rename to src/plugins/open/open.c
diff --git a/ipmitool/src/plugins/open/open.h b/src/plugins/open/open.h
similarity index 100%
rename from ipmitool/src/plugins/open/open.h
rename to src/plugins/open/open.h
diff --git a/ipmitool/src/plugins/serial/Makefile.am b/src/plugins/serial/Makefile.am
similarity index 100%
rename from ipmitool/src/plugins/serial/Makefile.am
rename to src/plugins/serial/Makefile.am
diff --git a/ipmitool/src/plugins/serial/serial_basic.c b/src/plugins/serial/serial_basic.c
similarity index 100%
rename from ipmitool/src/plugins/serial/serial_basic.c
rename to src/plugins/serial/serial_basic.c
diff --git a/ipmitool/src/plugins/serial/serial_terminal.c b/src/plugins/serial/serial_terminal.c
similarity index 100%
rename from ipmitool/src/plugins/serial/serial_terminal.c
rename to src/plugins/serial/serial_terminal.c