diff --git a/src/packages/fff/fff-firewall/files/usr/lib/firewall.d/05-setup-chains b/src/packages/fff/fff-node/files/usr/lib/firewall.d/05-setup-batman-chains
similarity index 100%
rename from src/packages/fff/fff-firewall/files/usr/lib/firewall.d/05-setup-chains
rename to src/packages/fff/fff-node/files/usr/lib/firewall.d/05-setup-batman-chains
diff --git a/src/packages/fff/fff-network/files/usr/lib/firewall.d/06-disable-forwarding b/src/packages/fff/fff-node/files/usr/lib/firewall.d/06-disable-forwarding
similarity index 100%
rename from src/packages/fff/fff-network/files/usr/lib/firewall.d/06-disable-forwarding
rename to src/packages/fff/fff-node/files/usr/lib/firewall.d/06-disable-forwarding
diff --git a/src/packages/fff/fff-firewall/files/usr/lib/firewall.d/30-client-dhcp b/src/packages/fff/fff-node/files/usr/lib/firewall.d/30-client-dhcp
similarity index 100%
rename from src/packages/fff/fff-firewall/files/usr/lib/firewall.d/30-client-dhcp
rename to src/packages/fff/fff-node/files/usr/lib/firewall.d/30-client-dhcp
diff --git a/src/packages/fff/fff-firewall/files/usr/lib/firewall.d/30-client-dhcpv6 b/src/packages/fff/fff-node/files/usr/lib/firewall.d/30-client-dhcpv6
similarity index 100%
rename from src/packages/fff/fff-firewall/files/usr/lib/firewall.d/30-client-dhcpv6
rename to src/packages/fff/fff-node/files/usr/lib/firewall.d/30-client-dhcpv6
diff --git a/src/packages/fff/fff-firewall/files/usr/lib/firewall.d/30-client-ra b/src/packages/fff/fff-node/files/usr/lib/firewall.d/30-client-ra
similarity index 100%
rename from src/packages/fff/fff-firewall/files/usr/lib/firewall.d/30-client-ra
rename to src/packages/fff/fff-node/files/usr/lib/firewall.d/30-client-ra
diff --git a/src/packages/fff/fff-firewall/files/usr/lib/firewall.d/31-node-dhcp b/src/packages/fff/fff-node/files/usr/lib/firewall.d/31-node-dhcp
similarity index 100%
rename from src/packages/fff/fff-firewall/files/usr/lib/firewall.d/31-node-dhcp
rename to src/packages/fff/fff-node/files/usr/lib/firewall.d/31-node-dhcp
diff --git a/src/packages/fff/fff-firewall/files/usr/lib/firewall.d/31-node-dhcpv6 b/src/packages/fff/fff-node/files/usr/lib/firewall.d/31-node-dhcpv6
similarity index 100%
rename from src/packages/fff/fff-firewall/files/usr/lib/firewall.d/31-node-dhcpv6
rename to src/packages/fff/fff-node/files/usr/lib/firewall.d/31-node-dhcpv6
diff --git a/src/packages/fff/fff-firewall/files/usr/lib/firewall.d/31-node-ra b/src/packages/fff/fff-node/files/usr/lib/firewall.d/31-node-ra
similarity index 100%
rename from src/packages/fff/fff-firewall/files/usr/lib/firewall.d/31-node-ra
rename to src/packages/fff/fff-node/files/usr/lib/firewall.d/31-node-ra
diff --git a/src/packages/fff/fff-firewall/files/usr/lib/firewall.d/35-mc b/src/packages/fff/fff-node/files/usr/lib/firewall.d/35-mc
similarity index 100%
rename from src/packages/fff/fff-firewall/files/usr/lib/firewall.d/35-mc
rename to src/packages/fff/fff-node/files/usr/lib/firewall.d/35-mc
diff --git a/src/packages/fff/fff-firewall/files/usr/lib/firewall.d/35-mc-arp b/src/packages/fff/fff-node/files/usr/lib/firewall.d/35-mc-arp
similarity index 100%
rename from src/packages/fff/fff-firewall/files/usr/lib/firewall.d/35-mc-arp
rename to src/packages/fff/fff-node/files/usr/lib/firewall.d/35-mc-arp
diff --git a/src/packages/fff/fff-firewall/files/usr/lib/firewall.d/35-mc-ping b/src/packages/fff/fff-node/files/usr/lib/firewall.d/35-mc-ping
similarity index 100%
rename from src/packages/fff/fff-firewall/files/usr/lib/firewall.d/35-mc-ping
rename to src/packages/fff/fff-node/files/usr/lib/firewall.d/35-mc-ping
diff --git a/src/packages/fff/fff-firewall/files/usr/lib/firewall.d/40-local-node b/src/packages/fff/fff-node/files/usr/lib/firewall.d/40-local-node
similarity index 100%
rename from src/packages/fff/fff-firewall/files/usr/lib/firewall.d/40-local-node
rename to src/packages/fff/fff-node/files/usr/lib/firewall.d/40-local-node