Reorganise firewall rules