diff --git a/contrib/bsnmp/Makefile.in b/Makefile.in
similarity index 100%
rename from contrib/bsnmp/Makefile.in
rename to Makefile.in
diff --git a/contrib/bsnmp/NEWS b/NEWS
similarity index 100%
rename from contrib/bsnmp/NEWS
rename to NEWS
diff --git a/contrib/bsnmp/README b/README
similarity index 100%
rename from contrib/bsnmp/README
rename to README
diff --git a/contrib/bsnmp/TODO b/TODO
similarity index 100%
rename from contrib/bsnmp/TODO
rename to TODO
diff --git a/contrib/bsnmp/VERSION b/VERSION
similarity index 100%
rename from contrib/bsnmp/VERSION
rename to VERSION
diff --git a/contrib/bsnmp/acinclude.m4 b/acinclude.m4
similarity index 100%
rename from contrib/bsnmp/acinclude.m4
rename to acinclude.m4
diff --git a/contrib/bsnmp/aclocal.m4 b/aclocal.m4
similarity index 100%
rename from contrib/bsnmp/aclocal.m4
rename to aclocal.m4
diff --git a/contrib/bsnmp/config/Makefile.build b/config/Makefile.build
similarity index 100%
rename from contrib/bsnmp/config/Makefile.build
rename to config/Makefile.build
diff --git a/contrib/bsnmp/config/Makefile.post b/config/Makefile.post
similarity index 100%
rename from contrib/bsnmp/config/Makefile.post
rename to config/Makefile.post
diff --git a/contrib/bsnmp/config/Makefile.pre b/config/Makefile.pre
similarity index 100%
rename from contrib/bsnmp/config/Makefile.pre
rename to config/Makefile.pre
diff --git a/contrib/bsnmp/config/config.guess b/config/config.guess
similarity index 100%
rename from contrib/bsnmp/config/config.guess
rename to config/config.guess
diff --git a/contrib/bsnmp/config/config.sub b/config/config.sub
similarity index 100%
rename from contrib/bsnmp/config/config.sub
rename to config/config.sub
diff --git a/contrib/bsnmp/config/install.sh b/config/install.sh
similarity index 100%
rename from contrib/bsnmp/config/install.sh
rename to config/install.sh
diff --git a/contrib/bsnmp/config/ltmain.sh b/config/ltmain.sh
similarity index 100%
rename from contrib/bsnmp/config/ltmain.sh
rename to config/ltmain.sh
diff --git a/contrib/bsnmp/config/mkinstalldirs b/config/mkinstalldirs
similarity index 100%
rename from contrib/bsnmp/config/mkinstalldirs
rename to config/mkinstalldirs
diff --git a/contrib/bsnmp/configure b/configure
similarity index 100%
rename from contrib/bsnmp/configure
rename to configure
diff --git a/contrib/bsnmp/configure.ac b/configure.ac
similarity index 100%
rename from contrib/bsnmp/configure.ac
rename to configure.ac
diff --git a/contrib/bsnmp/gensnmpdef/Makefile.in b/gensnmpdef/Makefile.in
similarity index 100%
rename from contrib/bsnmp/gensnmpdef/Makefile.in
rename to gensnmpdef/Makefile.in
diff --git a/contrib/bsnmp/gensnmpdef/gensnmpdef.1 b/gensnmpdef/gensnmpdef.1
similarity index 100%
rename from contrib/bsnmp/gensnmpdef/gensnmpdef.1
rename to gensnmpdef/gensnmpdef.1
diff --git a/contrib/bsnmp/gensnmpdef/gensnmpdef.c b/gensnmpdef/gensnmpdef.c
similarity index 100%
rename from contrib/bsnmp/gensnmpdef/gensnmpdef.c
rename to gensnmpdef/gensnmpdef.c
diff --git a/contrib/bsnmp/gensnmptree/Makefile.in b/gensnmptree/Makefile.in
similarity index 100%
rename from contrib/bsnmp/gensnmptree/Makefile.in
rename to gensnmptree/Makefile.in
diff --git a/contrib/bsnmp/gensnmptree/gensnmptree.1 b/gensnmptree/gensnmptree.1
similarity index 100%
rename from contrib/bsnmp/gensnmptree/gensnmptree.1
rename to gensnmptree/gensnmptree.1
diff --git a/contrib/bsnmp/gensnmptree/gensnmptree.c b/gensnmptree/gensnmptree.c
similarity index 100%
rename from contrib/bsnmp/gensnmptree/gensnmptree.c
rename to gensnmptree/gensnmptree.c
diff --git a/contrib/bsnmp/lib/Makefile.in b/lib/Makefile.in
similarity index 100%
rename from contrib/bsnmp/lib/Makefile.in
rename to lib/Makefile.in
diff --git a/contrib/bsnmp/lib/asn1.3 b/lib/asn1.3
similarity index 100%
rename from contrib/bsnmp/lib/asn1.3
rename to lib/asn1.3
diff --git a/contrib/bsnmp/lib/asn1.c b/lib/asn1.c
similarity index 100%
rename from contrib/bsnmp/lib/asn1.c
rename to lib/asn1.c
diff --git a/contrib/bsnmp/lib/asn1.h b/lib/asn1.h
similarity index 100%
rename from contrib/bsnmp/lib/asn1.h
rename to lib/asn1.h
diff --git a/contrib/bsnmp/lib/bsnmpagent.3 b/lib/bsnmpagent.3
similarity index 100%
rename from contrib/bsnmp/lib/bsnmpagent.3
rename to lib/bsnmpagent.3
diff --git a/contrib/bsnmp/lib/bsnmpclient.3 b/lib/bsnmpclient.3
similarity index 100%
rename from contrib/bsnmp/lib/bsnmpclient.3
rename to lib/bsnmpclient.3
diff --git a/contrib/bsnmp/lib/bsnmplib.3 b/lib/bsnmplib.3
similarity index 100%
rename from contrib/bsnmp/lib/bsnmplib.3
rename to lib/bsnmplib.3
diff --git a/contrib/bsnmp/lib/snmp.c b/lib/snmp.c
similarity index 100%
rename from contrib/bsnmp/lib/snmp.c
rename to lib/snmp.c
diff --git a/contrib/bsnmp/lib/snmp.h b/lib/snmp.h
similarity index 100%
rename from contrib/bsnmp/lib/snmp.h
rename to lib/snmp.h
diff --git a/contrib/bsnmp/lib/snmpagent.c b/lib/snmpagent.c
similarity index 100%
rename from contrib/bsnmp/lib/snmpagent.c
rename to lib/snmpagent.c
diff --git a/contrib/bsnmp/lib/snmpagent.h b/lib/snmpagent.h
similarity index 100%
rename from contrib/bsnmp/lib/snmpagent.h
rename to lib/snmpagent.h
diff --git a/contrib/bsnmp/lib/snmpclient.c b/lib/snmpclient.c
similarity index 100%
rename from contrib/bsnmp/lib/snmpclient.c
rename to lib/snmpclient.c
diff --git a/contrib/bsnmp/lib/snmpclient.h b/lib/snmpclient.h
similarity index 100%
rename from contrib/bsnmp/lib/snmpclient.h
rename to lib/snmpclient.h
diff --git a/contrib/bsnmp/lib/snmppriv.h b/lib/snmppriv.h
similarity index 100%
rename from contrib/bsnmp/lib/snmppriv.h
rename to lib/snmppriv.h
diff --git a/contrib/bsnmp/lib/support.c b/lib/support.c
similarity index 100%
rename from contrib/bsnmp/lib/support.c
rename to lib/support.c
diff --git a/contrib/bsnmp/lib/support.h b/lib/support.h
similarity index 100%
rename from contrib/bsnmp/lib/support.h
rename to lib/support.h
diff --git a/contrib/bsnmp/oid-list b/oid-list
similarity index 100%
rename from contrib/bsnmp/oid-list
rename to oid-list
diff --git a/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt b/snmp_mibII/BEGEMOT-IP-MIB.txt
similarity index 100%
rename from contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt
rename to snmp_mibII/BEGEMOT-IP-MIB.txt
diff --git a/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt b/snmp_mibII/BEGEMOT-MIB2-MIB.txt
similarity index 100%
rename from contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt
rename to snmp_mibII/BEGEMOT-MIB2-MIB.txt
diff --git a/contrib/bsnmp/snmp_mibII/mibII.c b/snmp_mibII/mibII.c
similarity index 100%
rename from contrib/bsnmp/snmp_mibII/mibII.c
rename to snmp_mibII/mibII.c
diff --git a/contrib/bsnmp/snmp_mibII/mibII.h b/snmp_mibII/mibII.h
similarity index 100%
rename from contrib/bsnmp/snmp_mibII/mibII.h
rename to snmp_mibII/mibII.h
diff --git a/contrib/bsnmp/snmp_mibII/mibII_begemot.c b/snmp_mibII/mibII_begemot.c
similarity index 100%
rename from contrib/bsnmp/snmp_mibII/mibII_begemot.c
rename to snmp_mibII/mibII_begemot.c
diff --git a/contrib/bsnmp/snmp_mibII/mibII_ifmib.c b/snmp_mibII/mibII_ifmib.c
similarity index 100%
rename from contrib/bsnmp/snmp_mibII/mibII_ifmib.c
rename to snmp_mibII/mibII_ifmib.c
diff --git a/contrib/bsnmp/snmp_mibII/mibII_ifstack.c b/snmp_mibII/mibII_ifstack.c
similarity index 100%
rename from contrib/bsnmp/snmp_mibII/mibII_ifstack.c
rename to snmp_mibII/mibII_ifstack.c
diff --git a/contrib/bsnmp/snmp_mibII/mibII_interfaces.c b/snmp_mibII/mibII_interfaces.c
similarity index 100%
rename from contrib/bsnmp/snmp_mibII/mibII_interfaces.c
rename to snmp_mibII/mibII_interfaces.c
diff --git a/contrib/bsnmp/snmp_mibII/mibII_ip.c b/snmp_mibII/mibII_ip.c
similarity index 100%
rename from contrib/bsnmp/snmp_mibII/mibII_ip.c
rename to snmp_mibII/mibII_ip.c
diff --git a/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c b/snmp_mibII/mibII_ipaddr.c
similarity index 100%
rename from contrib/bsnmp/snmp_mibII/mibII_ipaddr.c
rename to snmp_mibII/mibII_ipaddr.c
diff --git a/contrib/bsnmp/snmp_mibII/mibII_nettomedia.c b/snmp_mibII/mibII_nettomedia.c
similarity index 100%
rename from contrib/bsnmp/snmp_mibII/mibII_nettomedia.c
rename to snmp_mibII/mibII_nettomedia.c
diff --git a/contrib/bsnmp/snmp_mibII/mibII_rcvaddr.c b/snmp_mibII/mibII_rcvaddr.c
similarity index 100%
rename from contrib/bsnmp/snmp_mibII/mibII_rcvaddr.c
rename to snmp_mibII/mibII_rcvaddr.c
diff --git a/contrib/bsnmp/snmp_mibII/mibII_route.c b/snmp_mibII/mibII_route.c
similarity index 100%
rename from contrib/bsnmp/snmp_mibII/mibII_route.c
rename to snmp_mibII/mibII_route.c
diff --git a/contrib/bsnmp/snmp_mibII/mibII_tcp.c b/snmp_mibII/mibII_tcp.c
similarity index 100%
rename from contrib/bsnmp/snmp_mibII/mibII_tcp.c
rename to snmp_mibII/mibII_tcp.c
diff --git a/contrib/bsnmp/snmp_mibII/mibII_tree.def b/snmp_mibII/mibII_tree.def
similarity index 100%
rename from contrib/bsnmp/snmp_mibII/mibII_tree.def
rename to snmp_mibII/mibII_tree.def
diff --git a/contrib/bsnmp/snmp_mibII/mibII_udp.c b/snmp_mibII/mibII_udp.c
similarity index 100%
rename from contrib/bsnmp/snmp_mibII/mibII_udp.c
rename to snmp_mibII/mibII_udp.c
diff --git a/contrib/bsnmp/snmp_mibII/snmp_mibII.3 b/snmp_mibII/snmp_mibII.3
similarity index 100%
rename from contrib/bsnmp/snmp_mibII/snmp_mibII.3
rename to snmp_mibII/snmp_mibII.3
diff --git a/contrib/bsnmp/snmp_mibII/snmp_mibII.h b/snmp_mibII/snmp_mibII.h
similarity index 100%
rename from contrib/bsnmp/snmp_mibII/snmp_mibII.h
rename to snmp_mibII/snmp_mibII.h
diff --git a/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt b/snmp_ntp/BEGEMOT-NTP-MIB.txt
similarity index 100%
rename from contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt
rename to snmp_ntp/BEGEMOT-NTP-MIB.txt
diff --git a/contrib/bsnmp/snmp_ntp/Makefile.in b/snmp_ntp/Makefile.in
similarity index 100%
rename from contrib/bsnmp/snmp_ntp/Makefile.in
rename to snmp_ntp/Makefile.in
diff --git a/contrib/bsnmp/snmp_ntp/NTP-MIB.txt b/snmp_ntp/NTP-MIB.txt
similarity index 100%
rename from contrib/bsnmp/snmp_ntp/NTP-MIB.txt
rename to snmp_ntp/NTP-MIB.txt
diff --git a/contrib/bsnmp/snmp_ntp/NTP-PROXY-MIB.txt b/snmp_ntp/NTP-PROXY-MIB.txt
similarity index 100%
rename from contrib/bsnmp/snmp_ntp/NTP-PROXY-MIB.txt
rename to snmp_ntp/NTP-PROXY-MIB.txt
diff --git a/contrib/bsnmp/snmp_ntp/ntp_tree.def b/snmp_ntp/ntp_tree.def
similarity index 100%
rename from contrib/bsnmp/snmp_ntp/ntp_tree.def
rename to snmp_ntp/ntp_tree.def
diff --git a/contrib/bsnmp/snmp_ntp/snmp_ntp.c b/snmp_ntp/snmp_ntp.c
similarity index 100%
rename from contrib/bsnmp/snmp_ntp/snmp_ntp.c
rename to snmp_ntp/snmp_ntp.c
diff --git a/contrib/bsnmp/snmpd/.gdbinit b/snmpd/.gdbinit
similarity index 100%
rename from contrib/bsnmp/snmpd/.gdbinit
rename to snmpd/.gdbinit
diff --git a/contrib/bsnmp/snmpd/BEGEMOT-MIB.txt b/snmpd/BEGEMOT-MIB.txt
similarity index 100%
rename from contrib/bsnmp/snmpd/BEGEMOT-MIB.txt
rename to snmpd/BEGEMOT-MIB.txt
diff --git a/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt b/snmpd/BEGEMOT-SNMPD.txt
similarity index 100%
rename from contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt
rename to snmpd/BEGEMOT-SNMPD.txt
diff --git a/contrib/bsnmp/snmpd/FOKUS-MIB.txt b/snmpd/FOKUS-MIB.txt
similarity index 100%
rename from contrib/bsnmp/snmpd/FOKUS-MIB.txt
rename to snmpd/FOKUS-MIB.txt
diff --git a/contrib/bsnmp/snmpd/Makefile.in b/snmpd/Makefile.in
similarity index 100%
rename from contrib/bsnmp/snmpd/Makefile.in
rename to snmpd/Makefile.in
diff --git a/contrib/bsnmp/snmpd/action.c b/snmpd/action.c
similarity index 100%
rename from contrib/bsnmp/snmpd/action.c
rename to snmpd/action.c
diff --git a/contrib/bsnmp/snmpd/bsnmpd.1 b/snmpd/bsnmpd.1
similarity index 100%
rename from contrib/bsnmp/snmpd/bsnmpd.1
rename to snmpd/bsnmpd.1
diff --git a/contrib/bsnmp/snmpd/config.c b/snmpd/config.c
similarity index 100%
rename from contrib/bsnmp/snmpd/config.c
rename to snmpd/config.c
diff --git a/contrib/bsnmp/snmpd/export.c b/snmpd/export.c
similarity index 100%
rename from contrib/bsnmp/snmpd/export.c
rename to snmpd/export.c
diff --git a/contrib/bsnmp/snmpd/main.c b/snmpd/main.c
similarity index 100%
rename from contrib/bsnmp/snmpd/main.c
rename to snmpd/main.c
diff --git a/contrib/bsnmp/snmpd/snmpd.config b/snmpd/snmpd.config
similarity index 100%
rename from contrib/bsnmp/snmpd/snmpd.config
rename to snmpd/snmpd.config
diff --git a/contrib/bsnmp/snmpd/snmpd.h b/snmpd/snmpd.h
similarity index 100%
rename from contrib/bsnmp/snmpd/snmpd.h
rename to snmpd/snmpd.h
diff --git a/contrib/bsnmp/snmpd/snmpd.sh b/snmpd/snmpd.sh
similarity index 100%
rename from contrib/bsnmp/snmpd/snmpd.sh
rename to snmpd/snmpd.sh
diff --git a/contrib/bsnmp/snmpd/snmpmod.3 b/snmpd/snmpmod.3
similarity index 100%
rename from contrib/bsnmp/snmpd/snmpmod.3
rename to snmpd/snmpmod.3
diff --git a/contrib/bsnmp/snmpd/snmpmod.h b/snmpd/snmpmod.h
similarity index 100%
rename from contrib/bsnmp/snmpd/snmpmod.h
rename to snmpd/snmpmod.h
diff --git a/contrib/bsnmp/snmpd/trans_lsock.c b/snmpd/trans_lsock.c
similarity index 100%
rename from contrib/bsnmp/snmpd/trans_lsock.c
rename to snmpd/trans_lsock.c
diff --git a/contrib/bsnmp/snmpd/trans_lsock.h b/snmpd/trans_lsock.h
similarity index 100%
rename from contrib/bsnmp/snmpd/trans_lsock.h
rename to snmpd/trans_lsock.h
diff --git a/contrib/bsnmp/snmpd/trans_udp.c b/snmpd/trans_udp.c
similarity index 100%
rename from contrib/bsnmp/snmpd/trans_udp.c
rename to snmpd/trans_udp.c
diff --git a/contrib/bsnmp/snmpd/trans_udp.h b/snmpd/trans_udp.h
similarity index 100%
rename from contrib/bsnmp/snmpd/trans_udp.h
rename to snmpd/trans_udp.h
diff --git a/contrib/bsnmp/snmpd/trap.c b/snmpd/trap.c
similarity index 100%
rename from contrib/bsnmp/snmpd/trap.c
rename to snmpd/trap.c
diff --git a/contrib/bsnmp/snmpd/tree.def b/snmpd/tree.def
similarity index 100%
rename from contrib/bsnmp/snmpd/tree.def
rename to snmpd/tree.def