diff --git a/hio/Makefile.am b/Makefile.am
similarity index 100%
rename from hio/Makefile.am
rename to Makefile.am
diff --git a/hio/Makefile.in b/Makefile.in
similarity index 100%
rename from hio/Makefile.in
rename to Makefile.in
diff --git a/hio/ac/ar-lib b/ac/ar-lib
similarity index 100%
rename from hio/ac/ar-lib
rename to ac/ar-lib
diff --git a/hio/ac/compile b/ac/compile
similarity index 100%
rename from hio/ac/compile
rename to ac/compile
diff --git a/hio/ac/config.guess b/ac/config.guess
similarity index 100%
rename from hio/ac/config.guess
rename to ac/config.guess
diff --git a/hio/ac/config.sub b/ac/config.sub
similarity index 100%
rename from hio/ac/config.sub
rename to ac/config.sub
diff --git a/hio/ac/depcomp b/ac/depcomp
similarity index 100%
rename from hio/ac/depcomp
rename to ac/depcomp
diff --git a/hio/ac/install-sh b/ac/install-sh
similarity index 100%
rename from hio/ac/install-sh
rename to ac/install-sh
diff --git a/hio/ac/ltmain.sh b/ac/ltmain.sh
similarity index 100%
rename from hio/ac/ltmain.sh
rename to ac/ltmain.sh
diff --git a/hio/ac/missing b/ac/missing
similarity index 100%
rename from hio/ac/missing
rename to ac/missing
diff --git a/hio/ac/test-driver b/ac/test-driver
similarity index 100%
rename from hio/ac/test-driver
rename to ac/test-driver
diff --git a/hio/aclocal.m4 b/aclocal.m4
similarity index 100%
rename from hio/aclocal.m4
rename to aclocal.m4
diff --git a/hio/bin/Makefile.am b/bin/Makefile.am
similarity index 100%
rename from hio/bin/Makefile.am
rename to bin/Makefile.am
diff --git a/hio/bin/Makefile.in b/bin/Makefile.in
similarity index 100%
rename from hio/bin/Makefile.in
rename to bin/Makefile.in
diff --git a/hio/bin/execd.c b/bin/execd.c
similarity index 100%
rename from hio/bin/execd.c
rename to bin/execd.c
diff --git a/hio/bin/t01.c b/bin/t01.c
similarity index 100%
rename from hio/bin/t01.c
rename to bin/t01.c
diff --git a/hio/bin/t02.c b/bin/t02.c
similarity index 100%
rename from hio/bin/t02.c
rename to bin/t02.c
diff --git a/hio/bin/t03.c b/bin/t03.c
similarity index 100%
rename from hio/bin/t03.c
rename to bin/t03.c
diff --git a/hio/bin/t04.c b/bin/t04.c
similarity index 100%
rename from hio/bin/t04.c
rename to bin/t04.c
diff --git a/hio/bin/t05.c b/bin/t05.c
similarity index 100%
rename from hio/bin/t05.c
rename to bin/t05.c
diff --git a/hio/bin/t06.c b/bin/t06.c
similarity index 100%
rename from hio/bin/t06.c
rename to bin/t06.c
diff --git a/hio/bin/te.c b/bin/te.c
similarity index 100%
rename from hio/bin/te.c
rename to bin/te.c
diff --git a/hio/configure b/configure
similarity index 100%
rename from hio/configure
rename to configure
diff --git a/hio/configure.ac b/configure.ac
similarity index 100%
rename from hio/configure.ac
rename to configure.ac
diff --git a/hio/lib/Makefile.am b/lib/Makefile.am
similarity index 100%
rename from hio/lib/Makefile.am
rename to lib/Makefile.am
diff --git a/hio/lib/Makefile.in b/lib/Makefile.in
similarity index 100%
rename from hio/lib/Makefile.in
rename to lib/Makefile.in
diff --git a/hio/lib/chr.c b/lib/chr.c
similarity index 100%
rename from hio/lib/chr.c
rename to lib/chr.c
diff --git a/hio/lib/dhcp-svr.c b/lib/dhcp-svr.c
similarity index 100%
rename from hio/lib/dhcp-svr.c
rename to lib/dhcp-svr.c
diff --git a/hio/lib/dns-cli.c b/lib/dns-cli.c
similarity index 100%
rename from hio/lib/dns-cli.c
rename to lib/dns-cli.c
diff --git a/hio/lib/dns.c b/lib/dns.c
similarity index 100%
rename from hio/lib/dns.c
rename to lib/dns.c
diff --git a/hio/lib/ecs-imp.h b/lib/ecs-imp.h
similarity index 100%
rename from hio/lib/ecs-imp.h
rename to lib/ecs-imp.h
diff --git a/hio/lib/ecs.c b/lib/ecs.c
similarity index 100%
rename from hio/lib/ecs.c
rename to lib/ecs.c
diff --git a/hio/lib/err.c b/lib/err.c
similarity index 100%
rename from hio/lib/err.c
rename to lib/err.c
diff --git a/hio/lib/fcgi-cli.c b/lib/fcgi-cli.c
similarity index 100%
rename from hio/lib/fcgi-cli.c
rename to lib/fcgi-cli.c
diff --git a/hio/lib/fmt-imp.h b/lib/fmt-imp.h
similarity index 100%
rename from hio/lib/fmt-imp.h
rename to lib/fmt-imp.h
diff --git a/hio/lib/fmt.c b/lib/fmt.c
similarity index 100%
rename from hio/lib/fmt.c
rename to lib/fmt.c
diff --git a/hio/lib/generr.hawk b/lib/generr.hawk
similarity index 100%
rename from hio/lib/generr.hawk
rename to lib/generr.hawk
diff --git a/hio/lib/hio-cfg.h.in b/lib/hio-cfg.h.in
similarity index 100%
rename from hio/lib/hio-cfg.h.in
rename to lib/hio-cfg.h.in
diff --git a/hio/lib/hio-chr.h b/lib/hio-chr.h
similarity index 100%
rename from hio/lib/hio-chr.h
rename to lib/hio-chr.h
diff --git a/hio/lib/hio-cmn.h b/lib/hio-cmn.h
similarity index 100%
rename from hio/lib/hio-cmn.h
rename to lib/hio-cmn.h
diff --git a/hio/lib/hio-dhcp.h b/lib/hio-dhcp.h
similarity index 100%
rename from hio/lib/hio-dhcp.h
rename to lib/hio-dhcp.h
diff --git a/hio/lib/hio-dns.h b/lib/hio-dns.h
similarity index 100%
rename from hio/lib/hio-dns.h
rename to lib/hio-dns.h
diff --git a/hio/lib/hio-ecs.h b/lib/hio-ecs.h
similarity index 100%
rename from hio/lib/hio-ecs.h
rename to lib/hio-ecs.h
diff --git a/hio/lib/hio-fcgi.h b/lib/hio-fcgi.h
similarity index 100%
rename from hio/lib/hio-fcgi.h
rename to lib/hio-fcgi.h
diff --git a/hio/lib/hio-fmt.h b/lib/hio-fmt.h
similarity index 100%
rename from hio/lib/hio-fmt.h
rename to lib/hio-fmt.h
diff --git a/hio/lib/hio-htb.h b/lib/hio-htb.h
similarity index 100%
rename from hio/lib/hio-htb.h
rename to lib/hio-htb.h
diff --git a/hio/lib/hio-htrd.h b/lib/hio-htrd.h
similarity index 100%
rename from hio/lib/hio-htrd.h
rename to lib/hio-htrd.h
diff --git a/hio/lib/hio-htre.h b/lib/hio-htre.h
similarity index 100%
rename from hio/lib/hio-htre.h
rename to lib/hio-htre.h
diff --git a/hio/lib/hio-http.h b/lib/hio-http.h
similarity index 100%
rename from hio/lib/hio-http.h
rename to lib/hio-http.h
diff --git a/hio/lib/hio-json.h b/lib/hio-json.h
similarity index 100%
rename from hio/lib/hio-json.h
rename to lib/hio-json.h
diff --git a/hio/lib/hio-mar.h b/lib/hio-mar.h
similarity index 100%
rename from hio/lib/hio-mar.h
rename to lib/hio-mar.h
diff --git a/hio/lib/hio-md5.h b/lib/hio-md5.h
similarity index 100%
rename from hio/lib/hio-md5.h
rename to lib/hio-md5.h
diff --git a/hio/lib/hio-nwif.h b/lib/hio-nwif.h
similarity index 100%
rename from hio/lib/hio-nwif.h
rename to lib/hio-nwif.h
diff --git a/hio/lib/hio-opt.h b/lib/hio-opt.h
similarity index 100%
rename from hio/lib/hio-opt.h
rename to lib/hio-opt.h
diff --git a/hio/lib/hio-pac1.h b/lib/hio-pac1.h
similarity index 100%
rename from hio/lib/hio-pac1.h
rename to lib/hio-pac1.h
diff --git a/hio/lib/hio-path.h b/lib/hio-path.h
similarity index 100%
rename from hio/lib/hio-path.h
rename to lib/hio-path.h
diff --git a/hio/lib/hio-pipe.h b/lib/hio-pipe.h
similarity index 100%
rename from hio/lib/hio-pipe.h
rename to lib/hio-pipe.h
diff --git a/hio/lib/hio-pro.h b/lib/hio-pro.h
similarity index 100%
rename from hio/lib/hio-pro.h
rename to lib/hio-pro.h
diff --git a/hio/lib/hio-prv.h b/lib/hio-prv.h
similarity index 100%
rename from hio/lib/hio-prv.h
rename to lib/hio-prv.h
diff --git a/hio/lib/hio-pty.h b/lib/hio-pty.h
similarity index 100%
rename from hio/lib/hio-pty.h
rename to lib/hio-pty.h
diff --git a/hio/lib/hio-rad.h b/lib/hio-rad.h
similarity index 100%
rename from hio/lib/hio-rad.h
rename to lib/hio-rad.h
diff --git a/hio/lib/hio-sck.h b/lib/hio-sck.h
similarity index 100%
rename from hio/lib/hio-sck.h
rename to lib/hio-sck.h
diff --git a/hio/lib/hio-shw.h b/lib/hio-shw.h
similarity index 100%
rename from hio/lib/hio-shw.h
rename to lib/hio-shw.h
diff --git a/hio/lib/hio-skad.h b/lib/hio-skad.h
similarity index 100%
rename from hio/lib/hio-skad.h
rename to lib/hio-skad.h
diff --git a/hio/lib/hio-str.h b/lib/hio-str.h
similarity index 100%
rename from hio/lib/hio-str.h
rename to lib/hio-str.h
diff --git a/hio/lib/hio-str.h.m4 b/lib/hio-str.h.m4
similarity index 100%
rename from hio/lib/hio-str.h.m4
rename to lib/hio-str.h.m4
diff --git a/hio/lib/hio-thr.h b/lib/hio-thr.h
similarity index 100%
rename from hio/lib/hio-thr.h
rename to lib/hio-thr.h
diff --git a/hio/lib/hio-upac.h b/lib/hio-upac.h
similarity index 100%
rename from hio/lib/hio-upac.h
rename to lib/hio-upac.h
diff --git a/hio/lib/hio-utl.h b/lib/hio-utl.h
similarity index 100%
rename from hio/lib/hio-utl.h
rename to lib/hio-utl.h
diff --git a/hio/lib/hio.c b/lib/hio.c
similarity index 100%
rename from hio/lib/hio.c
rename to lib/hio.c
diff --git a/hio/lib/hio.h b/lib/hio.h
similarity index 100%
rename from hio/lib/hio.h
rename to lib/hio.h
diff --git a/hio/lib/htb.c b/lib/htb.c
similarity index 100%
rename from hio/lib/htb.c
rename to lib/htb.c
diff --git a/hio/lib/htrd.c b/lib/htrd.c
similarity index 100%
rename from hio/lib/htrd.c
rename to lib/htrd.c
diff --git a/hio/lib/htre.c b/lib/htre.c
similarity index 100%
rename from hio/lib/htre.c
rename to lib/htre.c
diff --git a/hio/lib/http-cgi.c b/lib/http-cgi.c
similarity index 100%
rename from hio/lib/http-cgi.c
rename to lib/http-cgi.c
diff --git a/hio/lib/http-fcgi.c b/lib/http-fcgi.c
similarity index 100%
rename from hio/lib/http-fcgi.c
rename to lib/http-fcgi.c
diff --git a/hio/lib/http-file.c b/lib/http-file.c
similarity index 100%
rename from hio/lib/http-file.c
rename to lib/http-file.c
diff --git a/hio/lib/http-prv.h b/lib/http-prv.h
similarity index 100%
rename from hio/lib/http-prv.h
rename to lib/http-prv.h
diff --git a/hio/lib/http-svr.c b/lib/http-svr.c
similarity index 100%
rename from hio/lib/http-svr.c
rename to lib/http-svr.c
diff --git a/hio/lib/http-thr.c b/lib/http-thr.c
similarity index 100%
rename from hio/lib/http-thr.c
rename to lib/http-thr.c
diff --git a/hio/lib/http-txt.c b/lib/http-txt.c
similarity index 100%
rename from hio/lib/http-txt.c
rename to lib/http-txt.c
diff --git a/hio/lib/http.c b/lib/http.c
similarity index 100%
rename from hio/lib/http.c
rename to lib/http.c
diff --git a/hio/lib/json.c b/lib/json.c
similarity index 100%
rename from hio/lib/json.c
rename to lib/json.c
diff --git a/hio/lib/mar-cli.c b/lib/mar-cli.c
similarity index 100%
rename from hio/lib/mar-cli.c
rename to lib/mar-cli.c
diff --git a/hio/lib/mar.c b/lib/mar.c
similarity index 100%
rename from hio/lib/mar.c
rename to lib/mar.c
diff --git a/hio/lib/md5.c b/lib/md5.c
similarity index 100%
rename from hio/lib/md5.c
rename to lib/md5.c
diff --git a/hio/lib/nwif.c b/lib/nwif.c
similarity index 100%
rename from hio/lib/nwif.c
rename to lib/nwif.c
diff --git a/hio/lib/opt-imp.h b/lib/opt-imp.h
similarity index 100%
rename from hio/lib/opt-imp.h
rename to lib/opt-imp.h
diff --git a/hio/lib/opt.c b/lib/opt.c
similarity index 100%
rename from hio/lib/opt.c
rename to lib/opt.c
diff --git a/hio/lib/path.c b/lib/path.c
similarity index 100%
rename from hio/lib/path.c
rename to lib/path.c
diff --git a/hio/lib/pipe.c b/lib/pipe.c
similarity index 100%
rename from hio/lib/pipe.c
rename to lib/pipe.c
diff --git a/hio/lib/pro.c b/lib/pro.c
similarity index 100%
rename from hio/lib/pro.c
rename to lib/pro.c
diff --git a/hio/lib/pty.c b/lib/pty.c
similarity index 100%
rename from hio/lib/pty.c
rename to lib/pty.c
diff --git a/hio/lib/rad-msg.c b/lib/rad-msg.c
similarity index 100%
rename from hio/lib/rad-msg.c
rename to lib/rad-msg.c
diff --git a/hio/lib/sck.c b/lib/sck.c
similarity index 100%
rename from hio/lib/sck.c
rename to lib/sck.c
diff --git a/hio/lib/shw.c b/lib/shw.c
similarity index 100%
rename from hio/lib/shw.c
rename to lib/shw.c
diff --git a/hio/lib/skad.c b/lib/skad.c
similarity index 100%
rename from hio/lib/skad.c
rename to lib/skad.c
diff --git a/hio/lib/sys-ass.c b/lib/sys-ass.c
similarity index 100%
rename from hio/lib/sys-ass.c
rename to lib/sys-ass.c
diff --git a/hio/lib/sys-err.c b/lib/sys-err.c
similarity index 100%
rename from hio/lib/sys-err.c
rename to lib/sys-err.c
diff --git a/hio/lib/sys-log.c b/lib/sys-log.c
similarity index 100%
rename from hio/lib/sys-log.c
rename to lib/sys-log.c
diff --git a/hio/lib/sys-mux.c b/lib/sys-mux.c
similarity index 100%
rename from hio/lib/sys-mux.c
rename to lib/sys-mux.c
diff --git a/hio/lib/sys-prv.h b/lib/sys-prv.h
similarity index 100%
rename from hio/lib/sys-prv.h
rename to lib/sys-prv.h
diff --git a/hio/lib/sys-tim.c b/lib/sys-tim.c
similarity index 100%
rename from hio/lib/sys-tim.c
rename to lib/sys-tim.c
diff --git a/hio/lib/sys.c b/lib/sys.c
similarity index 100%
rename from hio/lib/sys.c
rename to lib/sys.c
diff --git a/hio/lib/thr.c b/lib/thr.c
similarity index 100%
rename from hio/lib/thr.c
rename to lib/thr.c
diff --git a/hio/lib/tmr.c b/lib/tmr.c
similarity index 100%
rename from hio/lib/tmr.c
rename to lib/tmr.c
diff --git a/hio/lib/uch-case.h b/lib/uch-case.h
similarity index 100%
rename from hio/lib/uch-case.h
rename to lib/uch-case.h
diff --git a/hio/lib/uch-prop.h b/lib/uch-prop.h
similarity index 100%
rename from hio/lib/uch-prop.h
rename to lib/uch-prop.h
diff --git a/hio/lib/utf8.c b/lib/utf8.c
similarity index 100%
rename from hio/lib/utf8.c
rename to lib/utf8.c
diff --git a/hio/lib/utl-siph.c b/lib/utl-siph.c
similarity index 100%
rename from hio/lib/utl-siph.c
rename to lib/utl-siph.c
diff --git a/hio/lib/utl-str.c b/lib/utl-str.c
similarity index 100%
rename from hio/lib/utl-str.c
rename to lib/utl-str.c
diff --git a/hio/lib/utl-str.c.m4 b/lib/utl-str.c.m4
similarity index 100%
rename from hio/lib/utl-str.c.m4
rename to lib/utl-str.c.m4
diff --git a/hio/lib/utl-str.m4 b/lib/utl-str.m4
similarity index 100%
rename from hio/lib/utl-str.m4
rename to lib/utl-str.m4
diff --git a/hio/lib/utl.c b/lib/utl.c
similarity index 100%
rename from hio/lib/utl.c
rename to lib/utl.c
diff --git a/hio/m4/ax_check_sign.m4 b/m4/ax_check_sign.m4
similarity index 100%
rename from hio/m4/ax_check_sign.m4
rename to m4/ax_check_sign.m4
diff --git a/hio/m4/ax_lib_mariadb.m4 b/m4/ax_lib_mariadb.m4
similarity index 100%
rename from hio/m4/ax_lib_mariadb.m4
rename to m4/ax_lib_mariadb.m4
diff --git a/hio/m4/ax_numval.m4 b/m4/ax_numval.m4
similarity index 100%
rename from hio/m4/ax_numval.m4
rename to m4/ax_numval.m4
diff --git a/hio/m4/ax_pthread.m4 b/m4/ax_pthread.m4
similarity index 100%
rename from hio/m4/ax_pthread.m4
rename to m4/ax_pthread.m4
diff --git a/hio/m4/libtool.m4 b/m4/libtool.m4
similarity index 100%
rename from hio/m4/libtool.m4
rename to m4/libtool.m4
diff --git a/hio/m4/ltoptions.m4 b/m4/ltoptions.m4
similarity index 100%
rename from hio/m4/ltoptions.m4
rename to m4/ltoptions.m4
diff --git a/hio/m4/ltsugar.m4 b/m4/ltsugar.m4
similarity index 100%
rename from hio/m4/ltsugar.m4
rename to m4/ltsugar.m4
diff --git a/hio/m4/ltversion.m4 b/m4/ltversion.m4
similarity index 100%
rename from hio/m4/ltversion.m4
rename to m4/ltversion.m4
diff --git a/hio/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
similarity index 100%
rename from hio/m4/lt~obsolete.m4
rename to m4/lt~obsolete.m4
diff --git a/hio/pkgs/hio.spec.in b/pkgs/hio.spec.in
similarity index 100%
rename from hio/pkgs/hio.spec.in
rename to pkgs/hio.spec.in
diff --git a/hio/t/Makefile.am b/t/Makefile.am
similarity index 100%
rename from hio/t/Makefile.am
rename to t/Makefile.am
diff --git a/hio/t/Makefile.in b/t/Makefile.in
similarity index 100%
rename from hio/t/Makefile.in
rename to t/Makefile.in
diff --git a/hio/t/b.sh b/t/b.sh
similarity index 100%
rename from hio/t/b.sh
rename to t/b.sh
diff --git a/hio/t/c.sh b/t/c.sh
similarity index 100%
rename from hio/t/c.sh
rename to t/c.sh
diff --git a/hio/t/d.sh b/t/d.sh
similarity index 100%
rename from hio/t/d.sh
rename to t/d.sh
diff --git a/hio/t/e.sh b/t/e.sh
similarity index 100%
rename from hio/t/e.sh
rename to t/e.sh
diff --git a/hio/t/http1.hawk b/t/http1.hawk
similarity index 100%
rename from hio/t/http1.hawk
rename to t/http1.hawk
diff --git a/hio/t/t-001.c b/t/t-001.c
similarity index 100%
rename from hio/t/t-001.c
rename to t/t-001.c
diff --git a/hio/t/t-002.c b/t/t-002.c
similarity index 100%
rename from hio/t/t-002.c
rename to t/t-002.c
diff --git a/hio/t/t-003.c b/t/t-003.c
similarity index 100%
rename from hio/t/t-003.c
rename to t/t-003.c
diff --git a/hio/t/t-004.c b/t/t-004.c
similarity index 100%
rename from hio/t/t-004.c
rename to t/t-004.c
diff --git a/hio/t/t.h b/t/t.h
similarity index 100%
rename from hio/t/t.h
rename to t/t.h
diff --git a/hio/t/t1.txt b/t/t1.txt
similarity index 100%
rename from hio/t/t1.txt
rename to t/t1.txt
diff --git a/hio/t/t2.txt b/t/t2.txt
similarity index 100%
rename from hio/t/t2.txt
rename to t/t2.txt
diff --git a/hio/t/t3.txt b/t/t3.txt
similarity index 100%
rename from hio/t/t3.txt
rename to t/t3.txt
diff --git a/hio/t/t4.txt b/t/t4.txt
similarity index 100%
rename from hio/t/t4.txt
rename to t/t4.txt