Rework directories for netconn - both are neutron

Partial_Bug: #1233748

Change-Id: I6fa1a8b194da4d90941051151a13f06786642758
author: diane fleming