Moved Network class to the appropriate package