diff --git a/trx69/bulkdata/Makefile b/bulkdata/Makefile
similarity index 100%
rename from trx69/bulkdata/Makefile
rename to bulkdata/Makefile
diff --git a/trx69/bulkdata/files/etc/config/bulkdata b/bulkdata/files/etc/config/bulkdata
similarity index 100%
rename from trx69/bulkdata/files/etc/config/bulkdata
rename to bulkdata/files/etc/config/bulkdata
diff --git a/trx69/bulkdata/files/etc/init.d/bulkdatad b/bulkdata/files/etc/init.d/bulkdatad
similarity index 100%
rename from trx69/bulkdata/files/etc/init.d/bulkdatad
rename to bulkdata/files/etc/init.d/bulkdatad
diff --git a/trx69/bulkdata/src/Makefile b/bulkdata/src/Makefile
similarity index 100%
rename from trx69/bulkdata/src/Makefile
rename to bulkdata/src/Makefile
diff --git a/trx69/bulkdata/src/buci.c b/bulkdata/src/buci.c
similarity index 100%
rename from trx69/bulkdata/src/buci.c
rename to bulkdata/src/buci.c
diff --git a/trx69/bulkdata/src/buci.h b/bulkdata/src/buci.h
similarity index 100%
rename from trx69/bulkdata/src/buci.h
rename to bulkdata/src/buci.h
diff --git a/trx69/bulkdata/src/bulkdata.c b/bulkdata/src/bulkdata.c
similarity index 100%
rename from trx69/bulkdata/src/bulkdata.c
rename to bulkdata/src/bulkdata.c
diff --git a/trx69/bulkdata/src/bulkdata.h b/bulkdata/src/bulkdata.h
similarity index 100%
rename from trx69/bulkdata/src/bulkdata.h
rename to bulkdata/src/bulkdata.h
diff --git a/trx69/bulkdata/src/bulkdata.md b/bulkdata/src/bulkdata.md
similarity index 100%
rename from trx69/bulkdata/src/bulkdata.md
rename to bulkdata/src/bulkdata.md
diff --git a/trx69/bulkdata/src/common.c b/bulkdata/src/common.c
similarity index 100%
rename from trx69/bulkdata/src/common.c
rename to bulkdata/src/common.c
diff --git a/trx69/bulkdata/src/common.h b/bulkdata/src/common.h
similarity index 100%
rename from trx69/bulkdata/src/common.h
rename to bulkdata/src/common.h
diff --git a/trx69/bulkdata/src/config.c b/bulkdata/src/config.c
similarity index 100%
rename from trx69/bulkdata/src/config.c
rename to bulkdata/src/config.c
diff --git a/trx69/bulkdata/src/config.h b/bulkdata/src/config.h
similarity index 100%
rename from trx69/bulkdata/src/config.h
rename to bulkdata/src/config.h
diff --git a/trx69/bulkdata/src/datamodel.c b/bulkdata/src/datamodel.c
similarity index 100%
rename from trx69/bulkdata/src/datamodel.c
rename to bulkdata/src/datamodel.c
diff --git a/trx69/bulkdata/src/datamodel.h b/bulkdata/src/datamodel.h
similarity index 100%
rename from trx69/bulkdata/src/datamodel.h
rename to bulkdata/src/datamodel.h
diff --git a/trx69/bulkdata/src/http.c b/bulkdata/src/http.c
similarity index 100%
rename from trx69/bulkdata/src/http.c
rename to bulkdata/src/http.c
diff --git a/trx69/bulkdata/src/http.h b/bulkdata/src/http.h
similarity index 100%
rename from trx69/bulkdata/src/http.h
rename to bulkdata/src/http.h
diff --git a/trx69/bulkdata/src/log.c b/bulkdata/src/log.c
similarity index 100%
rename from trx69/bulkdata/src/log.c
rename to bulkdata/src/log.c
diff --git a/trx69/bulkdata/src/log.h b/bulkdata/src/log.h
similarity index 100%
rename from trx69/bulkdata/src/log.h
rename to bulkdata/src/log.h
diff --git a/trx69/bulkdata/src/report.c b/bulkdata/src/report.c
similarity index 100%
rename from trx69/bulkdata/src/report.c
rename to bulkdata/src/report.c
diff --git a/trx69/bulkdata/src/report.h b/bulkdata/src/report.h
similarity index 100%
rename from trx69/bulkdata/src/report.h
rename to bulkdata/src/report.h
diff --git a/trx69/bulkdata/src/times.c b/bulkdata/src/times.c
similarity index 100%
rename from trx69/bulkdata/src/times.c
rename to bulkdata/src/times.c
diff --git a/trx69/bulkdata/src/times.h b/bulkdata/src/times.h
similarity index 100%
rename from trx69/bulkdata/src/times.h
rename to bulkdata/src/times.h
diff --git a/trx69/icwmp/Config_cwmp.in b/icwmp/Config_cwmp.in
similarity index 100%
rename from trx69/icwmp/Config_cwmp.in
rename to icwmp/Config_cwmp.in
diff --git a/trx69/icwmp/Makefile b/icwmp/Makefile
similarity index 100%
rename from trx69/icwmp/Makefile
rename to icwmp/Makefile
diff --git a/trx69/icwmp/files/etc/config/cwmp b/icwmp/files/etc/config/cwmp
similarity index 100%
rename from trx69/icwmp/files/etc/config/cwmp
rename to icwmp/files/etc/config/cwmp
diff --git a/trx69/icwmp/files/etc/firewall.cwmp b/icwmp/files/etc/firewall.cwmp
similarity index 100%
rename from trx69/icwmp/files/etc/firewall.cwmp
rename to icwmp/files/etc/firewall.cwmp
diff --git a/trx69/icwmp/files/etc/hotplug.d/iface/90-icwmp b/icwmp/files/etc/hotplug.d/iface/90-icwmp
similarity index 100%
rename from trx69/icwmp/files/etc/hotplug.d/iface/90-icwmp
rename to icwmp/files/etc/hotplug.d/iface/90-icwmp
diff --git a/trx69/icwmp/files/etc/init.d/icwmpd b/icwmp/files/etc/init.d/icwmpd
similarity index 100%
rename from trx69/icwmp/files/etc/init.d/icwmpd
rename to icwmp/files/etc/init.d/icwmpd
diff --git a/trx69/icwmp/files/etc/uci-defaults/85-cwmp-set-userid b/icwmp/files/etc/uci-defaults/85-cwmp-set-userid
similarity index 100%
rename from trx69/icwmp/files/etc/uci-defaults/85-cwmp-set-userid
rename to icwmp/files/etc/uci-defaults/85-cwmp-set-userid
diff --git a/trx69/icwmp/files/etc/uci-defaults/90-cwmpfirewall b/icwmp/files/etc/uci-defaults/90-cwmpfirewall
similarity index 100%
rename from trx69/icwmp/files/etc/uci-defaults/90-cwmpfirewall
rename to icwmp/files/etc/uci-defaults/90-cwmpfirewall
diff --git a/trx69/icwmp/files/etc/uci-defaults/90-icwmp-set-dhcp-reqopts b/icwmp/files/etc/uci-defaults/90-icwmp-set-dhcp-reqopts
similarity index 100%
rename from trx69/icwmp/files/etc/uci-defaults/90-icwmp-set-dhcp-reqopts
rename to icwmp/files/etc/uci-defaults/90-icwmp-set-dhcp-reqopts
diff --git a/trx69/icwmp/files/lib/upgrade/keep.d/icwmp b/icwmp/files/lib/upgrade/keep.d/icwmp
similarity index 100%
rename from trx69/icwmp/files/lib/upgrade/keep.d/icwmp
rename to icwmp/files/lib/upgrade/keep.d/icwmp
diff --git a/trx69/stun/Makefile b/stun/Makefile
similarity index 100%
rename from trx69/stun/Makefile
rename to stun/Makefile
diff --git a/trx69/stun/files/etc/config/stun b/stun/files/etc/config/stun
similarity index 100%
rename from trx69/stun/files/etc/config/stun
rename to stun/files/etc/config/stun
diff --git a/trx69/stun/files/etc/init.d/stund b/stun/files/etc/init.d/stund
similarity index 100%
rename from trx69/stun/files/etc/init.d/stund
rename to stun/files/etc/init.d/stund
diff --git a/trx69/stun/src/Makefile b/stun/src/Makefile
similarity index 100%
rename from trx69/stun/src/Makefile
rename to stun/src/Makefile
diff --git a/trx69/stun/src/config.c b/stun/src/config.c
similarity index 100%
rename from trx69/stun/src/config.c
rename to stun/src/config.c
diff --git a/trx69/stun/src/config.h b/stun/src/config.h
similarity index 100%
rename from trx69/stun/src/config.h
rename to stun/src/config.h
diff --git a/trx69/stun/src/log.c b/stun/src/log.c
similarity index 100%
rename from trx69/stun/src/log.c
rename to stun/src/log.c
diff --git a/trx69/stun/src/log.h b/stun/src/log.h
similarity index 100%
rename from trx69/stun/src/log.h
rename to stun/src/log.h
diff --git a/trx69/stun/src/stun.c b/stun/src/stun.c
similarity index 100%
rename from trx69/stun/src/stun.c
rename to stun/src/stun.c
diff --git a/trx69/stun/src/stun.h b/stun/src/stun.h
similarity index 100%
rename from trx69/stun/src/stun.h
rename to stun/src/stun.h
diff --git a/trx69/stun/src/stun.md b/stun/src/stun.md
similarity index 100%
rename from trx69/stun/src/stun.md
rename to stun/src/stun.md
diff --git a/trx69/stun/src/ubus.c b/stun/src/ubus.c
similarity index 100%
rename from trx69/stun/src/ubus.c
rename to stun/src/ubus.c
diff --git a/trx69/stun/src/ubus.h b/stun/src/ubus.h
similarity index 100%
rename from trx69/stun/src/ubus.h
rename to stun/src/ubus.h
diff --git a/trx69/twamp/Makefile b/twamp/Makefile
similarity index 100%
rename from trx69/twamp/Makefile
rename to twamp/Makefile
diff --git a/trx69/twamp/files/etc/config/twamp b/twamp/files/etc/config/twamp
similarity index 100%
rename from trx69/twamp/files/etc/config/twamp
rename to twamp/files/etc/config/twamp
diff --git a/trx69/twamp/files/etc/init.d/twampd b/twamp/files/etc/init.d/twampd
similarity index 100%
rename from trx69/twamp/files/etc/init.d/twampd
rename to twamp/files/etc/init.d/twampd
diff --git a/trx69/twamp/src/Makefile b/twamp/src/Makefile
similarity index 100%
rename from trx69/twamp/src/Makefile
rename to twamp/src/Makefile
diff --git a/trx69/twamp/src/datamodel.c b/twamp/src/datamodel.c
similarity index 100%
rename from trx69/twamp/src/datamodel.c
rename to twamp/src/datamodel.c
diff --git a/trx69/twamp/src/datamodel.h b/twamp/src/datamodel.h
similarity index 100%
rename from trx69/twamp/src/datamodel.h
rename to twamp/src/datamodel.h
diff --git a/trx69/twamp/src/twamp.c b/twamp/src/twamp.c
similarity index 100%
rename from trx69/twamp/src/twamp.c
rename to twamp/src/twamp.c
diff --git a/trx69/twamp/src/twamp.h b/twamp/src/twamp.h
similarity index 100%
rename from trx69/twamp/src/twamp.h
rename to twamp/src/twamp.h
diff --git a/trx69/twamp/src/twamp.md b/twamp/src/twamp.md
similarity index 100%
rename from trx69/twamp/src/twamp.md
rename to twamp/src/twamp.md
diff --git a/trx69/twamp/src/twamplog.c b/twamp/src/twamplog.c
similarity index 100%
rename from trx69/twamp/src/twamplog.c
rename to twamp/src/twamplog.c
diff --git a/trx69/twamp/src/twamplog.h b/twamp/src/twamplog.h
similarity index 100%
rename from trx69/twamp/src/twamplog.h
rename to twamp/src/twamplog.h
diff --git a/trx69/twamp/src/twamptimestamp.c b/twamp/src/twamptimestamp.c
similarity index 100%
rename from trx69/twamp/src/twamptimestamp.c
rename to twamp/src/twamptimestamp.c
diff --git a/trx69/twamp/src/twampuci.c b/twamp/src/twampuci.c
similarity index 100%
rename from trx69/twamp/src/twampuci.c
rename to twamp/src/twampuci.c
diff --git a/trx69/twamp/src/twampuci.h b/twamp/src/twampuci.h
similarity index 100%
rename from trx69/twamp/src/twampuci.h
rename to twamp/src/twampuci.h
diff --git a/trx69/udpechoserver/Makefile b/udpechoserver/Makefile
similarity index 100%
rename from trx69/udpechoserver/Makefile
rename to udpechoserver/Makefile
diff --git a/trx69/udpechoserver/files/etc/config/udpechoserver b/udpechoserver/files/etc/config/udpechoserver
similarity index 100%
rename from trx69/udpechoserver/files/etc/config/udpechoserver
rename to udpechoserver/files/etc/config/udpechoserver
diff --git a/trx69/udpechoserver/files/etc/init.d/udpechoserverd b/udpechoserver/files/etc/init.d/udpechoserverd
similarity index 100%
rename from trx69/udpechoserver/files/etc/init.d/udpechoserverd
rename to udpechoserver/files/etc/init.d/udpechoserverd
diff --git a/trx69/udpechoserver/src/Makefile b/udpechoserver/src/Makefile
similarity index 100%
rename from trx69/udpechoserver/src/Makefile
rename to udpechoserver/src/Makefile
diff --git a/trx69/udpechoserver/src/datamodel.c b/udpechoserver/src/datamodel.c
similarity index 100%
rename from trx69/udpechoserver/src/datamodel.c
rename to udpechoserver/src/datamodel.c
diff --git a/trx69/udpechoserver/src/datamodel.h b/udpechoserver/src/datamodel.h
similarity index 100%
rename from trx69/udpechoserver/src/datamodel.h
rename to udpechoserver/src/datamodel.h
diff --git a/trx69/udpechoserver/src/udpechoserver.c b/udpechoserver/src/udpechoserver.c
similarity index 100%
rename from trx69/udpechoserver/src/udpechoserver.c
rename to udpechoserver/src/udpechoserver.c
diff --git a/trx69/udpechoserver/src/udpechoserver.h b/udpechoserver/src/udpechoserver.h
similarity index 100%
rename from trx69/udpechoserver/src/udpechoserver.h
rename to udpechoserver/src/udpechoserver.h
diff --git a/trx69/udpechoserver/src/udpechoserver.md b/udpechoserver/src/udpechoserver.md
similarity index 100%
rename from trx69/udpechoserver/src/udpechoserver.md
rename to udpechoserver/src/udpechoserver.md
diff --git a/trx69/udpechoserver/src/udpechoserverlog.c b/udpechoserver/src/udpechoserverlog.c
similarity index 100%
rename from trx69/udpechoserver/src/udpechoserverlog.c
rename to udpechoserver/src/udpechoserverlog.c
diff --git a/trx69/udpechoserver/src/udpechoserverlog.h b/udpechoserver/src/udpechoserverlog.h
similarity index 100%
rename from trx69/udpechoserver/src/udpechoserverlog.h
rename to udpechoserver/src/udpechoserverlog.h
diff --git a/trx69/udpechoserver/src/udpechoserveruci.c b/udpechoserver/src/udpechoserveruci.c
similarity index 100%
rename from trx69/udpechoserver/src/udpechoserveruci.c
rename to udpechoserver/src/udpechoserveruci.c
diff --git a/trx69/udpechoserver/src/udpechoserveruci.h b/udpechoserver/src/udpechoserveruci.h
similarity index 100%
rename from trx69/udpechoserver/src/udpechoserveruci.h
rename to udpechoserver/src/udpechoserveruci.h
diff --git a/trx69/xmpp/Makefile b/xmpp/Makefile
similarity index 100%
rename from trx69/xmpp/Makefile
rename to xmpp/Makefile
diff --git a/trx69/xmpp/files/etc/config/xmpp b/xmpp/files/etc/config/xmpp
similarity index 100%
rename from trx69/xmpp/files/etc/config/xmpp
rename to xmpp/files/etc/config/xmpp
diff --git a/trx69/xmpp/files/etc/hotplug.d/iface/91-icwmp_xmpp b/xmpp/files/etc/hotplug.d/iface/91-icwmp_xmpp
similarity index 100%
rename from trx69/xmpp/files/etc/hotplug.d/iface/91-icwmp_xmpp
rename to xmpp/files/etc/hotplug.d/iface/91-icwmp_xmpp
diff --git a/trx69/xmpp/files/etc/init.d/xmppd b/xmpp/files/etc/init.d/xmppd
similarity index 100%
rename from trx69/xmpp/files/etc/init.d/xmppd
rename to xmpp/files/etc/init.d/xmppd
diff --git a/trx69/xmpp/src/Makefile b/xmpp/src/Makefile
similarity index 100%
rename from trx69/xmpp/src/Makefile
rename to xmpp/src/Makefile
diff --git a/trx69/xmpp/src/cmd.c b/xmpp/src/cmd.c
similarity index 100%
rename from trx69/xmpp/src/cmd.c
rename to xmpp/src/cmd.c
diff --git a/trx69/xmpp/src/cmd.h b/xmpp/src/cmd.h
similarity index 100%
rename from trx69/xmpp/src/cmd.h
rename to xmpp/src/cmd.h
diff --git a/trx69/xmpp/src/datamodel.c b/xmpp/src/datamodel.c
similarity index 100%
rename from trx69/xmpp/src/datamodel.c
rename to xmpp/src/datamodel.c
diff --git a/trx69/xmpp/src/datamodel.h b/xmpp/src/datamodel.h
similarity index 100%
rename from trx69/xmpp/src/datamodel.h
rename to xmpp/src/datamodel.h
diff --git a/trx69/xmpp/src/log.c b/xmpp/src/log.c
similarity index 100%
rename from trx69/xmpp/src/log.c
rename to xmpp/src/log.c
diff --git a/trx69/xmpp/src/log.h b/xmpp/src/log.h
similarity index 100%
rename from trx69/xmpp/src/log.h
rename to xmpp/src/log.h
diff --git a/trx69/xmpp/src/xmpp.c b/xmpp/src/xmpp.c
similarity index 100%
rename from trx69/xmpp/src/xmpp.c
rename to xmpp/src/xmpp.c
diff --git a/trx69/xmpp/src/xmpp.h b/xmpp/src/xmpp.h
similarity index 100%
rename from trx69/xmpp/src/xmpp.h
rename to xmpp/src/xmpp.h
diff --git a/trx69/xmpp/src/xmpp.md b/xmpp/src/xmpp.md
similarity index 100%
rename from trx69/xmpp/src/xmpp.md
rename to xmpp/src/xmpp.md
diff --git a/trx69/xmpp/src/xuci.c b/xmpp/src/xuci.c
similarity index 100%
rename from trx69/xmpp/src/xuci.c
rename to xmpp/src/xuci.c
diff --git a/trx69/xmpp/src/xuci.h b/xmpp/src/xuci.h
similarity index 100%
rename from trx69/xmpp/src/xuci.h
rename to xmpp/src/xuci.h