diff --git a/src/include/ipv4/lwip/autoip.h b/src/include/lwip/autoip.h
similarity index 100%
rename from src/include/ipv4/lwip/autoip.h
rename to src/include/lwip/autoip.h
diff --git a/src/include/ipv6/lwip/dhcp6.h b/src/include/lwip/dhcp6.h
similarity index 100%
rename from src/include/ipv6/lwip/dhcp6.h
rename to src/include/lwip/dhcp6.h
diff --git a/src/include/ipv6/lwip/ethip6.h b/src/include/lwip/ethip6.h
similarity index 100%
rename from src/include/ipv6/lwip/ethip6.h
rename to src/include/lwip/ethip6.h
diff --git a/src/include/ipv4/lwip/icmp.h b/src/include/lwip/icmp.h
similarity index 100%
rename from src/include/ipv4/lwip/icmp.h
rename to src/include/lwip/icmp.h
diff --git a/src/include/ipv6/lwip/icmp6.h b/src/include/lwip/icmp6.h
similarity index 100%
rename from src/include/ipv6/lwip/icmp6.h
rename to src/include/lwip/icmp6.h
diff --git a/src/include/ipv4/lwip/igmp.h b/src/include/lwip/igmp.h
similarity index 100%
rename from src/include/ipv4/lwip/igmp.h
rename to src/include/lwip/igmp.h
diff --git a/src/include/ipv4/lwip/inet.h b/src/include/lwip/inet.h
similarity index 100%
rename from src/include/ipv4/lwip/inet.h
rename to src/include/lwip/inet.h
diff --git a/src/include/ipv6/lwip/inet6.h b/src/include/lwip/inet6.h
similarity index 100%
rename from src/include/ipv6/lwip/inet6.h
rename to src/include/lwip/inet6.h
diff --git a/src/include/ipv4/lwip/ip4.h b/src/include/lwip/ip4.h
similarity index 100%
rename from src/include/ipv4/lwip/ip4.h
rename to src/include/lwip/ip4.h
diff --git a/src/include/ipv4/lwip/ip4_addr.h b/src/include/lwip/ip4_addr.h
similarity index 100%
rename from src/include/ipv4/lwip/ip4_addr.h
rename to src/include/lwip/ip4_addr.h
diff --git a/src/include/ipv6/lwip/ip6.h b/src/include/lwip/ip6.h
similarity index 100%
rename from src/include/ipv6/lwip/ip6.h
rename to src/include/lwip/ip6.h
diff --git a/src/include/ipv6/lwip/ip6_addr.h b/src/include/lwip/ip6_addr.h
similarity index 100%
rename from src/include/ipv6/lwip/ip6_addr.h
rename to src/include/lwip/ip6_addr.h
diff --git a/src/include/ipv6/lwip/ip6_frag.h b/src/include/lwip/ip6_frag.h
similarity index 100%
rename from src/include/ipv6/lwip/ip6_frag.h
rename to src/include/lwip/ip6_frag.h
diff --git a/src/include/ipv4/lwip/ip_frag.h b/src/include/lwip/ip_frag.h
similarity index 100%
rename from src/include/ipv4/lwip/ip_frag.h
rename to src/include/lwip/ip_frag.h
diff --git a/src/include/ipv6/lwip/mld6.h b/src/include/lwip/mld6.h
similarity index 100%
rename from src/include/ipv6/lwip/mld6.h
rename to src/include/lwip/mld6.h
diff --git a/src/include/ipv6/lwip/nd6.h b/src/include/lwip/nd6.h
similarity index 100%
rename from src/include/ipv6/lwip/nd6.h
rename to src/include/lwip/nd6.h