Complete Networkcore redesing

Open tasks: Cleanup