diff --git a/fsn1/bird2/bird.conf b/nodes/fsn1/bird2/bird.conf
similarity index 100%
rename from fsn1/bird2/bird.conf
rename to nodes/fsn1/bird2/bird.conf
diff --git a/fsn1/bird2/bird/conf/client-wg.conf b/nodes/fsn1/bird2/bird/conf/client-wg.conf
similarity index 100%
rename from fsn1/bird2/bird/conf/client-wg.conf
rename to nodes/fsn1/bird2/bird/conf/client-wg.conf
diff --git a/fsn1/bird2/bird/conf/dn42.conf b/nodes/fsn1/bird2/bird/conf/dn42.conf
similarity index 100%
rename from fsn1/bird2/bird/conf/dn42.conf
rename to nodes/fsn1/bird2/bird/conf/dn42.conf
diff --git a/fsn1/bird2/bird/conf/ibgp.conf b/nodes/fsn1/bird2/bird/conf/ibgp.conf
similarity index 100%
rename from fsn1/bird2/bird/conf/ibgp.conf
rename to nodes/fsn1/bird2/bird/conf/ibgp.conf
diff --git a/fsn1/bird2/bird/disabled-peers/ospf.conf b/nodes/fsn1/bird2/bird/disabled-peers/ospf.conf
similarity index 100%
rename from fsn1/bird2/bird/disabled-peers/ospf.conf
rename to nodes/fsn1/bird2/bird/disabled-peers/ospf.conf
diff --git a/fsn1/bird2/bird/peers/AS4242422237_munsternet.conf b/nodes/fsn1/bird2/bird/peers/AS4242422237_munsternet.conf
similarity index 100%
rename from fsn1/bird2/bird/peers/AS4242422237_munsternet.conf
rename to nodes/fsn1/bird2/bird/peers/AS4242422237_munsternet.conf
diff --git a/fsn1/bird2/bird/peers/AS4242422341_zotan_fsn2.conf b/nodes/fsn1/bird2/bird/peers/AS4242422341_zotan_fsn2.conf
similarity index 100%
rename from fsn1/bird2/bird/peers/AS4242422341_zotan_fsn2.conf
rename to nodes/fsn1/bird2/bird/peers/AS4242422341_zotan_fsn2.conf
diff --git a/fsn1/bird2/bird/peers/AS4242422341_zotan_hel1.conf b/nodes/fsn1/bird2/bird/peers/AS4242422341_zotan_hel1.conf
similarity index 100%
rename from fsn1/bird2/bird/peers/AS4242422341_zotan_hel1.conf
rename to nodes/fsn1/bird2/bird/peers/AS4242422341_zotan_hel1.conf
diff --git a/fsn1/bird2/bird/peers/AS4242422341_zotan_nbg1.conf b/nodes/fsn1/bird2/bird/peers/AS4242422341_zotan_nbg1.conf
similarity index 100%
rename from fsn1/bird2/bird/peers/AS4242422341_zotan_nbg1.conf
rename to nodes/fsn1/bird2/bird/peers/AS4242422341_zotan_nbg1.conf
diff --git a/fsn1/bird2/bird/peers/AS4242422601_burble.conf b/nodes/fsn1/bird2/bird/peers/AS4242422601_burble.conf
similarity index 100%
rename from fsn1/bird2/bird/peers/AS4242422601_burble.conf
rename to nodes/fsn1/bird2/bird/peers/AS4242422601_burble.conf
diff --git a/fsn1/bird2/bird/peers/AS4242423905_weiti.conf b/nodes/fsn1/bird2/bird/peers/AS4242423905_weiti.conf
similarity index 100%
rename from fsn1/bird2/bird/peers/AS4242423905_weiti.conf
rename to nodes/fsn1/bird2/bird/peers/AS4242423905_weiti.conf
diff --git a/fsn1/bird2/bird/peers/AS4242423934_graffen.conf b/nodes/fsn1/bird2/bird/peers/AS4242423934_graffen.conf
similarity index 100%
rename from fsn1/bird2/bird/peers/AS4242423934_graffen.conf
rename to nodes/fsn1/bird2/bird/peers/AS4242423934_graffen.conf
diff --git a/fsn1/bird2/bird/peers/AS76190_manawyrm.conf b/nodes/fsn1/bird2/bird/peers/AS76190_manawyrm.conf
similarity index 100%
rename from fsn1/bird2/bird/peers/AS76190_manawyrm.conf
rename to nodes/fsn1/bird2/bird/peers/AS76190_manawyrm.conf
diff --git a/fsn1/bird2/bird/roa_dn42.conf b/nodes/fsn1/bird2/bird/roa_dn42.conf
similarity index 100%
rename from fsn1/bird2/bird/roa_dn42.conf
rename to nodes/fsn1/bird2/bird/roa_dn42.conf
diff --git a/fsn1/bird2/bird/roa_dn42_v6.conf b/nodes/fsn1/bird2/bird/roa_dn42_v6.conf
similarity index 100%
rename from fsn1/bird2/bird/roa_dn42_v6.conf
rename to nodes/fsn1/bird2/bird/roa_dn42_v6.conf
diff --git a/fsn1/bird2/bird/vars.conf b/nodes/fsn1/bird2/bird/vars.conf
similarity index 100%
rename from fsn1/bird2/bird/vars.conf
rename to nodes/fsn1/bird2/bird/vars.conf
diff --git a/fsn1/iptables/ip6tables.rules b/nodes/fsn1/iptables/ip6tables.rules
similarity index 100%
rename from fsn1/iptables/ip6tables.rules
rename to nodes/fsn1/iptables/ip6tables.rules
diff --git a/fsn1/iptables/iptables.rules b/nodes/fsn1/iptables/iptables.rules
similarity index 100%
rename from fsn1/iptables/iptables.rules
rename to nodes/fsn1/iptables/iptables.rules
diff --git a/fsn1/named/named.conf b/nodes/fsn1/named/named.conf
similarity index 100%
rename from fsn1/named/named.conf
rename to nodes/fsn1/named/named.conf
diff --git a/fsn1/systemd-networkd/dn42i1.netdev b/nodes/fsn1/systemd-networkd/dn42i1.netdev
similarity index 100%
rename from fsn1/systemd-networkd/dn42i1.netdev
rename to nodes/fsn1/systemd-networkd/dn42i1.netdev
diff --git a/fsn1/systemd-networkd/dn42i1.network b/nodes/fsn1/systemd-networkd/dn42i1.network
similarity index 100%
rename from fsn1/systemd-networkd/dn42i1.network
rename to nodes/fsn1/systemd-networkd/dn42i1.network
diff --git a/fsn1/systemd-networkd/dn42i2.netdev b/nodes/fsn1/systemd-networkd/dn42i2.netdev
similarity index 100%
rename from fsn1/systemd-networkd/dn42i2.netdev
rename to nodes/fsn1/systemd-networkd/dn42i2.netdev
diff --git a/fsn1/systemd-networkd/dn42i2.network b/nodes/fsn1/systemd-networkd/dn42i2.network
similarity index 100%
rename from fsn1/systemd-networkd/dn42i2.network
rename to nodes/fsn1/systemd-networkd/dn42i2.network
diff --git a/fsn1/systemd-networkd/dn42i3.netdev b/nodes/fsn1/systemd-networkd/dn42i3.netdev
similarity index 100%
rename from fsn1/systemd-networkd/dn42i3.netdev
rename to nodes/fsn1/systemd-networkd/dn42i3.netdev
diff --git a/fsn1/systemd-networkd/dn42i3.network b/nodes/fsn1/systemd-networkd/dn42i3.network
similarity index 100%
rename from fsn1/systemd-networkd/dn42i3.network
rename to nodes/fsn1/systemd-networkd/dn42i3.network
diff --git a/fsn1/systemd-networkd/dn42p1.netdev b/nodes/fsn1/systemd-networkd/dn42p1.netdev
similarity index 100%
rename from fsn1/systemd-networkd/dn42p1.netdev
rename to nodes/fsn1/systemd-networkd/dn42p1.netdev
diff --git a/fsn1/systemd-networkd/dn42p1.network b/nodes/fsn1/systemd-networkd/dn42p1.network
similarity index 100%
rename from fsn1/systemd-networkd/dn42p1.network
rename to nodes/fsn1/systemd-networkd/dn42p1.network
diff --git a/fsn1/systemd-networkd/dn42p2.netdev b/nodes/fsn1/systemd-networkd/dn42p2.netdev
similarity index 100%
rename from fsn1/systemd-networkd/dn42p2.netdev
rename to nodes/fsn1/systemd-networkd/dn42p2.netdev
diff --git a/fsn1/systemd-networkd/dn42p2.network b/nodes/fsn1/systemd-networkd/dn42p2.network
similarity index 100%
rename from fsn1/systemd-networkd/dn42p2.network
rename to nodes/fsn1/systemd-networkd/dn42p2.network
diff --git a/fsn1/systemd-networkd/dn42p3.netdev b/nodes/fsn1/systemd-networkd/dn42p3.netdev
similarity index 100%
rename from fsn1/systemd-networkd/dn42p3.netdev
rename to nodes/fsn1/systemd-networkd/dn42p3.netdev
diff --git a/fsn1/systemd-networkd/dn42p3.network b/nodes/fsn1/systemd-networkd/dn42p3.network
similarity index 100%
rename from fsn1/systemd-networkd/dn42p3.network
rename to nodes/fsn1/systemd-networkd/dn42p3.network
diff --git a/fsn1/systemd-networkd/dn42p4.netdev b/nodes/fsn1/systemd-networkd/dn42p4.netdev
similarity index 100%
rename from fsn1/systemd-networkd/dn42p4.netdev
rename to nodes/fsn1/systemd-networkd/dn42p4.netdev
diff --git a/fsn1/systemd-networkd/dn42p4.network b/nodes/fsn1/systemd-networkd/dn42p4.network
similarity index 100%
rename from fsn1/systemd-networkd/dn42p4.network
rename to nodes/fsn1/systemd-networkd/dn42p4.network
diff --git a/fsn1/systemd-networkd/dn42p5.netdev b/nodes/fsn1/systemd-networkd/dn42p5.netdev
similarity index 100%
rename from fsn1/systemd-networkd/dn42p5.netdev
rename to nodes/fsn1/systemd-networkd/dn42p5.netdev
diff --git a/fsn1/systemd-networkd/dn42p5.network b/nodes/fsn1/systemd-networkd/dn42p5.network
similarity index 100%
rename from fsn1/systemd-networkd/dn42p5.network
rename to nodes/fsn1/systemd-networkd/dn42p5.network
diff --git a/fsn1/systemd-networkd/enp1s0.network b/nodes/fsn1/systemd-networkd/enp1s0.network
similarity index 100%
rename from fsn1/systemd-networkd/enp1s0.network
rename to nodes/fsn1/systemd-networkd/enp1s0.network
diff --git a/fsn1/systemd-networkd/lo.network b/nodes/fsn1/systemd-networkd/lo.network
similarity index 100%
rename from fsn1/systemd-networkd/lo.network
rename to nodes/fsn1/systemd-networkd/lo.network
diff --git a/fsn1/systemd-networkd/wg0.netdev b/nodes/fsn1/systemd-networkd/wg0.netdev
similarity index 100%
rename from fsn1/systemd-networkd/wg0.netdev
rename to nodes/fsn1/systemd-networkd/wg0.netdev
diff --git a/fsn1/systemd-networkd/wg0.network b/nodes/fsn1/systemd-networkd/wg0.network
similarity index 100%
rename from fsn1/systemd-networkd/wg0.network
rename to nodes/fsn1/systemd-networkd/wg0.network
diff --git a/fsn2/bird2/bird.conf b/nodes/fsn2/bird2/bird.conf
similarity index 100%
rename from fsn2/bird2/bird.conf
rename to nodes/fsn2/bird2/bird.conf
diff --git a/fsn2/bird2/bird/conf/dn42.conf b/nodes/fsn2/bird2/bird/conf/dn42.conf
similarity index 100%
rename from fsn2/bird2/bird/conf/dn42.conf
rename to nodes/fsn2/bird2/bird/conf/dn42.conf
diff --git a/fsn2/bird2/bird/conf/ibgp.conf b/nodes/fsn2/bird2/bird/conf/ibgp.conf
similarity index 100%
rename from fsn2/bird2/bird/conf/ibgp.conf
rename to nodes/fsn2/bird2/bird/conf/ibgp.conf
diff --git a/fsn2/bird2/bird/disabled-peers/ospf.conf b/nodes/fsn2/bird2/bird/disabled-peers/ospf.conf
similarity index 100%
rename from fsn2/bird2/bird/disabled-peers/ospf.conf
rename to nodes/fsn2/bird2/bird/disabled-peers/ospf.conf
diff --git a/fsn2/bird2/bird/peers/AS4242422341_zotan_fsn1.conf b/nodes/fsn2/bird2/bird/peers/AS4242422341_zotan_fsn1.conf
similarity index 100%
rename from fsn2/bird2/bird/peers/AS4242422341_zotan_fsn1.conf
rename to nodes/fsn2/bird2/bird/peers/AS4242422341_zotan_fsn1.conf
diff --git a/fsn2/bird2/bird/peers/AS4242422341_zotan_hel1.conf b/nodes/fsn2/bird2/bird/peers/AS4242422341_zotan_hel1.conf
similarity index 100%
rename from fsn2/bird2/bird/peers/AS4242422341_zotan_hel1.conf
rename to nodes/fsn2/bird2/bird/peers/AS4242422341_zotan_hel1.conf
diff --git a/fsn2/bird2/bird/peers/AS4242422341_zotan_nbg1.conf b/nodes/fsn2/bird2/bird/peers/AS4242422341_zotan_nbg1.conf
similarity index 100%
rename from fsn2/bird2/bird/peers/AS4242422341_zotan_nbg1.conf
rename to nodes/fsn2/bird2/bird/peers/AS4242422341_zotan_nbg1.conf
diff --git a/fsn2/bird2/bird/roa_dn42.conf b/nodes/fsn2/bird2/bird/roa_dn42.conf
similarity index 100%
rename from fsn2/bird2/bird/roa_dn42.conf
rename to nodes/fsn2/bird2/bird/roa_dn42.conf
diff --git a/fsn2/bird2/bird/roa_dn42_v6.conf b/nodes/fsn2/bird2/bird/roa_dn42_v6.conf
similarity index 100%
rename from fsn2/bird2/bird/roa_dn42_v6.conf
rename to nodes/fsn2/bird2/bird/roa_dn42_v6.conf
diff --git a/fsn2/bird2/bird/vars.conf b/nodes/fsn2/bird2/bird/vars.conf
similarity index 100%
rename from fsn2/bird2/bird/vars.conf
rename to nodes/fsn2/bird2/bird/vars.conf
diff --git a/fsn2/systemd-networkd/dn42i1.netdev b/nodes/fsn2/systemd-networkd/dn42i1.netdev
similarity index 100%
rename from fsn2/systemd-networkd/dn42i1.netdev
rename to nodes/fsn2/systemd-networkd/dn42i1.netdev
diff --git a/fsn2/systemd-networkd/dn42i1.network b/nodes/fsn2/systemd-networkd/dn42i1.network
similarity index 100%
rename from fsn2/systemd-networkd/dn42i1.network
rename to nodes/fsn2/systemd-networkd/dn42i1.network
diff --git a/fsn2/systemd-networkd/dn42i2.netdev b/nodes/fsn2/systemd-networkd/dn42i2.netdev
similarity index 100%
rename from fsn2/systemd-networkd/dn42i2.netdev
rename to nodes/fsn2/systemd-networkd/dn42i2.netdev
diff --git a/fsn2/systemd-networkd/dn42i2.network b/nodes/fsn2/systemd-networkd/dn42i2.network
similarity index 100%
rename from fsn2/systemd-networkd/dn42i2.network
rename to nodes/fsn2/systemd-networkd/dn42i2.network
diff --git a/fsn2/systemd-networkd/dn42i3.netdev b/nodes/fsn2/systemd-networkd/dn42i3.netdev
similarity index 100%
rename from fsn2/systemd-networkd/dn42i3.netdev
rename to nodes/fsn2/systemd-networkd/dn42i3.netdev
diff --git a/fsn2/systemd-networkd/dn42i3.network b/nodes/fsn2/systemd-networkd/dn42i3.network
similarity index 100%
rename from fsn2/systemd-networkd/dn42i3.network
rename to nodes/fsn2/systemd-networkd/dn42i3.network
diff --git a/hel1/bird2/bird.conf b/nodes/hel1/bird2/bird.conf
similarity index 100%
rename from hel1/bird2/bird.conf
rename to nodes/hel1/bird2/bird.conf
diff --git a/hel1/bird2/bird/conf/dn42.conf b/nodes/hel1/bird2/bird/conf/dn42.conf
similarity index 100%
rename from hel1/bird2/bird/conf/dn42.conf
rename to nodes/hel1/bird2/bird/conf/dn42.conf
diff --git a/hel1/bird2/bird/conf/ibgp.conf b/nodes/hel1/bird2/bird/conf/ibgp.conf
similarity index 100%
rename from hel1/bird2/bird/conf/ibgp.conf
rename to nodes/hel1/bird2/bird/conf/ibgp.conf
diff --git a/hel1/bird2/bird/disabled-peers/ospf.conf b/nodes/hel1/bird2/bird/disabled-peers/ospf.conf
similarity index 100%
rename from hel1/bird2/bird/disabled-peers/ospf.conf
rename to nodes/hel1/bird2/bird/disabled-peers/ospf.conf
diff --git a/hel1/bird2/bird/peers/AS4242422237_munsternet.conf b/nodes/hel1/bird2/bird/peers/AS4242422237_munsternet.conf
similarity index 100%
rename from hel1/bird2/bird/peers/AS4242422237_munsternet.conf
rename to nodes/hel1/bird2/bird/peers/AS4242422237_munsternet.conf
diff --git a/hel1/bird2/bird/peers/AS4242422341_zotan_fsn1.conf b/nodes/hel1/bird2/bird/peers/AS4242422341_zotan_fsn1.conf
similarity index 100%
rename from hel1/bird2/bird/peers/AS4242422341_zotan_fsn1.conf
rename to nodes/hel1/bird2/bird/peers/AS4242422341_zotan_fsn1.conf
diff --git a/hel1/bird2/bird/peers/AS4242422341_zotan_fsn2.conf b/nodes/hel1/bird2/bird/peers/AS4242422341_zotan_fsn2.conf
similarity index 100%
rename from hel1/bird2/bird/peers/AS4242422341_zotan_fsn2.conf
rename to nodes/hel1/bird2/bird/peers/AS4242422341_zotan_fsn2.conf
diff --git a/hel1/bird2/bird/peers/AS4242422341_zotan_hel1.conf b/nodes/hel1/bird2/bird/peers/AS4242422341_zotan_hel1.conf
similarity index 100%
rename from hel1/bird2/bird/peers/AS4242422341_zotan_hel1.conf
rename to nodes/hel1/bird2/bird/peers/AS4242422341_zotan_hel1.conf
diff --git a/hel1/bird2/bird/peers/AS4242422341_zotan_nbg1.conf b/nodes/hel1/bird2/bird/peers/AS4242422341_zotan_nbg1.conf
similarity index 100%
rename from hel1/bird2/bird/peers/AS4242422341_zotan_nbg1.conf
rename to nodes/hel1/bird2/bird/peers/AS4242422341_zotan_nbg1.conf
diff --git a/hel1/bird2/bird/peers/AS4242422601_burble.conf b/nodes/hel1/bird2/bird/peers/AS4242422601_burble.conf
similarity index 100%
rename from hel1/bird2/bird/peers/AS4242422601_burble.conf
rename to nodes/hel1/bird2/bird/peers/AS4242422601_burble.conf
diff --git a/hel1/bird2/bird/peers/AS4242422904_doxz.conf b/nodes/hel1/bird2/bird/peers/AS4242422904_doxz.conf
similarity index 100%
rename from hel1/bird2/bird/peers/AS4242422904_doxz.conf
rename to nodes/hel1/bird2/bird/peers/AS4242422904_doxz.conf
diff --git a/hel1/bird2/bird/peers/AS4242423934_graffen.conf b/nodes/hel1/bird2/bird/peers/AS4242423934_graffen.conf
similarity index 100%
rename from hel1/bird2/bird/peers/AS4242423934_graffen.conf
rename to nodes/hel1/bird2/bird/peers/AS4242423934_graffen.conf
diff --git a/hel1/bird2/bird/peers/AS76190_manawyrm.conf b/nodes/hel1/bird2/bird/peers/AS76190_manawyrm.conf
similarity index 100%
rename from hel1/bird2/bird/peers/AS76190_manawyrm.conf
rename to nodes/hel1/bird2/bird/peers/AS76190_manawyrm.conf
diff --git a/hel1/bird2/bird/roa_dn42.conf b/nodes/hel1/bird2/bird/roa_dn42.conf
similarity index 100%
rename from hel1/bird2/bird/roa_dn42.conf
rename to nodes/hel1/bird2/bird/roa_dn42.conf
diff --git a/hel1/bird2/bird/roa_dn42_v6.conf b/nodes/hel1/bird2/bird/roa_dn42_v6.conf
similarity index 100%
rename from hel1/bird2/bird/roa_dn42_v6.conf
rename to nodes/hel1/bird2/bird/roa_dn42_v6.conf
diff --git a/hel1/bird2/bird/vars.conf b/nodes/hel1/bird2/bird/vars.conf
similarity index 100%
rename from hel1/bird2/bird/vars.conf
rename to nodes/hel1/bird2/bird/vars.conf
diff --git a/hel1/systemd-networkd/dn42i1.netdev b/nodes/hel1/systemd-networkd/dn42i1.netdev
similarity index 100%
rename from hel1/systemd-networkd/dn42i1.netdev
rename to nodes/hel1/systemd-networkd/dn42i1.netdev
diff --git a/hel1/systemd-networkd/dn42i1.network b/nodes/hel1/systemd-networkd/dn42i1.network
similarity index 100%
rename from hel1/systemd-networkd/dn42i1.network
rename to nodes/hel1/systemd-networkd/dn42i1.network
diff --git a/hel1/systemd-networkd/dn42i2.netdev b/nodes/hel1/systemd-networkd/dn42i2.netdev
similarity index 100%
rename from hel1/systemd-networkd/dn42i2.netdev
rename to nodes/hel1/systemd-networkd/dn42i2.netdev
diff --git a/hel1/systemd-networkd/dn42i2.network b/nodes/hel1/systemd-networkd/dn42i2.network
similarity index 100%
rename from hel1/systemd-networkd/dn42i2.network
rename to nodes/hel1/systemd-networkd/dn42i2.network
diff --git a/hel1/systemd-networkd/dn42i3.netdev b/nodes/hel1/systemd-networkd/dn42i3.netdev
similarity index 100%
rename from hel1/systemd-networkd/dn42i3.netdev
rename to nodes/hel1/systemd-networkd/dn42i3.netdev
diff --git a/hel1/systemd-networkd/dn42i3.network b/nodes/hel1/systemd-networkd/dn42i3.network
similarity index 100%
rename from hel1/systemd-networkd/dn42i3.network
rename to nodes/hel1/systemd-networkd/dn42i3.network
diff --git a/hel1/systemd-networkd/dn42p1.netdev b/nodes/hel1/systemd-networkd/dn42p1.netdev
similarity index 100%
rename from hel1/systemd-networkd/dn42p1.netdev
rename to nodes/hel1/systemd-networkd/dn42p1.netdev
diff --git a/hel1/systemd-networkd/dn42p1.network b/nodes/hel1/systemd-networkd/dn42p1.network
similarity index 100%
rename from hel1/systemd-networkd/dn42p1.network
rename to nodes/hel1/systemd-networkd/dn42p1.network
diff --git a/hel1/systemd-networkd/ens3.network b/nodes/hel1/systemd-networkd/ens3.network
similarity index 100%
rename from hel1/systemd-networkd/ens3.network
rename to nodes/hel1/systemd-networkd/ens3.network
diff --git a/hel1/systemd-networkd/lo.network b/nodes/hel1/systemd-networkd/lo.network
similarity index 100%
rename from hel1/systemd-networkd/lo.network
rename to nodes/hel1/systemd-networkd/lo.network
diff --git a/nbg1/bird2/bird.conf b/nodes/nbg1/bird2/bird.conf
similarity index 100%
rename from nbg1/bird2/bird.conf
rename to nodes/nbg1/bird2/bird.conf
diff --git a/nbg1/bird2/bird/conf/dn42.conf b/nodes/nbg1/bird2/bird/conf/dn42.conf
similarity index 100%
rename from nbg1/bird2/bird/conf/dn42.conf
rename to nodes/nbg1/bird2/bird/conf/dn42.conf
diff --git a/nbg1/bird2/bird/conf/ibgp.conf b/nodes/nbg1/bird2/bird/conf/ibgp.conf
similarity index 100%
rename from nbg1/bird2/bird/conf/ibgp.conf
rename to nodes/nbg1/bird2/bird/conf/ibgp.conf
diff --git a/nbg1/bird2/bird/disabled-peers/ospf.conf b/nodes/nbg1/bird2/bird/disabled-peers/ospf.conf
similarity index 100%
rename from nbg1/bird2/bird/disabled-peers/ospf.conf
rename to nodes/nbg1/bird2/bird/disabled-peers/ospf.conf
diff --git a/nbg1/bird2/bird/peers/AS4242422237_munsternet.conf b/nodes/nbg1/bird2/bird/peers/AS4242422237_munsternet.conf
similarity index 100%
rename from nbg1/bird2/bird/peers/AS4242422237_munsternet.conf
rename to nodes/nbg1/bird2/bird/peers/AS4242422237_munsternet.conf
diff --git a/nbg1/bird2/bird/peers/AS4242422341_zotan_fsn1.conf b/nodes/nbg1/bird2/bird/peers/AS4242422341_zotan_fsn1.conf
similarity index 100%
rename from nbg1/bird2/bird/peers/AS4242422341_zotan_fsn1.conf
rename to nodes/nbg1/bird2/bird/peers/AS4242422341_zotan_fsn1.conf
diff --git a/nbg1/bird2/bird/peers/AS4242422341_zotan_fsn2.conf b/nodes/nbg1/bird2/bird/peers/AS4242422341_zotan_fsn2.conf
similarity index 100%
rename from nbg1/bird2/bird/peers/AS4242422341_zotan_fsn2.conf
rename to nodes/nbg1/bird2/bird/peers/AS4242422341_zotan_fsn2.conf
diff --git a/nbg1/bird2/bird/peers/AS4242422341_zotan_hel1.conf b/nodes/nbg1/bird2/bird/peers/AS4242422341_zotan_hel1.conf
similarity index 100%
rename from nbg1/bird2/bird/peers/AS4242422341_zotan_hel1.conf
rename to nodes/nbg1/bird2/bird/peers/AS4242422341_zotan_hel1.conf
diff --git a/nbg1/bird2/bird/peers/AS4242423905_weiti.conf b/nodes/nbg1/bird2/bird/peers/AS4242423905_weiti.conf
similarity index 100%
rename from nbg1/bird2/bird/peers/AS4242423905_weiti.conf
rename to nodes/nbg1/bird2/bird/peers/AS4242423905_weiti.conf
diff --git a/nbg1/bird2/bird/peers/AS4242423914_kioubit.conf b/nodes/nbg1/bird2/bird/peers/AS4242423914_kioubit.conf
similarity index 100%
rename from nbg1/bird2/bird/peers/AS4242423914_kioubit.conf
rename to nodes/nbg1/bird2/bird/peers/AS4242423914_kioubit.conf
diff --git a/nbg1/bird2/bird/roa_dn42.conf b/nodes/nbg1/bird2/bird/roa_dn42.conf
similarity index 100%
rename from nbg1/bird2/bird/roa_dn42.conf
rename to nodes/nbg1/bird2/bird/roa_dn42.conf
diff --git a/nbg1/bird2/bird/roa_dn42_v6.conf b/nodes/nbg1/bird2/bird/roa_dn42_v6.conf
similarity index 100%
rename from nbg1/bird2/bird/roa_dn42_v6.conf
rename to nodes/nbg1/bird2/bird/roa_dn42_v6.conf
diff --git a/nbg1/bird2/bird/vars.conf b/nodes/nbg1/bird2/bird/vars.conf
similarity index 100%
rename from nbg1/bird2/bird/vars.conf
rename to nodes/nbg1/bird2/bird/vars.conf
diff --git a/nbg1/systemd-networkd/dn42i1.netdev b/nodes/nbg1/systemd-networkd/dn42i1.netdev
similarity index 100%
rename from nbg1/systemd-networkd/dn42i1.netdev
rename to nodes/nbg1/systemd-networkd/dn42i1.netdev
diff --git a/nbg1/systemd-networkd/dn42i1.network b/nodes/nbg1/systemd-networkd/dn42i1.network
similarity index 100%
rename from nbg1/systemd-networkd/dn42i1.network
rename to nodes/nbg1/systemd-networkd/dn42i1.network
diff --git a/nbg1/systemd-networkd/dn42i2.netdev b/nodes/nbg1/systemd-networkd/dn42i2.netdev
similarity index 100%
rename from nbg1/systemd-networkd/dn42i2.netdev
rename to nodes/nbg1/systemd-networkd/dn42i2.netdev
diff --git a/nbg1/systemd-networkd/dn42i2.network b/nodes/nbg1/systemd-networkd/dn42i2.network
similarity index 100%
rename from nbg1/systemd-networkd/dn42i2.network
rename to nodes/nbg1/systemd-networkd/dn42i2.network
diff --git a/nbg1/systemd-networkd/dn42i3.netdev b/nodes/nbg1/systemd-networkd/dn42i3.netdev
similarity index 100%
rename from nbg1/systemd-networkd/dn42i3.netdev
rename to nodes/nbg1/systemd-networkd/dn42i3.netdev
diff --git a/nbg1/systemd-networkd/dn42i3.network b/nodes/nbg1/systemd-networkd/dn42i3.network
similarity index 100%
rename from nbg1/systemd-networkd/dn42i3.network
rename to nodes/nbg1/systemd-networkd/dn42i3.network
diff --git a/nbg1/systemd-networkd/dn42p1.netdev b/nodes/nbg1/systemd-networkd/dn42p1.netdev
similarity index 100%
rename from nbg1/systemd-networkd/dn42p1.netdev
rename to nodes/nbg1/systemd-networkd/dn42p1.netdev
diff --git a/nbg1/systemd-networkd/dn42p1.network b/nodes/nbg1/systemd-networkd/dn42p1.network
similarity index 100%
rename from nbg1/systemd-networkd/dn42p1.network
rename to nodes/nbg1/systemd-networkd/dn42p1.network
diff --git a/nbg1/systemd-networkd/dn42p2.netdev b/nodes/nbg1/systemd-networkd/dn42p2.netdev
similarity index 100%
rename from nbg1/systemd-networkd/dn42p2.netdev
rename to nodes/nbg1/systemd-networkd/dn42p2.netdev
diff --git a/nbg1/systemd-networkd/dn42p2.network b/nodes/nbg1/systemd-networkd/dn42p2.network
similarity index 100%
rename from nbg1/systemd-networkd/dn42p2.network
rename to nodes/nbg1/systemd-networkd/dn42p2.network
diff --git a/nbg1/systemd-networkd/dn42p3.netdev b/nodes/nbg1/systemd-networkd/dn42p3.netdev
similarity index 100%
rename from nbg1/systemd-networkd/dn42p3.netdev
rename to nodes/nbg1/systemd-networkd/dn42p3.netdev
diff --git a/nbg1/systemd-networkd/dn42p3.network b/nodes/nbg1/systemd-networkd/dn42p3.network
similarity index 100%
rename from nbg1/systemd-networkd/dn42p3.network
rename to nodes/nbg1/systemd-networkd/dn42p3.network
diff --git a/nbg1/systemd-networkd/ens3.network b/nodes/nbg1/systemd-networkd/ens3.network
similarity index 100%
rename from nbg1/systemd-networkd/ens3.network
rename to nodes/nbg1/systemd-networkd/ens3.network
diff --git a/nbg1/systemd-networkd/lo.network b/nodes/nbg1/systemd-networkd/lo.network
similarity index 100%
rename from nbg1/systemd-networkd/lo.network
rename to nodes/nbg1/systemd-networkd/lo.network
diff --git a/addinternal.sh b/scripts/addinternal.sh
similarity index 100%
rename from addinternal.sh
rename to scripts/addinternal.sh
diff --git a/addpeer.sh b/scripts/addpeer.sh
similarity index 100%
rename from addpeer.sh
rename to scripts/addpeer.sh
diff --git a/bird-reconf.sh b/scripts/bird-reconf.sh
similarity index 100%
rename from bird-reconf.sh
rename to scripts/bird-reconf.sh
diff --git a/scripts/netcheck.sh b/scripts/netcheck.sh
new file mode 100644
index 0000000..4fedab1
--- /dev/null
+++ b/scripts/netcheck.sh
@@ -0,0 +1,144 @@
+#!/bin/bash
+export RED='\033[0;31m'
+export GREEN='\033[0;32m'
+export GREY='\033[0;37m'
+export NC='\033[0m' # No Color
+
+fullpingtest(){
+	host=" ($(dig +short -x $1 | ggrep -Po '.*(?=\.)'))"
+	if [[ $? -ne 0 ]]; then
+		host=""
+	fi
+
+	timeout 1 ping -c 1 $1 &>/dev/null
+
+	if [[ $? -eq 0 ]]; then
+		echo -e "[${GREEN}PASS${NC}]${GREY} Host ${NC}$1$host${GREY} is ${GREEN}up${NC}"
+	else
+		echo -e "[${RED}FAIL${NC}]${GREY} Host ${NC}$1$host)${GREY} is ${RED}down${NC}"
+	fi
+
+	host=" ($(dig +short -x $2 | ggrep -Po '.*(?=\.)'))"
+	if [[ $? -ne 0 ]]; then
+		host=""
+	fi
+
+	timeout 1 ping6 -o $2 &>/dev/null
+
+	if [[ $? -eq 0 ]]; then
+		echo -e "[${GREEN}PASS${NC}]${GREY} Host ${NC}$2$host${GREY} is ${GREEN}up${NC}"
+	else
+		echo -e "[${RED}FAIL${NC}]${GREY} Host ${NC}$2$host${GREY} is ${RED}down${NC}"
+	fi
+
+	host=" (v4)"
+	timeout 1 ping -c 1 $3 &>/dev/null
+
+	if [[ $? -eq 0 ]]; then
+		echo -e "[${GREEN}PASS${NC}]${GREY} Host ${NC}$3$host${GREY} is ${GREEN}up${NC}"
+	else
+		echo -e "[${RED}FAIL${NC}]${GREY} Host ${NC}$3$host${GREY} is ${RED}down${NC}"
+	fi
+
+	host=" (v6)"
+	timeout 1 ping6 -o $3 &>/dev/null
+
+	if [[ $? -eq 0 ]]; then
+		echo -e "[${GREEN}PASS${NC}]${GREY} Host ${NC}$3$host${GREY} is ${GREEN}up${NC}"
+	else
+		echo -e "[${RED}FAIL${NC}]${GREY} Host ${NC}$3$host${GREY} is ${RED}down${NC}"
+	fi
+}
+
+pingtest(){
+	host=" ($(dig +short -x $1 | ggrep -Po '.*(?=\.)'))"
+	if [[ $? -ne 0 ]]; then
+		host=""
+	fi
+
+	timeout 1 ping -c 1 $1 &>/dev/null
+
+	if [[ $? -eq 0 ]]; then
+		echo -e "[${GREEN}PASS${NC}]${GREY} Host ${NC}$1$host${GREY} is ${GREEN}up${NC}"
+	else
+		echo -e "[${RED}FAIL${NC}]${GREY} Host ${NC}$1$host)${GREY} is ${RED}down${NC}"
+	fi
+
+	host=" ($(dig +short -x $2 | ggrep -Po '.*(?=\.)'))"
+	if [[ $? -ne 0 ]]; then
+		host=""
+	fi
+
+	timeout 1 ping6 -o $2 &>/dev/null
+
+	if [[ $? -eq 0 ]]; then
+		echo -e "[${GREEN}PASS${NC}]${GREY} Host ${NC}$2$host${GREY} is ${GREEN}up${NC}"
+	else
+		echo -e "[${RED}FAIL${NC}]${GREY} Host ${NC}$2$host${GREY} is ${RED}down${NC}"
+	fi
+}
+
+dnspingtest(){
+	host=" (v4)"
+	timeout 1 ping -c 1 $1 &>/dev/null
+
+	if [[ $? -eq 0 ]]; then
+		echo -e "[${GREEN}PASS${NC}]${GREY} Host ${NC}$1$host${GREY} is ${GREEN}up${NC}"
+	else
+		echo -e "[${RED}FAIL${NC}]${GREY} Host ${NC}$1$host${GREY} is ${RED}down${NC}"
+	fi
+
+	host=" (v6)"
+	timeout 1 ping6 -o $1 &>/dev/null
+
+	if [[ $? -eq 0 ]]; then
+		echo -e "[${GREEN}PASS${NC}]${GREY} Host ${NC}$1$host${GREY} is ${GREEN}up${NC}"
+	else
+		echo -e "[${RED}FAIL${NC}]${GREY} Host ${NC}$1$host${GREY} is ${RED}down${NC}"
+	fi
+}
+
+webtest4(){
+	ip4=$(curl -s -4 --connect-timeout 1 $1)
+	if [[ $? -eq 0 ]]; then
+		echo -e "[${GREEN}INFO${NC}]${GREY} Your Source IPv4 to ${NC}$1${GREY} is ${GREEN}$ip4${NC}"	
+	else
+		echo -e "[${GREEN}INFO${NC}]${GREY} Your Source IPv4 to ${NC}$1${GREY} is ${RED}unknown${NC}"	
+	fi
+}
+
+webtest6(){
+	ip6=$(curl -s -6 --connect-timeout 1 $1)
+	if [[ $? -eq 0 ]]; then
+		echo -e "[${GREEN}INFO${NC}]${GREY} Your Source IPv6 to ${NC}$1${GREY} is ${GREEN}$ip6${NC}"	
+	else
+		echo -e "[${GREEN}INFO${NC}]${GREY} Your Source IPv6 to ${NC}$1${GREY} is ${RED}unknown${NC}"	
+	fi
+}
+
+webtest(){
+	webtest4 $1
+	webtest6 $1
+}
+
+echo -e "[${GREEN}INFO${NC}]${GREY} Scan started on $(date "+%Y-%m-%d %H:%M:%S")${NC}"
+
+#fullpingtest "78.46.129.93" "2a01:4f8:c0c:51e::1" "mail.zotan.network"
+#fullpingtest "172.20.129.5" "fd42:4242:2601:ac05::1" "pingable.burble.dn42"
+
+dnspingtest "mail.zotan.network"
+dnspingtest "prod.zotan.network"
+dnspingtest "fsn1.dn42.zotan.network"
+dnspingtest "nbg1.dn42.zotan.network"
+dnspingtest "hel1.dn42.zotan.network"
+dnspingtest "fsn2.dn42.zotan.network"
+dnspingtest "fsn1.zotan.dn42"
+dnspingtest "nbg1.zotan.dn42"
+dnspingtest "hel1.zotan.dn42"
+dnspingtest "fsn2.zotan.dn42"
+dnspingtest "burble.dn42"
+
+
+webtest "fsn1.dn42.zotan.network"
+webtest4 "ip4.dn42"
+webtest6 "ip6.dn42"
diff --git a/scripts/netcheck_dn42.sh b/scripts/netcheck_dn42.sh
new file mode 100644
index 0000000..ecf6bac
--- /dev/null
+++ b/scripts/netcheck_dn42.sh
@@ -0,0 +1,139 @@
+#!/bin/bash
+export RED='\033[0;31m'
+export GREEN='\033[0;32m'
+export GREY='\033[0;37m'
+export NC='\033[0m' # No Color
+
+fullpingtest(){
+	host=" ($(dig +short -x $1 | grep -Po '.*(?=\.)'))"
+	if [[ $? -ne 0 ]]; then
+		host=""
+	fi
+
+	timeout 1 ping -c 1 $1 &>/dev/null
+
+	if [[ $? -eq 0 ]]; then
+		echo -e "[${GREEN}PASS${NC}]${GREY} Host ${NC}$1$host${GREY} is ${GREEN}up${NC}"
+	else
+		echo -e "[${RED}FAIL${NC}]${GREY} Host ${NC}$1$host)${GREY} is ${RED}down${NC}"
+	fi
+
+	host=" ($(dig +short -x $2 | grep -Po '.*(?=\.)'))"
+	if [[ $? -ne 0 ]]; then
+		host=""
+	fi
+
+	timeout 1 ping -6 -c 1 $2 &>/dev/null
+
+	if [[ $? -eq 0 ]]; then
+		echo -e "[${GREEN}PASS${NC}]${GREY} Host ${NC}$2$host${GREY} is ${GREEN}up${NC}"
+	else
+		echo -e "[${RED}FAIL${NC}]${GREY} Host ${NC}$2$host${GREY} is ${RED}down${NC}"
+	fi
+
+	host=" (v4)"
+	timeout 1 ping -c 1 $3 &>/dev/null
+
+	if [[ $? -eq 0 ]]; then
+		echo -e "[${GREEN}PASS${NC}]${GREY} Host ${NC}$3$host${GREY} is ${GREEN}up${NC}"
+	else
+		echo -e "[${RED}FAIL${NC}]${GREY} Host ${NC}$3$host${GREY} is ${RED}down${NC}"
+	fi
+
+	host=" (v6)"
+	timeout 1 ping -6 -c 1 $3 &>/dev/null
+
+	if [[ $? -eq 0 ]]; then
+		echo -e "[${GREEN}PASS${NC}]${GREY} Host ${NC}$3$host${GREY} is ${GREEN}up${NC}"
+	else
+		echo -e "[${RED}FAIL${NC}]${GREY} Host ${NC}$3$host${GREY} is ${RED}down${NC}"
+	fi
+}
+
+pingtest(){
+	host=" ($(dig +short -x $1 | grep -Po '.*(?=\.)'))"
+	if [[ $? -ne 0 ]]; then
+		host=""
+	fi
+
+	timeout 1 ping -c 1 $1 &>/dev/null
+
+	if [[ $? -eq 0 ]]; then
+		echo -e "[${GREEN}PASS${NC}]${GREY} Host ${NC}$1$host${GREY} is ${GREEN}up${NC}"
+	else
+		echo -e "[${RED}FAIL${NC}]${GREY} Host ${NC}$1$host)${GREY} is ${RED}down${NC}"
+	fi
+
+	host=" ($(dig +short -x $2 | grep -Po '.*(?=\.)'))"
+	if [[ $? -ne 0 ]]; then
+		host=""
+	fi
+
+	timeout 1 ping -6 -c 1 $2 &>/dev/null
+
+	if [[ $? -eq 0 ]]; then
+		echo -e "[${GREEN}PASS${NC}]${GREY} Host ${NC}$2$host${GREY} is ${GREEN}up${NC}"
+	else
+		echo -e "[${RED}FAIL${NC}]${GREY} Host ${NC}$2$host${GREY} is ${RED}down${NC}"
+	fi
+}
+
+dnspingtest(){
+	host=" (v4)"
+	timeout 1 ping -c 1 $1 &>/dev/null
+
+	if [[ $? -eq 0 ]]; then
+		echo -e "[${GREEN}PASS${NC}]${GREY} Host ${NC}$1$host${GREY} is ${GREEN}up${NC}"
+	else
+		echo -e "[${RED}FAIL${NC}]${GREY} Host ${NC}$1$host${GREY} is ${RED}down${NC}"
+	fi
+
+	host=" (v6)"
+	timeout 1 ping -6 -c 1 $1 &>/dev/null
+
+	if [[ $? -eq 0 ]]; then
+		echo -e "[${GREEN}PASS${NC}]${GREY} Host ${NC}$1$host${GREY} is ${GREEN}up${NC}"
+	else
+		echo -e "[${RED}FAIL${NC}]${GREY} Host ${NC}$1$host${GREY} is ${RED}down${NC}"
+	fi
+}
+
+webtest(){
+	dnspingtest $1
+	
+	ip4=$(curl -s -4 --connect-timeout 1 $1)
+	if [[ $? -eq 0 ]]; then
+		echo -e "[${GREEN}INFO${NC}]${GREY} Your Source IPv4 to ${NC}$1${GREY} is ${GREEN}$ip4${NC}"	
+	else
+		echo -e "[${GREEN}INFO${NC}]${GREY} Your Source IPv4 to ${NC}$1${GREY} is ${RED}unknown${NC}"	
+	fi
+	
+	ip6=$(curl -s -6 --connect-timeout 1 $1)
+	if [[ $? -eq 0 ]]; then
+		echo -e "[${GREEN}INFO${NC}]${GREY} Your Source IPv6 to ${NC}$1${GREY} is ${GREEN}$ip6${NC}"	
+	else
+		echo -e "[${GREEN}INFO${NC}]${GREY} Your Source IPv6 to ${NC}$1${GREY} is ${RED}unknown${NC}"	
+	fi
+}
+
+echo -e "[${GREEN}INFO${NC}]${GREY} Scan started on $(date "+%Y-%m-%d %H:%M:%S")${NC}"
+
+pingtest "172.20.170.192" "fe80::42:1000%dn42p1"
+pingtest "172.23.235.1" "fe80::1299:e%dn42p2"
+pingtest "172.20.177.34" "fe80::3%dn42i1"
+pingtest "172.20.177.35" "fe80::4%dn42i2"
+
+echo
+
+fullpingtest "78.46.129.93" "2a01:4f8:c0c:51e::1" "mail.zotan.network"
+fullpingtest "172.20.129.5" "fd42:4242:2601:ac05::1" "pingable.burble.dn42"
+
+echo
+
+webtest nbg1.dn42.zotan.network
+webtest hel1.dn42.zotan.network
+
+echo
+
+webtest nbg1.zotan.dn42
+webtest hel1.zotan.dn42
diff --git a/scripts/update.sh b/scripts/update.sh
new file mode 100644
index 0000000..fbec015
--- /dev/null
+++ b/scripts/update.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+scp fsn1.dn42.zotan.network:/etc/systemd/network/* fsn1/systemd-networkd
+scp nbg1.dn42.zotan.network:/etc/systemd/network/* nbg1/systemd-networkd
+scp hel1.dn42.zotan.network:/etc/systemd/network/* hel1/systemd-networkd
+scp fsn2.dn42.zotan.network:/etc/systemd/network/dn42* fsn2/systemd-networkd
+
+scp fsn1.dn42.zotan.network:/etc/bird.conf fsn1/bird2
+scp nbg1.dn42.zotan.network:/etc/bird.conf nbg1/bird2
+scp hel1.dn42.zotan.network:/etc/bird.conf hel1/bird2
+scp fsn2.dn42.zotan.network:/etc/bird.conf fsn2/bird2
+
+
+scp -r fsn1.dn42.zotan.network:/etc/bird fsn1/bird2
+scp -r nbg1.dn42.zotan.network:/etc/bird nbg1/bird2
+scp -r hel1.dn42.zotan.network:/etc/bird hel1/bird2
+scp -r fsn2.dn42.zotan.network:/etc/bird fsn2/bird2
+
+scp fsn1.dn42.zotan.network:/etc/iptables/ip*tables.rules fsn1/iptables
+
+scp root@fsn1.dn42.zotan.network:/etc/named.conf fsn1/named
+
+echo
+echo
+echo
+
+ggrep -r "PrivateKey " .
diff --git a/vars.sh.sample b/scripts/vars.sh.sample
similarity index 100%
rename from vars.sh.sample
rename to scripts/vars.sh.sample
diff --git a/update.sh b/update.sh
deleted file mode 100644
index fbec015..0000000
--- a/update.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-scp fsn1.dn42.zotan.network:/etc/systemd/network/* fsn1/systemd-networkd
-scp nbg1.dn42.zotan.network:/etc/systemd/network/* nbg1/systemd-networkd
-scp hel1.dn42.zotan.network:/etc/systemd/network/* hel1/systemd-networkd
-scp fsn2.dn42.zotan.network:/etc/systemd/network/dn42* fsn2/systemd-networkd
-
-scp fsn1.dn42.zotan.network:/etc/bird.conf fsn1/bird2
-scp nbg1.dn42.zotan.network:/etc/bird.conf nbg1/bird2
-scp hel1.dn42.zotan.network:/etc/bird.conf hel1/bird2
-scp fsn2.dn42.zotan.network:/etc/bird.conf fsn2/bird2
-
-
-scp -r fsn1.dn42.zotan.network:/etc/bird fsn1/bird2
-scp -r nbg1.dn42.zotan.network:/etc/bird nbg1/bird2
-scp -r hel1.dn42.zotan.network:/etc/bird hel1/bird2
-scp -r fsn2.dn42.zotan.network:/etc/bird fsn2/bird2
-
-scp fsn1.dn42.zotan.network:/etc/iptables/ip*tables.rules fsn1/iptables
-
-scp root@fsn1.dn42.zotan.network:/etc/named.conf fsn1/named
-
-echo
-echo
-echo
-
-ggrep -r "PrivateKey " .
diff --git a/update.sh b/update.sh
new file mode 120000
index 0000000..75f574d
--- /dev/null
+++ b/update.sh
@@ -0,0 +1 @@
+update.sh
\ No newline at end of file