Moved nw-public{1,2} services, interfaces and dpns to base.yml.