diff --git a/general/overlay/etc/network/interfaces b/general/overlay/etc/network/interfaces
index 766ea920..cdd1d27a 100644
--- a/general/overlay/etc/network/interfaces
+++ b/general/overlay/etc/network/interfaces
@@ -1,38 +1,4 @@
-
 auto lo
 iface lo inet loopback
 
-auto eth0
-iface eth0 inet dhcp
-    hwaddress ether $(fw_printenv -n ethaddr || echo 00:24:B8:FF:FF:FF)
-    #udhcpc_opts -O search -O ntpsrv -O hostname
-    #pre-up echo -e "nameserver 77.88.8.8\nnameserver 8.8.4.4\n" >/tmp/resolv.conf
-    #pre-up echo -e "server 0.time.openipc.org iburst\nserver 1.time.openipc.org iburst\nserver 2.time.openipc.org iburst\nserver 3.time.openipc.org iburst" >/tmp/ntp.conf
-    #up /usr/sbin/ntpd -N -q
-
-manual wlan0
-iface wlan0 inet dhcp
-    pre-up devmem 0x100C0080 32 0x530
-    pre-up echo 7 > /sys/class/gpio/export
-    pre-up echo out > /sys/class/gpio/gpio7/direction
-    pre-up echo 0 > /sys/class/gpio/gpio7/value
-    pre-up modprobe mt7601u
-    pre-up wpa_passphrase $(fw_printenv -n wifissid || echo openipc) $(fw_printenv -n wifipass || echo openipc12345) >/tmp/wpa_supplicant.conf
-    pre-up sed -i '2i \\tscan_ssid=1' /tmp/wpa_supplicant.conf
-    pre-up sleep 3
-    pre-up wpa_supplicant -B -D nl80211 -i wlan0 -c/tmp/wpa_supplicant.conf
-    post-down killall -q wpa_supplicant
-    post-down echo 1 > /sys/class/gpio/gpio7/value
-    post-down echo 7 > /sys/class/gpio/unexport
-
-manual wg0
-iface wg0 inet static
-    address 192.168.99.1
-    netmask 255.255.255.0
-    pre-up modprobe wireguard
-    pre-up ip link add dev wg0 type wireguard
-    pre-up wg setconf wg0 /etc/wireguard.conf
-    post-down ip link del dev wg0
-
-#source-dir /etc/network/interfaces.d
-
+source-dir /etc/network/interfaces.d
diff --git a/general/overlay/etc/network/interfaces.d/eth0 b/general/overlay/etc/network/interfaces.d/eth0
new file mode 100644
index 00000000..70bcef7c
--- /dev/null
+++ b/general/overlay/etc/network/interfaces.d/eth0
@@ -0,0 +1,7 @@
+auto eth0
+iface eth0 inet dhcp
+    hwaddress ether $(fw_printenv -n ethaddr || echo 00:24:B8:FF:FF:FF)
+    #udhcpc_opts -O search -O ntpsrv -O hostname
+    #pre-up echo -e "nameserver 77.88.8.8\nnameserver 8.8.4.4\n" >/tmp/resolv.conf
+    #pre-up echo -e "server 0.time.openipc.org iburst\nserver 1.time.openipc.org iburst\nserver 2.time.openipc.org iburst\nserver 3.time.openipc.org iburst" >/tmp/ntp.conf
+    #up /usr/sbin/ntpd -N -q
diff --git a/general/overlay/etc/network/interfaces.d/eth2 b/general/overlay/etc/network/interfaces.d/eth2
index a99f16e0..ba519490 100644
--- a/general/overlay/etc/network/interfaces.d/eth2
+++ b/general/overlay/etc/network/interfaces.d/eth2
@@ -1,4 +1,3 @@
-
 iface eth2 inet dhcp
     pre-up wifi xm711
     pre-up wpa_passphrase "SSID" "password" >/tmp/wpa_supplicant.conf
diff --git a/general/overlay/etc/network/interfaces.d/ppp0 b/general/overlay/etc/network/interfaces.d/ppp0
index 877f8add..aafc7f97 100644
--- a/general/overlay/etc/network/interfaces.d/ppp0
+++ b/general/overlay/etc/network/interfaces.d/ppp0
@@ -1,4 +1,3 @@
-
 iface ppp0 inet ppp
     pre-up echo 61 > /sys/class/gpio/export
     pre-up echo out > /sys/class/gpio/gpio61/direction
diff --git a/general/overlay/etc/network/interfaces.d/usb0 b/general/overlay/etc/network/interfaces.d/usb0
index 806c370c..78aeefa6 100644
--- a/general/overlay/etc/network/interfaces.d/usb0
+++ b/general/overlay/etc/network/interfaces.d/usb0
@@ -1,4 +1,3 @@
-
 iface usb0 inet dhcp
     pre-up echo 9 > /sys/class/gpio/export
     pre-up echo out > /sys/class/gpio/gpio9/direction
diff --git a/general/overlay/etc/network/interfaces.d/wg0 b/general/overlay/etc/network/interfaces.d/wg0
new file mode 100644
index 00000000..5a70cb6c
--- /dev/null
+++ b/general/overlay/etc/network/interfaces.d/wg0
@@ -0,0 +1,8 @@
+manual wg0
+iface wg0 inet static
+    address 192.168.99.1
+    netmask 255.255.255.0
+    pre-up modprobe wireguard
+    pre-up ip link add dev wg0 type wireguard
+    pre-up wg setconf wg0 /etc/wireguard.conf
+    post-down ip link del dev wg0
diff --git a/general/overlay/etc/network/interfaces.d/wlan0 b/general/overlay/etc/network/interfaces.d/wlan0
new file mode 100644
index 00000000..e05dd33f
--- /dev/null
+++ b/general/overlay/etc/network/interfaces.d/wlan0
@@ -0,0 +1,14 @@
+manual wlan0
+iface wlan0 inet dhcp
+    pre-up devmem 0x100C0080 32 0x530
+    pre-up echo 7 > /sys/class/gpio/export
+    pre-up echo out > /sys/class/gpio/gpio7/direction
+    pre-up echo 0 > /sys/class/gpio/gpio7/value
+    pre-up modprobe mt7601u
+    pre-up wpa_passphrase $(fw_printenv -n wifissid || echo openipc) $(fw_printenv -n wifipass || echo openipc12345) >/tmp/wpa_supplicant.conf
+    pre-up sed -i '2i \\tscan_ssid=1' /tmp/wpa_supplicant.conf
+    pre-up sleep 3
+    pre-up wpa_supplicant -B -D nl80211 -i wlan0 -c/tmp/wpa_supplicant.conf
+    post-down killall -q wpa_supplicant
+    post-down echo 1 > /sys/class/gpio/gpio7/value
+    post-down echo 7 > /sys/class/gpio/unexport