From 441e9ae4d96ab8530a1416ba7ede9eee44d35f2d Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Sun, 13 Nov 2016 02:01:19 +0100
Subject: [PATCH] networkd: netdev - move to separate subdirectory

This could (and should) be made into a separate daemon, at least move
the sourcefiles out for now.
---
 Makefile.am                                   | 56 +++++++++----------
 src/network/.gitignore                        |  1 -
 src/network/netdev/.gitignore                 |  1 +
 .../{networkd-netdev-bond.c => netdev/bond.c} |  2 +-
 .../{networkd-netdev-bond.h => netdev/bond.h} |  2 +-
 .../bridge.c}                                 |  2 +-
 .../bridge.h}                                 |  2 +-
 .../dummy.c}                                  |  2 +-
 .../dummy.h}                                  |  2 +-
 .../ipvlan.c}                                 |  2 +-
 .../ipvlan.h}                                 |  2 +-
 .../macvlan.c}                                |  2 +-
 .../macvlan.h}                                |  2 +-
 .../netdev-gperf.gperf}                       | 22 ++++----
 .../{networkd-netdev.c => netdev/netdev.c}    |  2 +-
 .../{networkd-netdev.h => netdev/netdev.h}    |  0
 .../tunnel.c}                                 |  2 +-
 .../tunnel.h}                                 |  2 +-
 .../tuntap.c}                                 |  2 +-
 .../tuntap.h}                                 |  2 +-
 .../{networkd-netdev-vcan.c => netdev/vcan.c} |  2 +-
 .../{networkd-netdev-vcan.h => netdev/vcan.h} |  2 +-
 .../{networkd-netdev-veth.c => netdev/veth.c} |  2 +-
 .../{networkd-netdev-veth.h => netdev/veth.h} |  2 +-
 .../{networkd-netdev-vlan.c => netdev/vlan.c} |  2 +-
 .../{networkd-netdev-vlan.h => netdev/vlan.h} |  2 +-
 .../{networkd-netdev-vrf.c => netdev/vrf.c}   |  2 +-
 .../{networkd-netdev-vrf.h => netdev/vrf.h}   |  2 +-
 .../vxlan.c}                                  |  2 +-
 .../vxlan.h}                                  |  2 +-
 src/network/networkd-network.h                |  2 +-
 src/network/networkd.h                        | 24 ++++----
 src/network/test-network-tables.c             |  4 +-
 33 files changed, 80 insertions(+), 80 deletions(-)
 create mode 100644 src/network/netdev/.gitignore
 rename src/network/{networkd-netdev-bond.c => netdev/bond.c} (99%)
 rename src/network/{networkd-netdev-bond.h => netdev/bond.h} (99%)
 rename src/network/{networkd-netdev-bridge.c => netdev/bridge.c} (99%)
 rename src/network/{networkd-netdev-bridge.h => netdev/bridge.h} (97%)
 rename src/network/{networkd-netdev-dummy.c => netdev/dummy.c} (96%)
 rename src/network/{networkd-netdev-dummy.h => netdev/dummy.h} (96%)
 rename src/network/{networkd-netdev-ipvlan.c => netdev/ipvlan.c} (98%)
 rename src/network/{networkd-netdev-ipvlan.h => netdev/ipvlan.h} (98%)
 rename src/network/{networkd-netdev-macvlan.c => netdev/macvlan.c} (98%)
 rename src/network/{networkd-netdev-macvlan.h => netdev/macvlan.h} (98%)
 rename src/network/{networkd-netdev-gperf.gperf => netdev/netdev-gperf.gperf} (96%)
 rename src/network/{networkd-netdev.c => netdev/netdev.c} (99%)
 rename src/network/{networkd-netdev.h => netdev/netdev.h} (100%)
 rename src/network/{networkd-netdev-tunnel.c => netdev/tunnel.c} (99%)
 rename src/network/{networkd-netdev-tunnel.h => netdev/tunnel.h} (99%)
 rename src/network/{networkd-netdev-tuntap.c => netdev/tuntap.c} (99%)
 rename src/network/{networkd-netdev-tuntap.h => netdev/tuntap.h} (97%)
 rename src/network/{networkd-netdev-vcan.c => netdev/vcan.c} (96%)
 rename src/network/{networkd-netdev-vcan.h => netdev/vcan.h} (96%)
 rename src/network/{networkd-netdev-veth.c => netdev/veth.c} (98%)
 rename src/network/{networkd-netdev-veth.h => netdev/veth.h} (97%)
 rename src/network/{networkd-netdev-vlan.c => netdev/vlan.c} (98%)
 rename src/network/{networkd-netdev-vlan.h => netdev/vlan.h} (96%)
 rename src/network/{networkd-netdev-vrf.c => netdev/vrf.c} (97%)
 rename src/network/{networkd-netdev-vrf.h => netdev/vrf.h} (96%)
 rename src/network/{networkd-netdev-vxlan.c => netdev/vxlan.c} (99%)
 rename src/network/{networkd-netdev-vxlan.h => netdev/vxlan.h} (99%)

diff --git a/Makefile.am b/Makefile.am
index be4a28bac7..b71e204281 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5615,32 +5615,32 @@ libnetworkd_core_la_SOURCES = \
 	src/network/networkd-conf.c \
 	src/network/networkd-link.h \
 	src/network/networkd-link.c \
-	src/network/networkd-netdev.h \
-	src/network/networkd-netdev.c \
-	src/network/networkd-netdev-vrf.h \
-	src/network/networkd-netdev-vrf.c \
-	src/network/networkd-netdev-tunnel.h \
-	src/network/networkd-netdev-tunnel.c \
-	src/network/networkd-netdev-veth.h \
-	src/network/networkd-netdev-veth.c \
-	src/network/networkd-netdev-vxlan.h \
-	src/network/networkd-netdev-vxlan.c \
-	src/network/networkd-netdev-vlan.h \
-	src/network/networkd-netdev-vlan.c \
-	src/network/networkd-netdev-macvlan.h \
-	src/network/networkd-netdev-macvlan.c \
-	src/network/networkd-netdev-ipvlan.h \
-	src/network/networkd-netdev-ipvlan.c \
-	src/network/networkd-netdev-dummy.h \
-	src/network/networkd-netdev-dummy.c \
-	src/network/networkd-netdev-tuntap.h \
-	src/network/networkd-netdev-tuntap.c \
-	src/network/networkd-netdev-bond.h \
-	src/network/networkd-netdev-bond.c \
-	src/network/networkd-netdev-bridge.h \
-	src/network/networkd-netdev-bridge.c \
-	src/network/networkd-netdev-vcan.h \
-	src/network/networkd-netdev-vcan.c \
+	src/network/netdev/netdev.h \
+	src/network/netdev/netdev.c \
+	src/network/netdev/vrf.h \
+	src/network/netdev/vrf.c \
+	src/network/netdev/tunnel.h \
+	src/network/netdev/tunnel.c \
+	src/network/netdev/veth.h \
+	src/network/netdev/veth.c \
+	src/network/netdev/vxlan.h \
+	src/network/netdev/vxlan.c \
+	src/network/netdev/vlan.h \
+	src/network/netdev/vlan.c \
+	src/network/netdev/macvlan.h \
+	src/network/netdev/macvlan.c \
+	src/network/netdev/ipvlan.h \
+	src/network/netdev/ipvlan.c \
+	src/network/netdev/dummy.h \
+	src/network/netdev/dummy.c \
+	src/network/netdev/tuntap.h \
+	src/network/netdev/tuntap.c \
+	src/network/netdev/bond.h \
+	src/network/netdev/bond.c \
+	src/network/netdev/bridge.h \
+	src/network/netdev/bridge.c \
+	src/network/netdev/vcan.h \
+	src/network/netdev/vcan.c \
 	src/network/networkd-link-bus.c \
 	src/network/networkd-ipv4ll.c \
 	src/network/networkd-dhcp4.c \
@@ -5670,7 +5670,7 @@ libnetworkd_core_la_SOURCES = \
 nodist_libnetworkd_core_la_SOURCES = \
 	src/network/networkd-gperf.c \
 	src/network/networkd-network-gperf.c \
-	src/network/networkd-netdev-gperf.c
+	src/network/netdev/netdev-gperf.c
 
 libnetworkd_core_la_LIBADD = \
 	libsystemd-network.la \
@@ -5774,7 +5774,7 @@ endif
 gperf_gperf_sources += \
 	src/network/networkd-gperf.gperf \
 	src/network/networkd-network-gperf.gperf \
-	src/network/networkd-netdev-gperf.gperf
+	src/network/netdev/netdev-gperf.gperf
 
 EXTRA_DIST += \
 	units/systemd-networkd.service.m4.in \
diff --git a/src/network/.gitignore b/src/network/.gitignore
index aca55206b7..230671763d 100644
--- a/src/network/.gitignore
+++ b/src/network/.gitignore
@@ -1,3 +1,2 @@
 /networkd-network-gperf.c
-/networkd-netdev-gperf.c
 /networkd-gperf.c
diff --git a/src/network/netdev/.gitignore b/src/network/netdev/.gitignore
new file mode 100644
index 0000000000..0f1a65d2e6
--- /dev/null
+++ b/src/network/netdev/.gitignore
@@ -0,0 +1 @@
+/netdev-gperf.c
diff --git a/src/network/networkd-netdev-bond.c b/src/network/netdev/bond.c
similarity index 99%
rename from src/network/networkd-netdev-bond.c
rename to src/network/netdev/bond.c
index 46d1669337..19b0e8da40 100644
--- a/src/network/networkd-netdev-bond.c
+++ b/src/network/netdev/bond.c
@@ -27,7 +27,7 @@
 #include "conf-parser.h"
 #include "extract-word.h"
 #include "missing.h"
-#include "networkd-netdev-bond.h"
+#include "netdev/bond.h"
 #include "string-table.h"
 #include "string-util.h"
 
diff --git a/src/network/networkd-netdev-bond.h b/src/network/netdev/bond.h
similarity index 99%
rename from src/network/networkd-netdev-bond.h
rename to src/network/netdev/bond.h
index b941edb344..fb88b538ed 100644
--- a/src/network/networkd-netdev-bond.h
+++ b/src/network/netdev/bond.h
@@ -22,7 +22,7 @@
 #include "in-addr-util.h"
 #include "list.h"
 
-#include "networkd-netdev.h"
+#include "netdev/netdev.h"
 
 /*
  * Maximum number of targets supported by the kernel for a single
diff --git a/src/network/networkd-netdev-bridge.c b/src/network/netdev/bridge.c
similarity index 99%
rename from src/network/networkd-netdev-bridge.c
rename to src/network/netdev/bridge.c
index 002ad94210..760aefd97e 100644
--- a/src/network/networkd-netdev-bridge.c
+++ b/src/network/netdev/bridge.c
@@ -23,7 +23,7 @@
 #include "missing.h"
 #include "netlink-util.h"
 #include "networkd.h"
-#include "networkd-netdev-bridge.h"
+#include "netdev/bridge.h"
 
 /* callback for brige netdev's parameter set */
 static int netdev_bridge_set_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata) {
diff --git a/src/network/networkd-netdev-bridge.h b/src/network/netdev/bridge.h
similarity index 97%
rename from src/network/networkd-netdev-bridge.h
rename to src/network/netdev/bridge.h
index 53f72f1ea5..093c60d5b5 100644
--- a/src/network/networkd-netdev-bridge.h
+++ b/src/network/netdev/bridge.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "networkd-netdev.h"
+#include "netdev/netdev.h"
 
 typedef struct Bridge {
         NetDev meta;
diff --git a/src/network/networkd-netdev-dummy.c b/src/network/netdev/dummy.c
similarity index 96%
rename from src/network/networkd-netdev-dummy.c
rename to src/network/netdev/dummy.c
index 6617a86c20..5e6e162931 100644
--- a/src/network/networkd-netdev-dummy.c
+++ b/src/network/netdev/dummy.c
@@ -19,7 +19,7 @@
 ***/
 
 
-#include "networkd-netdev-dummy.h"
+#include "netdev/dummy.h"
 
 const NetDevVTable dummy_vtable = {
         .object_size = sizeof(Dummy),
diff --git a/src/network/networkd-netdev-dummy.h b/src/network/netdev/dummy.h
similarity index 96%
rename from src/network/networkd-netdev-dummy.h
rename to src/network/netdev/dummy.h
index efe302267e..a908400459 100644
--- a/src/network/networkd-netdev-dummy.h
+++ b/src/network/netdev/dummy.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "networkd-netdev.h"
+#include "netdev/netdev.h"
 
 typedef struct Dummy {
         NetDev meta;
diff --git a/src/network/networkd-netdev-ipvlan.c b/src/network/netdev/ipvlan.c
similarity index 98%
rename from src/network/networkd-netdev-ipvlan.c
rename to src/network/netdev/ipvlan.c
index af4177e43a..3b5c30fed8 100644
--- a/src/network/networkd-netdev-ipvlan.c
+++ b/src/network/netdev/ipvlan.c
@@ -20,7 +20,7 @@
 #include <net/if.h>
 
 #include "conf-parser.h"
-#include "networkd-netdev-ipvlan.h"
+#include "netdev/ipvlan.h"
 #include "string-table.h"
 
 static const char* const ipvlan_mode_table[_NETDEV_IPVLAN_MODE_MAX] = {
diff --git a/src/network/networkd-netdev-ipvlan.h b/src/network/netdev/ipvlan.h
similarity index 98%
rename from src/network/networkd-netdev-ipvlan.h
rename to src/network/netdev/ipvlan.h
index 10d4079844..7d7d0184f1 100644
--- a/src/network/networkd-netdev-ipvlan.h
+++ b/src/network/netdev/ipvlan.h
@@ -20,7 +20,7 @@
 ***/
 
 #include "missing.h"
-#include "networkd-netdev.h"
+#include "netdev/netdev.h"
 
 typedef enum IPVlanMode {
         NETDEV_IPVLAN_MODE_L2 = IPVLAN_MODE_L2,
diff --git a/src/network/networkd-netdev-macvlan.c b/src/network/netdev/macvlan.c
similarity index 98%
rename from src/network/networkd-netdev-macvlan.c
rename to src/network/netdev/macvlan.c
index 48e98aa51b..93f650def5 100644
--- a/src/network/networkd-netdev-macvlan.c
+++ b/src/network/netdev/macvlan.c
@@ -20,7 +20,7 @@
 #include <net/if.h>
 
 #include "conf-parser.h"
-#include "networkd-netdev-macvlan.h"
+#include "netdev/macvlan.h"
 #include "string-table.h"
 
 static const char* const macvlan_mode_table[_NETDEV_MACVLAN_MODE_MAX] = {
diff --git a/src/network/networkd-netdev-macvlan.h b/src/network/netdev/macvlan.h
similarity index 98%
rename from src/network/networkd-netdev-macvlan.h
rename to src/network/netdev/macvlan.h
index 3663f4f051..118d55658c 100644
--- a/src/network/networkd-netdev-macvlan.h
+++ b/src/network/netdev/macvlan.h
@@ -21,7 +21,7 @@
 
 typedef struct MacVlan MacVlan;
 
-#include "networkd-netdev.h"
+#include "netdev/netdev.h"
 
 typedef enum MacVlanMode {
         NETDEV_MACVLAN_MODE_PRIVATE = MACVLAN_MODE_PRIVATE,
diff --git a/src/network/networkd-netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf
similarity index 96%
rename from src/network/networkd-netdev-gperf.gperf
rename to src/network/netdev/netdev-gperf.gperf
index 323eaa8032..b3461e39a9 100644
--- a/src/network/networkd-netdev-gperf.gperf
+++ b/src/network/netdev/netdev-gperf.gperf
@@ -2,17 +2,17 @@
 #include <stddef.h>
 #include "conf-parser.h"
 #include "network-internal.h"
-#include "networkd-netdev-bond.h"
-#include "networkd-netdev-bridge.h"
-#include "networkd-netdev-ipvlan.h"
-#include "networkd-netdev-macvlan.h"
-#include "networkd-netdev-tunnel.h"
-#include "networkd-netdev-tuntap.h"
-#include "networkd-netdev-veth.h"
-#include "networkd-netdev-vlan.h"
-#include "networkd-netdev-vxlan.h"
-#include "networkd-netdev-vrf.h"
-#include "networkd-netdev.h"
+#include "netdev/bond.h"
+#include "netdev/bridge.h"
+#include "netdev/ipvlan.h"
+#include "netdev/macvlan.h"
+#include "netdev/tunnel.h"
+#include "netdev/tuntap.h"
+#include "netdev/veth.h"
+#include "netdev/vlan.h"
+#include "netdev/vxlan.h"
+#include "netdev/vrf.h"
+#include "netdev/netdev.h"
 #include "vlan-util.h"
 %}
 struct ConfigPerfItem;
diff --git a/src/network/networkd-netdev.c b/src/network/netdev/netdev.c
similarity index 99%
rename from src/network/networkd-netdev.c
rename to src/network/netdev/netdev.c
index a210ba1242..4f287bab72 100644
--- a/src/network/networkd-netdev.c
+++ b/src/network/netdev/netdev.c
@@ -26,7 +26,7 @@
 #include "list.h"
 #include "netlink-util.h"
 #include "network-internal.h"
-#include "networkd-netdev.h"
+#include "netdev/netdev.h"
 #include "networkd.h"
 #include "siphash24.h"
 #include "stat-util.h"
diff --git a/src/network/networkd-netdev.h b/src/network/netdev/netdev.h
similarity index 100%
rename from src/network/networkd-netdev.h
rename to src/network/netdev/netdev.h
diff --git a/src/network/networkd-netdev-tunnel.c b/src/network/netdev/tunnel.c
similarity index 99%
rename from src/network/networkd-netdev-tunnel.c
rename to src/network/netdev/tunnel.c
index 9138ee4511..b03e770061 100644
--- a/src/network/networkd-netdev-tunnel.c
+++ b/src/network/netdev/tunnel.c
@@ -28,7 +28,7 @@
 #include "conf-parser.h"
 #include "missing.h"
 #include "networkd-link.h"
-#include "networkd-netdev-tunnel.h"
+#include "netdev/tunnel.h"
 #include "parse-util.h"
 #include "string-table.h"
 #include "string-util.h"
diff --git a/src/network/networkd-netdev-tunnel.h b/src/network/netdev/tunnel.h
similarity index 99%
rename from src/network/networkd-netdev-tunnel.h
rename to src/network/netdev/tunnel.h
index 32a46bd82f..d78c6135ee 100644
--- a/src/network/networkd-netdev-tunnel.h
+++ b/src/network/netdev/tunnel.h
@@ -21,7 +21,7 @@
 
 #include "in-addr-util.h"
 
-#include "networkd-netdev.h"
+#include "netdev/netdev.h"
 
 typedef enum Ip6TnlMode {
         NETDEV_IP6_TNL_MODE_IP6IP6,
diff --git a/src/network/networkd-netdev-tuntap.c b/src/network/netdev/tuntap.c
similarity index 99%
rename from src/network/networkd-netdev-tuntap.c
rename to src/network/netdev/tuntap.c
index 088a4d8d32..3d62808842 100644
--- a/src/network/networkd-netdev-tuntap.c
+++ b/src/network/netdev/tuntap.c
@@ -27,7 +27,7 @@
 
 #include "alloc-util.h"
 #include "fd-util.h"
-#include "networkd-netdev-tuntap.h"
+#include "netdev/tuntap.h"
 #include "user-util.h"
 
 #define TUN_DEV "/dev/net/tun"
diff --git a/src/network/networkd-netdev-tuntap.h b/src/network/netdev/tuntap.h
similarity index 97%
rename from src/network/networkd-netdev-tuntap.h
rename to src/network/netdev/tuntap.h
index 120f00a353..95d3fcf1e9 100644
--- a/src/network/networkd-netdev-tuntap.h
+++ b/src/network/netdev/tuntap.h
@@ -21,7 +21,7 @@
 
 typedef struct TunTap TunTap;
 
-#include "networkd-netdev.h"
+#include "netdev/netdev.h"
 
 struct TunTap {
         NetDev meta;
diff --git a/src/network/networkd-netdev-vcan.c b/src/network/netdev/vcan.c
similarity index 96%
rename from src/network/networkd-netdev-vcan.c
rename to src/network/netdev/vcan.c
index bfce6e1962..7f56702938 100644
--- a/src/network/networkd-netdev-vcan.c
+++ b/src/network/netdev/vcan.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "networkd-netdev-vcan.h"
+#include "netdev/vcan.h"
 
 const NetDevVTable vcan_vtable = {
         .object_size = sizeof(VCan),
diff --git a/src/network/networkd-netdev-vcan.h b/src/network/netdev/vcan.h
similarity index 96%
rename from src/network/networkd-netdev-vcan.h
rename to src/network/netdev/vcan.h
index 6ba47fd70e..00838b7675 100644
--- a/src/network/networkd-netdev-vcan.h
+++ b/src/network/netdev/vcan.h
@@ -23,7 +23,7 @@ typedef struct VCan VCan;
 
 #include <linux/can/netlink.h>
 
-#include "networkd-netdev.h"
+#include "netdev/netdev.h"
 
 struct VCan {
         NetDev meta;
diff --git a/src/network/networkd-netdev-veth.c b/src/network/netdev/veth.c
similarity index 98%
rename from src/network/networkd-netdev-veth.c
rename to src/network/netdev/veth.c
index b122a06c25..350b59bf03 100644
--- a/src/network/networkd-netdev-veth.c
+++ b/src/network/netdev/veth.c
@@ -22,7 +22,7 @@
 
 #include "sd-netlink.h"
 
-#include "networkd-netdev-veth.h"
+#include "netdev/veth.h"
 
 static int netdev_veth_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *m) {
         Veth *v;
diff --git a/src/network/networkd-netdev-veth.h b/src/network/netdev/veth.h
similarity index 97%
rename from src/network/networkd-netdev-veth.h
rename to src/network/netdev/veth.h
index e69bfbc8f0..b00ce476e8 100644
--- a/src/network/networkd-netdev-veth.h
+++ b/src/network/netdev/veth.h
@@ -21,7 +21,7 @@
 
 typedef struct Veth Veth;
 
-#include "networkd-netdev.h"
+#include "netdev/netdev.h"
 
 struct Veth {
         NetDev meta;
diff --git a/src/network/networkd-netdev-vlan.c b/src/network/netdev/vlan.c
similarity index 98%
rename from src/network/networkd-netdev-vlan.c
rename to src/network/netdev/vlan.c
index 3cc072388f..28c061fa4f 100644
--- a/src/network/networkd-netdev-vlan.c
+++ b/src/network/netdev/vlan.c
@@ -19,7 +19,7 @@
 
 #include <net/if.h>
 
-#include "networkd-netdev-vlan.h"
+#include "netdev/vlan.h"
 #include "vlan-util.h"
 
 static int netdev_vlan_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *req) {
diff --git a/src/network/networkd-netdev-vlan.h b/src/network/netdev/vlan.h
similarity index 96%
rename from src/network/networkd-netdev-vlan.h
rename to src/network/netdev/vlan.h
index 2dfe314b6e..fade899997 100644
--- a/src/network/networkd-netdev-vlan.h
+++ b/src/network/netdev/vlan.h
@@ -21,7 +21,7 @@
 
 typedef struct VLan VLan;
 
-#include "networkd-netdev.h"
+#include "netdev/netdev.h"
 
 struct VLan {
         NetDev meta;
diff --git a/src/network/networkd-netdev-vrf.c b/src/network/netdev/vrf.c
similarity index 97%
rename from src/network/networkd-netdev-vrf.c
rename to src/network/netdev/vrf.c
index 89bd142e8c..f48b413102 100644
--- a/src/network/networkd-netdev-vrf.c
+++ b/src/network/netdev/vrf.c
@@ -21,7 +21,7 @@
 
 #include "sd-netlink.h"
 #include "missing.h"
-#include "networkd-netdev-vrf.h"
+#include "netdev/vrf.h"
 
 static int netdev_vrf_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *m) {
         Vrf *v;
diff --git a/src/network/networkd-netdev-vrf.h b/src/network/netdev/vrf.h
similarity index 96%
rename from src/network/networkd-netdev-vrf.h
rename to src/network/netdev/vrf.h
index 3d92a26a4d..00f54ed96d 100644
--- a/src/network/networkd-netdev-vrf.h
+++ b/src/network/netdev/vrf.h
@@ -21,7 +21,7 @@
 
 typedef struct Vrf Vrf;
 
-#include "networkd-netdev.h"
+#include "netdev/netdev.h"
 
 struct Vrf {
         NetDev meta;
diff --git a/src/network/networkd-netdev-vxlan.c b/src/network/netdev/vxlan.c
similarity index 99%
rename from src/network/networkd-netdev-vxlan.c
rename to src/network/netdev/vxlan.c
index 706e52b698..10c892b044 100644
--- a/src/network/networkd-netdev-vxlan.c
+++ b/src/network/netdev/vxlan.c
@@ -28,7 +28,7 @@
 #include "missing.h"
 
 #include "networkd-link.h"
-#include "networkd-netdev-vxlan.h"
+#include "netdev/vxlan.h"
 
 static int netdev_vxlan_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *m) {
         VxLan *v;
diff --git a/src/network/networkd-netdev-vxlan.h b/src/network/netdev/vxlan.h
similarity index 99%
rename from src/network/networkd-netdev-vxlan.h
rename to src/network/netdev/vxlan.h
index 3906820afb..6c3081d5fc 100644
--- a/src/network/networkd-netdev-vxlan.h
+++ b/src/network/netdev/vxlan.h
@@ -22,7 +22,7 @@
 typedef struct VxLan VxLan;
 
 #include "in-addr-util.h"
-#include "networkd-netdev.h"
+#include "netdev/netdev.h"
 
 #define VXLAN_VID_MAX (1u << 24) - 1
 
diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h
index 929e0b3b4e..e956a59fe3 100644
--- a/src/network/networkd-network.h
+++ b/src/network/networkd-network.h
@@ -31,9 +31,9 @@
 #include "networkd-brvlan.h"
 #include "networkd-fdb.h"
 #include "networkd-lldp-tx.h"
-#include "networkd-netdev.h"
 #include "networkd-route.h"
 #include "networkd-util.h"
+#include "netdev/netdev.h"
 
 #define DHCP_ROUTE_METRIC 1024
 #define IPV4LL_ROUTE_METRIC 2048
diff --git a/src/network/networkd.h b/src/network/networkd.h
index cb1b73145e..17063427da 100644
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -32,18 +32,18 @@
 
 #include "networkd-address-pool.h"
 #include "networkd-link.h"
-#include "networkd-netdev-bond.h"
-#include "networkd-netdev-bridge.h"
-#include "networkd-netdev-dummy.h"
-#include "networkd-netdev-ipvlan.h"
-#include "networkd-netdev-macvlan.h"
-#include "networkd-netdev-tunnel.h"
-#include "networkd-netdev-tuntap.h"
-#include "networkd-netdev-veth.h"
-#include "networkd-netdev-vlan.h"
-#include "networkd-netdev-vrf.h"
-#include "networkd-netdev-vxlan.h"
-#include "networkd-netdev-vcan.h"
+#include "netdev/bond.h"
+#include "netdev/bridge.h"
+#include "netdev/dummy.h"
+#include "netdev/ipvlan.h"
+#include "netdev/macvlan.h"
+#include "netdev/tunnel.h"
+#include "netdev/tuntap.h"
+#include "netdev/veth.h"
+#include "netdev/vlan.h"
+#include "netdev/vrf.h"
+#include "netdev/vxlan.h"
+#include "netdev/vcan.h"
 #include "networkd-network.h"
 #include "networkd-util.h"
 
diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c
index adbe09a5e1..77247c5771 100644
--- a/src/network/test-network-tables.c
+++ b/src/network/test-network-tables.c
@@ -2,8 +2,8 @@
 #include "dhcp6-protocol.h"
 #include "ethtool-util.h"
 #include "netlink-internal.h"
-#include "networkd-netdev-bond.h"
-#include "networkd-netdev-macvlan.h"
+#include "netdev/bond.h"
+#include "netdev/macvlan.h"
 #include "networkd.h"
 #include "test-tables.h"