diff --git a/README.md b/README.md
index 5365f34..5fe199f 100644
--- a/README.md
+++ b/README.md
@@ -26,10 +26,10 @@ There's a bind9 server on NeoPDP-11 (10.127.1.1), all domain names are under "ne
 ![NeoNetwork Nodes](https://raw.githubusercontent.com/NeoChen1024/NeoNetwork/master/nodes.png)
 
 # Files and Directories:
-	ospf-area.txt:	OSPF Area Number
-	bgp-asn.txt:	BGP AS Number
-	routes.txt:	network subnet allocation
-	named.conf:	Bind9 DNS configuration example
-	nodes.dot:	connection graph
-	tinc:		Tinc configuration example
-	dns:		Bind9 DNS zone files
+	ospf-area.txt	OSPF Area Number
+	bgp-asn.txt	BGP AS Number
+	routes.txt	network subnet allocation
+	named.conf	Bind9 DNS configuration example
+	nodes.dot	connection graph
+	vpn/		VPN configuration examples (Tinc & WireGuard)
+	dns/		Bind9 DNS zone files
diff --git a/tinc/hosts/caasih b/tinc/hosts/caasih
deleted file mode 100644
index 49b88c2..0000000
--- a/tinc/hosts/caasih
+++ /dev/null
@@ -1,16 +0,0 @@
-Address=caasih.nerdpol.ovh
-Port=xxxx
-
------BEGIN RSA PUBLIC KEY-----
-MIICCgKCAgEA4RjPVW/qE7DhWSjSWgH9dgG+5MrMhPxJRlZkI112BBETV17ZzTu5
-D6B0px9aNqpqFlQUkA36JFouJ7dU3LfBdam3gyGN6Ozyj5Vt1cknM6EFyM//0JEI
-RRc4c8L+v9X7ONj6ej6gRwkjrsXZU6LQGaVLTtTDDaetMTHRgr8Q8BGvQt+CAX94
-WK5/TKKm2DIEUEgx85jd6ntRpZuir87BzoAM/gLg6KQ4jYht1SyjVTJ6Sxio/f2u
-B3ATAhVwEG7Ap7GKhDFVhE8WNG0PzlbCmuoRM5yTZW/GY8vPafIfxOtT8Oa7yaZY
-I6Nc9XRfvd7SdimHYbSBYueFX4mi175ZH1XkdGNWiF/tENc5Id/ha94r01Xah+et
-HuSdymgXp68UsiGOJ/TyN0iT5ctgXxjm0Qzy6JDvr6Ijg3IbL8WgBSW335R7bAAe
-Mj4uYsBdZ7riqpu1pjk6OkfT29exttGuz0QzPV82QHPkk5rPa1b+OK7pJJFBGvbo
-s1MY4LR6HSUSlpRvYpbRBLx7KbMHMSMZgfAhA2jrMYo/uSj4Yv5juQxX+ur85yO+
-OmxU/9CYwlaRh0aYBSymqAKDhgFmUfyoz0R2CVJ+a7MbHJxFFfDCzi3StaJtwM/Q
-+Rs2hN3T0DyYvmQwyPZAXOAQx3NRq8luVrEPiWEPJYE0LCTceRkqKW8CAwEAAQ==
------END RSA PUBLIC KEY-----
diff --git a/tinc/hosts/fionaLHS b/tinc/hosts/fionaLHS
deleted file mode 100644
index c307805..0000000
--- a/tinc/hosts/fionaLHS
+++ /dev/null
@@ -1,16 +0,0 @@
-Address=fiona.yukipedia.cf
-Port=xxxx
-
------BEGIN RSA PUBLIC KEY-----
-MIICCgKCAgEAv83xCTDwD8WqWSksfpAEFbVO2PVZbzqXtUavQ8Vv57i2ExmIATVe
-WX3xeXe4E6SZuT57NmkJUgQlx9GQmSafUOnBJ1ra74MtNv33C+7YHVkyFOI3RtYq
-LYT3mmvauzVfA3YZS07F+kNKnmkCTEfsKgbvinu8zaXd8tq5iUb3fsEsjMKcgVsP
-vmCSiELp1BwaANFDc7D0lo6CG9GXUEjtpM4gPnQgtSiVUqYuC4TLTBV07Bjyc97G
-4qpRZcl9GCHPmJhYLLGywolNJV82UsPgaLB22wl50u4OSF9Ah6+sra7AgnBU3EgO
-qsmzilOSv9iEkmRwa/ajEj5gtmJq3/SYkxckLNA0OgOwhQEyOgL+zbnFAitSWzeZ
-OaHhhbVn+Qh+XYGOJ3GiYH+Y1hUbEkKgEwIQJOXd6zY5ke4NPVxxAvG9NlR088ow
-wdaoUKLbgPXiS+ZTTwxgEx7/M0sPJxt9drKMLgWzxRov/jlUasK4q+cQSc7Zv1/Q
-PahFvfAV5Ki5EUc5KSN8Oc1BKFIABETKXqWpLL/DuoMsBA+jcjDEtMBDWhvKLsHW
-cp5q4eC8mQXZ+R1X9hU16gFGDhrb2x+9dqCEYNeXfkxLE+3pNyIMBEEe58iDK/XS
-vBG/wTYPapXmuZR8byUz91qYXlJRbw4fzgkbcoIJ/hYVUJYr6x0GeSECAwEAAQ==
------END RSA PUBLIC KEY-----
diff --git a/tinc/hosts/icecat_Explosion b/tinc/hosts/icecat_Explosion
deleted file mode 100644
index 2ee8d33..0000000
--- a/tinc/hosts/icecat_Explosion
+++ /dev/null
@@ -1,11 +0,0 @@
-Address = hk-01.nextmoe.cloud.imiku.cn
-Port = xxxxx
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAzFSm953YSKBLQVJ7BWh/yt6dU3dwtsO2aQqUNDZmAGipDv3SkwbI
-4Rzn1lMdAwBxWP35hzepi+NvWuLI2a2yCEm6QwoZD4BpC+tF7jvZZWkT6o8a3OPa
-xWd9fTqNEzFkVyX9l52fMc2qsK2SIT90uUDVLnBtPen4AsYaJRnTr4mAhI8Nm1/B
-mQpccSX1Nai7GPOX4GaVX7rFbsuSLJskoi8YKf68nfd9bvKYJ8YG9iqyU5JzMmaS
-Gnxem24iXzYfw46HxGVVpI3S0wcnbx3yPpa3NTtF0D4igw4XJbdxkX6YVvTVl+tJ
-M6Kukh4Bi1OZQ0dXO812T9WqIJuNvM5qVwIDAQAB
------END RSA PUBLIC KEY-----
-Ed25519PublicKey = 6WWf54qQBuLkBMZnmDIh+lj08gGEOpnqHM5HNZJM3UL
diff --git a/tinc/hosts/ncuiqh b/tinc/hosts/ncuiqh
deleted file mode 100644
index 40e6326..0000000
--- a/tinc/hosts/ncuiqh
+++ /dev/null
@@ -1,16 +0,0 @@
-Address = ncuiqh.nerdpol.ovh
-Port = xxxx
-
------BEGIN RSA PUBLIC KEY-----
-MIICCgKCAgEA4kOdZt0BkJU4ltXRLqwpMNe0CvNhajgU/VLc7rhJpr0urtxlGxD2
-hhDmuHxx9Gsfi1ytztnwzlqyERV0scD5DqtajvdbeKXnNHlsFgdMkL/6gBS7F/VM
-SdvDxC8XTbaf9Q9jVeGJBy1Y1di3jy0jmIx0xje0/dukJqnNpjcIxNZDSjn5Hcp0
-VxL87Hpz4qCEyGa2UYTRLNHGOyuD+pXy60aJf+JtshK3Uw4uvQbxNl4I/wTDdRgI
-3npD64mkpFmstrHjU4fQs5qZGnNPJjOwHqKBkUb0Gj9U/TU16BPyWQi9X1HYzYRG
-0cOiuHVhINO/0O/OIIIikw81xrb0Mm+TsLYmfLjlNBb+1Nc0SgV0BJMrdENYPOft
-ror3lBgj3NAV3Z1nykBY1o5vrtl3zvph4VKeXOwI/qkJ96YYTfXsV0+taYOR7KYT
-lsdoFpAwffgspt3eLXWdOX3zo37jWoWAKvg/Jof/AgjEoqJ0eYnyZ/hj0G/YcHkh
-AivALZhPQkHi+FjalfK1ZwIEbNSGco6dOZbXW0KAzxGvhbxLTEoKpY1Gn1PXRCth
-D4tUhKzu9504HOjs55qW+zgDsi+bcNHhdbuyrgAA6o4mCkOc7NjSYUZGRMqmTDQX
-JRNrMyLraEb8xA1dP7uzK4AgQEsrxLlkDuIcfxntWIqtnKaUI+Ezo9ECAwEAAQ==
------END RSA PUBLIC KEY-----
diff --git a/tinc/hosts/ucbvax b/tinc/hosts/ucbvax
deleted file mode 100644
index 2939fa6..0000000
--- a/tinc/hosts/ucbvax
+++ /dev/null
@@ -1,16 +0,0 @@
-Address=sl-sgp.asn.yt
-Port=xxxx
-
------BEGIN RSA PUBLIC KEY-----
-MIICCgKCAgEAzs4pHdKCzTULQtKnAn6DzFSHHxeLMB47BvBJWl5xCkBwYLYqZNnl
-JQCPevrIOz29VY34Ko7s4ClcLU5ZI1gqB4maFg6bsdeekhnG8sszQzBzZF2PDOXg
-J40aDUCHV1QNLwUAFVl9cQvSPv1cnrOqZI6dKJTV7inGh72c6DHdDI9NCuGUrwBa
-X7bs/TuQEAvv81RVaO5/tAUTALrvGUKG2vxQINJoCmzgl4noqfX3+5K0eRnnJF+P
-+edT2Dn7M8VUMJo4zuxIcjll3aVLhoBjXys7Fc2hVP3fILsbx9v/NMyW4fzVkM+q
-U1oycVYn/Xh8o/YoVJRjlqUmhPGRrsuXsYvW/Xq1Tz2tRLtUlIS4npiEKDGQOaF+
-4W/1TNAXUBFBwM6dZxsruBJc/ZgOsalLfKvPkSFroA1P4VsE671BOnxUuVbeNwnm
-yPTmaoxBhkrQ2N3rDC9J8KStgaFSD5raXhgVxNIr0vx8FBx7XtPOzOkcqr3CzG81
-FVo0o7Ql24t61mri/qBh0YHTOPLvZ0BEZTWQtf6ACGofYa7B/9C6Ahf+gn6kISWr
-dL2qXJ7iPOkVn33HYiKfLVPCCmOT352U1nfgjNacQ1K0qn6/RpEWx7z6j7QCs1Ua
-uF4k8jksRkzZsytvLSo1nm5VSw8vQfb3r2OxVMWRZAmk+C+KVrno3KcCAwEAAQ==
------END RSA PUBLIC KEY-----
diff --git a/tinc/tinc-down b/vpn/tinc/tinc-down
similarity index 100%
rename from tinc/tinc-down
rename to vpn/tinc/tinc-down
diff --git a/tinc/tinc-up b/vpn/tinc/tinc-up
similarity index 51%
rename from tinc/tinc-up
rename to vpn/tinc/tinc-up
index c62358b..629f4ef 100644
--- a/tinc/tinc-up
+++ b/vpn/tinc/tinc-up
@@ -1,11 +1,13 @@
 #!/bin/sh
 
+IP="10.127.x.x"
+
 case `uname` in
 	Linux)
 		ip link set $INTERFACE up
-		ip addr add 10.127.x.x/x dev $INTERFACE
+		ip addr add "$IP" dev $INTERFACE
 		;;
 	*BSD)
-		ifconfig $INTERFACE 10.127.x.x/x
+		ifconfig $INTERFACE "$IP"
 		;;
 esac
diff --git a/tinc/tinc.conf b/vpn/tinc/tinc.conf
similarity index 100%
rename from tinc/tinc.conf
rename to vpn/tinc/tinc.conf
diff --git a/vpn/wireguard.conf b/vpn/wireguard.conf
new file mode 100644
index 0000000..11369f1
--- /dev/null
+++ b/vpn/wireguard.conf
@@ -0,0 +1,15 @@
+[Interface]
+Address = 10.127.0.xx/30
+# Custom DNS
+#DNS = 127.0.0.1
+# Set MTU to 1412 if using PPP
+#MTU = 1412
+Table = off
+ListenPort =
+PrivateKey =
+
+[Peer]
+AllowedIPs = 0.0.0.0/0
+PersistentKeepalive = 25
+PublicKey =
+Endpoint =