diff --git a/components/net/lwip-1.4.0/CHANGELOG b/components/net/lwip/CHANGELOG
similarity index 100%
rename from components/net/lwip-1.4.0/CHANGELOG
rename to components/net/lwip/CHANGELOG
diff --git a/components/net/lwip-1.4.0/COPYING b/components/net/lwip/COPYING
similarity index 100%
rename from components/net/lwip-1.4.0/COPYING
rename to components/net/lwip/COPYING
diff --git a/components/net/lwip-1.4.0/FILES b/components/net/lwip/FILES
similarity index 100%
rename from components/net/lwip-1.4.0/FILES
rename to components/net/lwip/FILES
diff --git a/components/net/lwip-1.4.0/README b/components/net/lwip/README
similarity index 100%
rename from components/net/lwip-1.4.0/README
rename to components/net/lwip/README
diff --git a/components/net/lwip-1.4.0/SConscript b/components/net/lwip/SConscript
similarity index 100%
rename from components/net/lwip-1.4.0/SConscript
rename to components/net/lwip/SConscript
diff --git a/components/net/lwip-1.4.0/UPGRADING b/components/net/lwip/UPGRADING
similarity index 100%
rename from components/net/lwip-1.4.0/UPGRADING
rename to components/net/lwip/UPGRADING
diff --git a/components/net/lwip-1.4.0/apps/SConscript b/components/net/lwip/apps/SConscript
similarity index 100%
rename from components/net/lwip-1.4.0/apps/SConscript
rename to components/net/lwip/apps/SConscript
diff --git a/components/net/lwip-1.4.0/apps/chargen.c b/components/net/lwip/apps/chargen.c
similarity index 100%
rename from components/net/lwip-1.4.0/apps/chargen.c
rename to components/net/lwip/apps/chargen.c
diff --git a/components/net/lwip-1.4.0/apps/ftpd.c b/components/net/lwip/apps/ftpd.c
similarity index 100%
rename from components/net/lwip-1.4.0/apps/ftpd.c
rename to components/net/lwip/apps/ftpd.c
diff --git a/components/net/lwip-1.4.0/apps/netio.c b/components/net/lwip/apps/netio.c
similarity index 100%
rename from components/net/lwip-1.4.0/apps/netio.c
rename to components/net/lwip/apps/netio.c
diff --git a/components/net/lwip-1.4.0/apps/ping.c b/components/net/lwip/apps/ping.c
similarity index 100%
rename from components/net/lwip-1.4.0/apps/ping.c
rename to components/net/lwip/apps/ping.c
diff --git a/components/net/lwip-1.4.0/apps/sntp.c b/components/net/lwip/apps/sntp.c
similarity index 100%
rename from components/net/lwip-1.4.0/apps/sntp.c
rename to components/net/lwip/apps/sntp.c
diff --git a/components/net/lwip-1.4.0/apps/tcpecho.c b/components/net/lwip/apps/tcpecho.c
similarity index 100%
rename from components/net/lwip-1.4.0/apps/tcpecho.c
rename to components/net/lwip/apps/tcpecho.c
diff --git a/components/net/lwip-1.4.0/apps/tftp.c b/components/net/lwip/apps/tftp.c
similarity index 100%
rename from components/net/lwip-1.4.0/apps/tftp.c
rename to components/net/lwip/apps/tftp.c
diff --git a/components/net/lwip-1.4.0/apps/udpecho.c b/components/net/lwip/apps/udpecho.c
similarity index 100%
rename from components/net/lwip-1.4.0/apps/udpecho.c
rename to components/net/lwip/apps/udpecho.c
diff --git a/components/net/lwip-1.4.0/doc/FILES b/components/net/lwip/doc/FILES
similarity index 100%
rename from components/net/lwip-1.4.0/doc/FILES
rename to components/net/lwip/doc/FILES
diff --git a/components/net/lwip-1.4.0/doc/contrib.txt b/components/net/lwip/doc/contrib.txt
similarity index 100%
rename from components/net/lwip-1.4.0/doc/contrib.txt
rename to components/net/lwip/doc/contrib.txt
diff --git a/components/net/lwip-1.4.0/doc/rawapi.txt b/components/net/lwip/doc/rawapi.txt
similarity index 100%
rename from components/net/lwip-1.4.0/doc/rawapi.txt
rename to components/net/lwip/doc/rawapi.txt
diff --git a/components/net/lwip-1.4.0/doc/savannah.txt b/components/net/lwip/doc/savannah.txt
similarity index 100%
rename from components/net/lwip-1.4.0/doc/savannah.txt
rename to components/net/lwip/doc/savannah.txt
diff --git a/components/net/lwip-1.4.0/doc/snmp_agent.txt b/components/net/lwip/doc/snmp_agent.txt
similarity index 100%
rename from components/net/lwip-1.4.0/doc/snmp_agent.txt
rename to components/net/lwip/doc/snmp_agent.txt
diff --git a/components/net/lwip-1.4.0/doc/sys_arch.txt b/components/net/lwip/doc/sys_arch.txt
similarity index 100%
rename from components/net/lwip-1.4.0/doc/sys_arch.txt
rename to components/net/lwip/doc/sys_arch.txt
diff --git a/components/net/lwip-1.4.0/src/.hgignore b/components/net/lwip/src/.hgignore
similarity index 100%
rename from components/net/lwip-1.4.0/src/.hgignore
rename to components/net/lwip/src/.hgignore
diff --git a/components/net/lwip-1.4.0/src/FILES b/components/net/lwip/src/FILES
similarity index 100%
rename from components/net/lwip-1.4.0/src/FILES
rename to components/net/lwip/src/FILES
diff --git a/components/net/lwip-1.4.0/src/api/api_lib.c b/components/net/lwip/src/api/api_lib.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/api/api_lib.c
rename to components/net/lwip/src/api/api_lib.c
diff --git a/components/net/lwip-1.4.0/src/api/api_msg.c b/components/net/lwip/src/api/api_msg.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/api/api_msg.c
rename to components/net/lwip/src/api/api_msg.c
diff --git a/components/net/lwip-1.4.0/src/api/err.c b/components/net/lwip/src/api/err.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/api/err.c
rename to components/net/lwip/src/api/err.c
diff --git a/components/net/lwip-1.4.0/src/api/netbuf.c b/components/net/lwip/src/api/netbuf.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/api/netbuf.c
rename to components/net/lwip/src/api/netbuf.c
diff --git a/components/net/lwip-1.4.0/src/api/netdb.c b/components/net/lwip/src/api/netdb.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/api/netdb.c
rename to components/net/lwip/src/api/netdb.c
diff --git a/components/net/lwip-1.4.0/src/api/netifapi.c b/components/net/lwip/src/api/netifapi.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/api/netifapi.c
rename to components/net/lwip/src/api/netifapi.c
diff --git a/components/net/lwip-1.4.0/src/api/sockets.c b/components/net/lwip/src/api/sockets.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/api/sockets.c
rename to components/net/lwip/src/api/sockets.c
diff --git a/components/net/lwip-1.4.0/src/api/tcpip.c b/components/net/lwip/src/api/tcpip.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/api/tcpip.c
rename to components/net/lwip/src/api/tcpip.c
diff --git a/components/net/lwip-1.4.0/src/arch/include/arch/cc.h b/components/net/lwip/src/arch/include/arch/cc.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/arch/include/arch/cc.h
rename to components/net/lwip/src/arch/include/arch/cc.h
diff --git a/components/net/lwip-1.4.0/src/arch/include/arch/perf.h b/components/net/lwip/src/arch/include/arch/perf.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/arch/include/arch/perf.h
rename to components/net/lwip/src/arch/include/arch/perf.h
diff --git a/components/net/lwip-1.4.0/src/arch/include/arch/sys_arch.h b/components/net/lwip/src/arch/include/arch/sys_arch.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/arch/include/arch/sys_arch.h
rename to components/net/lwip/src/arch/include/arch/sys_arch.h
diff --git a/components/net/lwip-1.4.0/src/arch/sys_arch.c b/components/net/lwip/src/arch/sys_arch.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/arch/sys_arch.c
rename to components/net/lwip/src/arch/sys_arch.c
diff --git a/components/net/lwip-1.4.0/src/core/def.c b/components/net/lwip/src/core/def.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/def.c
rename to components/net/lwip/src/core/def.c
diff --git a/components/net/lwip-1.4.0/src/core/dhcp.c b/components/net/lwip/src/core/dhcp.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/dhcp.c
rename to components/net/lwip/src/core/dhcp.c
diff --git a/components/net/lwip-1.4.0/src/core/dns.c b/components/net/lwip/src/core/dns.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/dns.c
rename to components/net/lwip/src/core/dns.c
diff --git a/components/net/lwip-1.4.0/src/core/init.c b/components/net/lwip/src/core/init.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/init.c
rename to components/net/lwip/src/core/init.c
diff --git a/components/net/lwip-1.4.0/src/core/ipv4/autoip.c b/components/net/lwip/src/core/ipv4/autoip.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/ipv4/autoip.c
rename to components/net/lwip/src/core/ipv4/autoip.c
diff --git a/components/net/lwip-1.4.0/src/core/ipv4/icmp.c b/components/net/lwip/src/core/ipv4/icmp.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/ipv4/icmp.c
rename to components/net/lwip/src/core/ipv4/icmp.c
diff --git a/components/net/lwip-1.4.0/src/core/ipv4/igmp.c b/components/net/lwip/src/core/ipv4/igmp.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/ipv4/igmp.c
rename to components/net/lwip/src/core/ipv4/igmp.c
diff --git a/components/net/lwip-1.4.0/src/core/ipv4/inet.c b/components/net/lwip/src/core/ipv4/inet.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/ipv4/inet.c
rename to components/net/lwip/src/core/ipv4/inet.c
diff --git a/components/net/lwip-1.4.0/src/core/ipv4/inet_chksum.c b/components/net/lwip/src/core/ipv4/inet_chksum.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/ipv4/inet_chksum.c
rename to components/net/lwip/src/core/ipv4/inet_chksum.c
diff --git a/components/net/lwip-1.4.0/src/core/ipv4/ip.c b/components/net/lwip/src/core/ipv4/ip.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/ipv4/ip.c
rename to components/net/lwip/src/core/ipv4/ip.c
diff --git a/components/net/lwip-1.4.0/src/core/ipv4/ip_addr.c b/components/net/lwip/src/core/ipv4/ip_addr.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/ipv4/ip_addr.c
rename to components/net/lwip/src/core/ipv4/ip_addr.c
diff --git a/components/net/lwip-1.4.0/src/core/ipv4/ip_frag.c b/components/net/lwip/src/core/ipv4/ip_frag.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/ipv4/ip_frag.c
rename to components/net/lwip/src/core/ipv4/ip_frag.c
diff --git a/components/net/lwip-1.4.0/src/core/ipv6/README b/components/net/lwip/src/core/ipv6/README
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/ipv6/README
rename to components/net/lwip/src/core/ipv6/README
diff --git a/components/net/lwip-1.4.0/src/core/ipv6/icmp6.c b/components/net/lwip/src/core/ipv6/icmp6.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/ipv6/icmp6.c
rename to components/net/lwip/src/core/ipv6/icmp6.c
diff --git a/components/net/lwip-1.4.0/src/core/ipv6/inet6.c b/components/net/lwip/src/core/ipv6/inet6.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/ipv6/inet6.c
rename to components/net/lwip/src/core/ipv6/inet6.c
diff --git a/components/net/lwip-1.4.0/src/core/ipv6/ip6.c b/components/net/lwip/src/core/ipv6/ip6.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/ipv6/ip6.c
rename to components/net/lwip/src/core/ipv6/ip6.c
diff --git a/components/net/lwip-1.4.0/src/core/ipv6/ip6_addr.c b/components/net/lwip/src/core/ipv6/ip6_addr.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/ipv6/ip6_addr.c
rename to components/net/lwip/src/core/ipv6/ip6_addr.c
diff --git a/components/net/lwip-1.4.0/src/core/mem.c b/components/net/lwip/src/core/mem.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/mem.c
rename to components/net/lwip/src/core/mem.c
diff --git a/components/net/lwip-1.4.0/src/core/memp.c b/components/net/lwip/src/core/memp.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/memp.c
rename to components/net/lwip/src/core/memp.c
diff --git a/components/net/lwip-1.4.0/src/core/netif.c b/components/net/lwip/src/core/netif.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/netif.c
rename to components/net/lwip/src/core/netif.c
diff --git a/components/net/lwip-1.4.0/src/core/pbuf.c b/components/net/lwip/src/core/pbuf.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/pbuf.c
rename to components/net/lwip/src/core/pbuf.c
diff --git a/components/net/lwip-1.4.0/src/core/raw.c b/components/net/lwip/src/core/raw.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/raw.c
rename to components/net/lwip/src/core/raw.c
diff --git a/components/net/lwip-1.4.0/src/core/snmp/asn1_dec.c b/components/net/lwip/src/core/snmp/asn1_dec.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/snmp/asn1_dec.c
rename to components/net/lwip/src/core/snmp/asn1_dec.c
diff --git a/components/net/lwip-1.4.0/src/core/snmp/asn1_enc.c b/components/net/lwip/src/core/snmp/asn1_enc.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/snmp/asn1_enc.c
rename to components/net/lwip/src/core/snmp/asn1_enc.c
diff --git a/components/net/lwip-1.4.0/src/core/snmp/mib2.c b/components/net/lwip/src/core/snmp/mib2.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/snmp/mib2.c
rename to components/net/lwip/src/core/snmp/mib2.c
diff --git a/components/net/lwip-1.4.0/src/core/snmp/mib_structs.c b/components/net/lwip/src/core/snmp/mib_structs.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/snmp/mib_structs.c
rename to components/net/lwip/src/core/snmp/mib_structs.c
diff --git a/components/net/lwip-1.4.0/src/core/snmp/msg_in.c b/components/net/lwip/src/core/snmp/msg_in.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/snmp/msg_in.c
rename to components/net/lwip/src/core/snmp/msg_in.c
diff --git a/components/net/lwip-1.4.0/src/core/snmp/msg_out.c b/components/net/lwip/src/core/snmp/msg_out.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/snmp/msg_out.c
rename to components/net/lwip/src/core/snmp/msg_out.c
diff --git a/components/net/lwip-1.4.0/src/core/stats.c b/components/net/lwip/src/core/stats.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/stats.c
rename to components/net/lwip/src/core/stats.c
diff --git a/components/net/lwip-1.4.0/src/core/sys.c b/components/net/lwip/src/core/sys.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/sys.c
rename to components/net/lwip/src/core/sys.c
diff --git a/components/net/lwip-1.4.0/src/core/tcp.c b/components/net/lwip/src/core/tcp.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/tcp.c
rename to components/net/lwip/src/core/tcp.c
diff --git a/components/net/lwip-1.4.0/src/core/tcp_in.c b/components/net/lwip/src/core/tcp_in.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/tcp_in.c
rename to components/net/lwip/src/core/tcp_in.c
diff --git a/components/net/lwip-1.4.0/src/core/tcp_out.c b/components/net/lwip/src/core/tcp_out.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/tcp_out.c
rename to components/net/lwip/src/core/tcp_out.c
diff --git a/components/net/lwip-1.4.0/src/core/timers.c b/components/net/lwip/src/core/timers.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/timers.c
rename to components/net/lwip/src/core/timers.c
diff --git a/components/net/lwip-1.4.0/src/core/udp.c b/components/net/lwip/src/core/udp.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/core/udp.c
rename to components/net/lwip/src/core/udp.c
diff --git a/components/net/lwip-1.4.0/src/include/ipv4/lwip/autoip.h b/components/net/lwip/src/include/ipv4/lwip/autoip.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/ipv4/lwip/autoip.h
rename to components/net/lwip/src/include/ipv4/lwip/autoip.h
diff --git a/components/net/lwip-1.4.0/src/include/ipv4/lwip/icmp.h b/components/net/lwip/src/include/ipv4/lwip/icmp.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/ipv4/lwip/icmp.h
rename to components/net/lwip/src/include/ipv4/lwip/icmp.h
diff --git a/components/net/lwip-1.4.0/src/include/ipv4/lwip/igmp.h b/components/net/lwip/src/include/ipv4/lwip/igmp.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/ipv4/lwip/igmp.h
rename to components/net/lwip/src/include/ipv4/lwip/igmp.h
diff --git a/components/net/lwip-1.4.0/src/include/ipv4/lwip/inet.h b/components/net/lwip/src/include/ipv4/lwip/inet.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/ipv4/lwip/inet.h
rename to components/net/lwip/src/include/ipv4/lwip/inet.h
diff --git a/components/net/lwip-1.4.0/src/include/ipv4/lwip/inet_chksum.h b/components/net/lwip/src/include/ipv4/lwip/inet_chksum.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/ipv4/lwip/inet_chksum.h
rename to components/net/lwip/src/include/ipv4/lwip/inet_chksum.h
diff --git a/components/net/lwip-1.4.0/src/include/ipv4/lwip/ip.h b/components/net/lwip/src/include/ipv4/lwip/ip.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/ipv4/lwip/ip.h
rename to components/net/lwip/src/include/ipv4/lwip/ip.h
diff --git a/components/net/lwip-1.4.0/src/include/ipv4/lwip/ip_addr.h b/components/net/lwip/src/include/ipv4/lwip/ip_addr.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/ipv4/lwip/ip_addr.h
rename to components/net/lwip/src/include/ipv4/lwip/ip_addr.h
diff --git a/components/net/lwip-1.4.0/src/include/ipv4/lwip/ip_frag.h b/components/net/lwip/src/include/ipv4/lwip/ip_frag.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/ipv4/lwip/ip_frag.h
rename to components/net/lwip/src/include/ipv4/lwip/ip_frag.h
diff --git a/components/net/lwip-1.4.0/src/include/ipv6/lwip/icmp.h b/components/net/lwip/src/include/ipv6/lwip/icmp.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/ipv6/lwip/icmp.h
rename to components/net/lwip/src/include/ipv6/lwip/icmp.h
diff --git a/components/net/lwip-1.4.0/src/include/ipv6/lwip/inet.h b/components/net/lwip/src/include/ipv6/lwip/inet.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/ipv6/lwip/inet.h
rename to components/net/lwip/src/include/ipv6/lwip/inet.h
diff --git a/components/net/lwip-1.4.0/src/include/ipv6/lwip/ip.h b/components/net/lwip/src/include/ipv6/lwip/ip.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/ipv6/lwip/ip.h
rename to components/net/lwip/src/include/ipv6/lwip/ip.h
diff --git a/components/net/lwip-1.4.0/src/include/ipv6/lwip/ip_addr.h b/components/net/lwip/src/include/ipv6/lwip/ip_addr.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/ipv6/lwip/ip_addr.h
rename to components/net/lwip/src/include/ipv6/lwip/ip_addr.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/api.h b/components/net/lwip/src/include/lwip/api.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/api.h
rename to components/net/lwip/src/include/lwip/api.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/api_msg.h b/components/net/lwip/src/include/lwip/api_msg.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/api_msg.h
rename to components/net/lwip/src/include/lwip/api_msg.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/arch.h b/components/net/lwip/src/include/lwip/arch.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/arch.h
rename to components/net/lwip/src/include/lwip/arch.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/debug.h b/components/net/lwip/src/include/lwip/debug.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/debug.h
rename to components/net/lwip/src/include/lwip/debug.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/def.h b/components/net/lwip/src/include/lwip/def.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/def.h
rename to components/net/lwip/src/include/lwip/def.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/dhcp.h b/components/net/lwip/src/include/lwip/dhcp.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/dhcp.h
rename to components/net/lwip/src/include/lwip/dhcp.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/dns.h b/components/net/lwip/src/include/lwip/dns.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/dns.h
rename to components/net/lwip/src/include/lwip/dns.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/err.h b/components/net/lwip/src/include/lwip/err.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/err.h
rename to components/net/lwip/src/include/lwip/err.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/init.h b/components/net/lwip/src/include/lwip/init.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/init.h
rename to components/net/lwip/src/include/lwip/init.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/mem.h b/components/net/lwip/src/include/lwip/mem.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/mem.h
rename to components/net/lwip/src/include/lwip/mem.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/memp.h b/components/net/lwip/src/include/lwip/memp.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/memp.h
rename to components/net/lwip/src/include/lwip/memp.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/memp_std.h b/components/net/lwip/src/include/lwip/memp_std.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/memp_std.h
rename to components/net/lwip/src/include/lwip/memp_std.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/netbuf.h b/components/net/lwip/src/include/lwip/netbuf.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/netbuf.h
rename to components/net/lwip/src/include/lwip/netbuf.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/netdb.h b/components/net/lwip/src/include/lwip/netdb.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/netdb.h
rename to components/net/lwip/src/include/lwip/netdb.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/netif.h b/components/net/lwip/src/include/lwip/netif.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/netif.h
rename to components/net/lwip/src/include/lwip/netif.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/netifapi.h b/components/net/lwip/src/include/lwip/netifapi.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/netifapi.h
rename to components/net/lwip/src/include/lwip/netifapi.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/opt.h b/components/net/lwip/src/include/lwip/opt.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/opt.h
rename to components/net/lwip/src/include/lwip/opt.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/pbuf.h b/components/net/lwip/src/include/lwip/pbuf.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/pbuf.h
rename to components/net/lwip/src/include/lwip/pbuf.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/raw.h b/components/net/lwip/src/include/lwip/raw.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/raw.h
rename to components/net/lwip/src/include/lwip/raw.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/sio.h b/components/net/lwip/src/include/lwip/sio.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/sio.h
rename to components/net/lwip/src/include/lwip/sio.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/snmp.h b/components/net/lwip/src/include/lwip/snmp.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/snmp.h
rename to components/net/lwip/src/include/lwip/snmp.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/snmp_asn1.h b/components/net/lwip/src/include/lwip/snmp_asn1.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/snmp_asn1.h
rename to components/net/lwip/src/include/lwip/snmp_asn1.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/snmp_msg.h b/components/net/lwip/src/include/lwip/snmp_msg.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/snmp_msg.h
rename to components/net/lwip/src/include/lwip/snmp_msg.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/snmp_structs.h b/components/net/lwip/src/include/lwip/snmp_structs.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/snmp_structs.h
rename to components/net/lwip/src/include/lwip/snmp_structs.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/sockets.h b/components/net/lwip/src/include/lwip/sockets.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/sockets.h
rename to components/net/lwip/src/include/lwip/sockets.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/stats.h b/components/net/lwip/src/include/lwip/stats.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/stats.h
rename to components/net/lwip/src/include/lwip/stats.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/sys.h b/components/net/lwip/src/include/lwip/sys.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/sys.h
rename to components/net/lwip/src/include/lwip/sys.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/tcp.h b/components/net/lwip/src/include/lwip/tcp.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/tcp.h
rename to components/net/lwip/src/include/lwip/tcp.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/tcp_impl.h b/components/net/lwip/src/include/lwip/tcp_impl.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/tcp_impl.h
rename to components/net/lwip/src/include/lwip/tcp_impl.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/tcpip.h b/components/net/lwip/src/include/lwip/tcpip.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/tcpip.h
rename to components/net/lwip/src/include/lwip/tcpip.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/timers.h b/components/net/lwip/src/include/lwip/timers.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/timers.h
rename to components/net/lwip/src/include/lwip/timers.h
diff --git a/components/net/lwip-1.4.0/src/include/lwip/udp.h b/components/net/lwip/src/include/lwip/udp.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/lwip/udp.h
rename to components/net/lwip/src/include/lwip/udp.h
diff --git a/components/net/lwip-1.4.0/src/include/netif/etharp.h b/components/net/lwip/src/include/netif/etharp.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/netif/etharp.h
rename to components/net/lwip/src/include/netif/etharp.h
diff --git a/components/net/lwip-1.4.0/src/include/netif/ethernetif.h b/components/net/lwip/src/include/netif/ethernetif.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/netif/ethernetif.h
rename to components/net/lwip/src/include/netif/ethernetif.h
diff --git a/components/net/lwip-1.4.0/src/include/netif/ppp_oe.h b/components/net/lwip/src/include/netif/ppp_oe.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/netif/ppp_oe.h
rename to components/net/lwip/src/include/netif/ppp_oe.h
diff --git a/components/net/lwip-1.4.0/src/include/netif/slipif.h b/components/net/lwip/src/include/netif/slipif.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/include/netif/slipif.h
rename to components/net/lwip/src/include/netif/slipif.h
diff --git a/components/net/lwip-1.4.0/src/lwipopts.h b/components/net/lwip/src/lwipopts.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/lwipopts.h
rename to components/net/lwip/src/lwipopts.h
diff --git a/components/net/lwip-1.4.0/src/netif/FILES b/components/net/lwip/src/netif/FILES
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/FILES
rename to components/net/lwip/src/netif/FILES
diff --git a/components/net/lwip-1.4.0/src/netif/etharp.c b/components/net/lwip/src/netif/etharp.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/etharp.c
rename to components/net/lwip/src/netif/etharp.c
diff --git a/components/net/lwip-1.4.0/src/netif/ethernetif.c b/components/net/lwip/src/netif/ethernetif.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/ethernetif.c
rename to components/net/lwip/src/netif/ethernetif.c
diff --git a/components/net/lwip-1.4.0/src/netif/ppp/auth.c b/components/net/lwip/src/netif/ppp/auth.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/ppp/auth.c
rename to components/net/lwip/src/netif/ppp/auth.c
diff --git a/components/net/lwip-1.4.0/src/netif/ppp/auth.h b/components/net/lwip/src/netif/ppp/auth.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/ppp/auth.h
rename to components/net/lwip/src/netif/ppp/auth.h
diff --git a/components/net/lwip-1.4.0/src/netif/ppp/chap.c b/components/net/lwip/src/netif/ppp/chap.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/ppp/chap.c
rename to components/net/lwip/src/netif/ppp/chap.c
diff --git a/components/net/lwip-1.4.0/src/netif/ppp/chap.h b/components/net/lwip/src/netif/ppp/chap.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/ppp/chap.h
rename to components/net/lwip/src/netif/ppp/chap.h
diff --git a/components/net/lwip-1.4.0/src/netif/ppp/chpms.c b/components/net/lwip/src/netif/ppp/chpms.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/ppp/chpms.c
rename to components/net/lwip/src/netif/ppp/chpms.c
diff --git a/components/net/lwip-1.4.0/src/netif/ppp/chpms.h b/components/net/lwip/src/netif/ppp/chpms.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/ppp/chpms.h
rename to components/net/lwip/src/netif/ppp/chpms.h
diff --git a/components/net/lwip-1.4.0/src/netif/ppp/fsm.c b/components/net/lwip/src/netif/ppp/fsm.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/ppp/fsm.c
rename to components/net/lwip/src/netif/ppp/fsm.c
diff --git a/components/net/lwip-1.4.0/src/netif/ppp/fsm.h b/components/net/lwip/src/netif/ppp/fsm.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/ppp/fsm.h
rename to components/net/lwip/src/netif/ppp/fsm.h
diff --git a/components/net/lwip-1.4.0/src/netif/ppp/ipcp.c b/components/net/lwip/src/netif/ppp/ipcp.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/ppp/ipcp.c
rename to components/net/lwip/src/netif/ppp/ipcp.c
diff --git a/components/net/lwip-1.4.0/src/netif/ppp/ipcp.h b/components/net/lwip/src/netif/ppp/ipcp.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/ppp/ipcp.h
rename to components/net/lwip/src/netif/ppp/ipcp.h
diff --git a/components/net/lwip-1.4.0/src/netif/ppp/lcp.c b/components/net/lwip/src/netif/ppp/lcp.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/ppp/lcp.c
rename to components/net/lwip/src/netif/ppp/lcp.c
diff --git a/components/net/lwip-1.4.0/src/netif/ppp/lcp.h b/components/net/lwip/src/netif/ppp/lcp.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/ppp/lcp.h
rename to components/net/lwip/src/netif/ppp/lcp.h
diff --git a/components/net/lwip-1.4.0/src/netif/ppp/magic.c b/components/net/lwip/src/netif/ppp/magic.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/ppp/magic.c
rename to components/net/lwip/src/netif/ppp/magic.c
diff --git a/components/net/lwip-1.4.0/src/netif/ppp/magic.h b/components/net/lwip/src/netif/ppp/magic.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/ppp/magic.h
rename to components/net/lwip/src/netif/ppp/magic.h
diff --git a/components/net/lwip-1.4.0/src/netif/ppp/md5.c b/components/net/lwip/src/netif/ppp/md5.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/ppp/md5.c
rename to components/net/lwip/src/netif/ppp/md5.c
diff --git a/components/net/lwip-1.4.0/src/netif/ppp/md5.h b/components/net/lwip/src/netif/ppp/md5.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/ppp/md5.h
rename to components/net/lwip/src/netif/ppp/md5.h
diff --git a/components/net/lwip-1.4.0/src/netif/ppp/pap.c b/components/net/lwip/src/netif/ppp/pap.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/ppp/pap.c
rename to components/net/lwip/src/netif/ppp/pap.c
diff --git a/components/net/lwip-1.4.0/src/netif/ppp/pap.h b/components/net/lwip/src/netif/ppp/pap.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/ppp/pap.h
rename to components/net/lwip/src/netif/ppp/pap.h
diff --git a/components/net/lwip-1.4.0/src/netif/ppp/ppp.c b/components/net/lwip/src/netif/ppp/ppp.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/ppp/ppp.c
rename to components/net/lwip/src/netif/ppp/ppp.c
diff --git a/components/net/lwip-1.4.0/src/netif/ppp/ppp.h b/components/net/lwip/src/netif/ppp/ppp.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/ppp/ppp.h
rename to components/net/lwip/src/netif/ppp/ppp.h
diff --git a/components/net/lwip-1.4.0/src/netif/ppp/ppp_oe.c b/components/net/lwip/src/netif/ppp/ppp_oe.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/ppp/ppp_oe.c
rename to components/net/lwip/src/netif/ppp/ppp_oe.c
diff --git a/components/net/lwip-1.4.0/src/netif/ppp/pppdebug.h b/components/net/lwip/src/netif/ppp/pppdebug.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/ppp/pppdebug.h
rename to components/net/lwip/src/netif/ppp/pppdebug.h
diff --git a/components/net/lwip-1.4.0/src/netif/ppp/randm.c b/components/net/lwip/src/netif/ppp/randm.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/ppp/randm.c
rename to components/net/lwip/src/netif/ppp/randm.c
diff --git a/components/net/lwip-1.4.0/src/netif/ppp/randm.h b/components/net/lwip/src/netif/ppp/randm.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/ppp/randm.h
rename to components/net/lwip/src/netif/ppp/randm.h
diff --git a/components/net/lwip-1.4.0/src/netif/ppp/vj.c b/components/net/lwip/src/netif/ppp/vj.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/ppp/vj.c
rename to components/net/lwip/src/netif/ppp/vj.c
diff --git a/components/net/lwip-1.4.0/src/netif/ppp/vj.h b/components/net/lwip/src/netif/ppp/vj.h
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/ppp/vj.h
rename to components/net/lwip/src/netif/ppp/vj.h
diff --git a/components/net/lwip-1.4.0/src/netif/slipif.c b/components/net/lwip/src/netif/slipif.c
similarity index 100%
rename from components/net/lwip-1.4.0/src/netif/slipif.c
rename to components/net/lwip/src/netif/slipif.c
diff --git a/components/net/lwip-1.4.0/test/unit/core/test_mem.c b/components/net/lwip/test/unit/core/test_mem.c
similarity index 100%
rename from components/net/lwip-1.4.0/test/unit/core/test_mem.c
rename to components/net/lwip/test/unit/core/test_mem.c
diff --git a/components/net/lwip-1.4.0/test/unit/core/test_mem.h b/components/net/lwip/test/unit/core/test_mem.h
similarity index 100%
rename from components/net/lwip-1.4.0/test/unit/core/test_mem.h
rename to components/net/lwip/test/unit/core/test_mem.h
diff --git a/components/net/lwip-1.4.0/test/unit/etharp/test_etharp.c b/components/net/lwip/test/unit/etharp/test_etharp.c
similarity index 100%
rename from components/net/lwip-1.4.0/test/unit/etharp/test_etharp.c
rename to components/net/lwip/test/unit/etharp/test_etharp.c
diff --git a/components/net/lwip-1.4.0/test/unit/etharp/test_etharp.h b/components/net/lwip/test/unit/etharp/test_etharp.h
similarity index 100%
rename from components/net/lwip-1.4.0/test/unit/etharp/test_etharp.h
rename to components/net/lwip/test/unit/etharp/test_etharp.h
diff --git a/components/net/lwip-1.4.0/test/unit/lwip_check.h b/components/net/lwip/test/unit/lwip_check.h
similarity index 100%
rename from components/net/lwip-1.4.0/test/unit/lwip_check.h
rename to components/net/lwip/test/unit/lwip_check.h
diff --git a/components/net/lwip-1.4.0/test/unit/lwip_unittests.c b/components/net/lwip/test/unit/lwip_unittests.c
similarity index 100%
rename from components/net/lwip-1.4.0/test/unit/lwip_unittests.c
rename to components/net/lwip/test/unit/lwip_unittests.c
diff --git a/components/net/lwip-1.4.0/test/unit/tcp/tcp_helper.c b/components/net/lwip/test/unit/tcp/tcp_helper.c
similarity index 100%
rename from components/net/lwip-1.4.0/test/unit/tcp/tcp_helper.c
rename to components/net/lwip/test/unit/tcp/tcp_helper.c
diff --git a/components/net/lwip-1.4.0/test/unit/tcp/tcp_helper.h b/components/net/lwip/test/unit/tcp/tcp_helper.h
similarity index 100%
rename from components/net/lwip-1.4.0/test/unit/tcp/tcp_helper.h
rename to components/net/lwip/test/unit/tcp/tcp_helper.h
diff --git a/components/net/lwip-1.4.0/test/unit/tcp/test_tcp.c b/components/net/lwip/test/unit/tcp/test_tcp.c
similarity index 100%
rename from components/net/lwip-1.4.0/test/unit/tcp/test_tcp.c
rename to components/net/lwip/test/unit/tcp/test_tcp.c
diff --git a/components/net/lwip-1.4.0/test/unit/tcp/test_tcp.h b/components/net/lwip/test/unit/tcp/test_tcp.h
similarity index 100%
rename from components/net/lwip-1.4.0/test/unit/tcp/test_tcp.h
rename to components/net/lwip/test/unit/tcp/test_tcp.h
diff --git a/components/net/lwip-1.4.0/test/unit/tcp/test_tcp_oos.c b/components/net/lwip/test/unit/tcp/test_tcp_oos.c
similarity index 100%
rename from components/net/lwip-1.4.0/test/unit/tcp/test_tcp_oos.c
rename to components/net/lwip/test/unit/tcp/test_tcp_oos.c
diff --git a/components/net/lwip-1.4.0/test/unit/tcp/test_tcp_oos.h b/components/net/lwip/test/unit/tcp/test_tcp_oos.h
similarity index 100%
rename from components/net/lwip-1.4.0/test/unit/tcp/test_tcp_oos.h
rename to components/net/lwip/test/unit/tcp/test_tcp_oos.h
diff --git a/components/net/lwip-1.4.0/test/unit/udp/test_udp.c b/components/net/lwip/test/unit/udp/test_udp.c
similarity index 100%
rename from components/net/lwip-1.4.0/test/unit/udp/test_udp.c
rename to components/net/lwip/test/unit/udp/test_udp.c
diff --git a/components/net/lwip-1.4.0/test/unit/udp/test_udp.h b/components/net/lwip/test/unit/udp/test_udp.h
similarity index 100%
rename from components/net/lwip-1.4.0/test/unit/udp/test_udp.h
rename to components/net/lwip/test/unit/udp/test_udp.h