Subpackge restructuring, extra logic added to network setters

... logic