Finalised initial restructure for underlying network packet handling