Changed folder name

src/zutil/network/FTPClient.java

@@ -1,4 +1,4 @@
-package zutil.network;
+package zutil.net;
 
 import java.io.BufferedReader;
 import java.io.File;

src/zutil/network/POP3Client.java

@@ -1,4 +1,4 @@
-package zutil.network;
+package zutil.net;
 
 import java.io.BufferedReader;
 import java.io.IOException;

src/zutil/network/SMTPClient.java

@@ -1,4 +1,4 @@
-package zutil.network;
+package zutil.net;
 
 import java.io.BufferedReader;
 import java.io.IOException;

src/zutil/network/ServerFind.java

@@ -1,4 +1,4 @@
-package zutil.network;
+package zutil.net;
 
 import java.io.IOException;
 import java.net.DatagramPacket;

src/zutil/network/ServerFindClient.java

@@ -1,4 +1,4 @@
-package zutil.network;
+package zutil.net;
 
 import java.io.IOException;
 import java.net.DatagramPacket;

src/zutil/network/UpdateClient.java

@@ -1,4 +1,4 @@
-package zutil.network;
+package zutil.net;
 
 import java.io.File;
 import java.io.FileOutputStream;

src/zutil/network/UpdateServer.java

@@ -1,4 +1,4 @@
-package zutil.network;
+package zutil.net;
 
 import java.io.File;
 import java.io.FileInputStream;

src/zutil/network/Zupdater.java

@@ -4,7 +4,7 @@
  * Created on den 27 juli 2008, 23:32
  */
 
-package zutil.network;
+package zutil.net;
 
 import java.awt.Dimension;
 

src/zutil/network/http/HTTPHeaderParser.java

@@ -1,4 +1,4 @@
-package zutil.network.http;
+package zutil.net.http;
 
 import java.io.BufferedReader;
 import java.io.IOException;

src/zutil/network/http/HttpPage.java

@@ -1,4 +1,4 @@
-package zutil.network.http;
+package zutil.net.http;
 
 import java.util.Map;
 

src/zutil/network/http/HttpPrintStream.java

@@ -1,4 +1,4 @@
-package zutil.network.http;
+package zutil.net.http;
 
 import java.io.OutputStream;
 import java.io.PrintStream;

src/zutil/network/http/HttpServer.java

@@ -1,4 +1,4 @@
-package zutil.network.http;
+package zutil.net.http;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -14,8 +14,8 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import zutil.log.LogUtil;
-import zutil.network.threaded.ThreadedTCPNetworkServer;
-import zutil.network.threaded.ThreadedTCPNetworkServerThread;
+import zutil.net.threaded.ThreadedTCPNetworkServer;
+import zutil.net.threaded.ThreadedTCPNetworkServerThread;
 
 
 /**

src/zutil/network/http/multipart/MultipartField.java

@@ -1,4 +1,4 @@
-package zutil.network.http.multipart;
+package zutil.net.http.multipart;
 
 import java.io.BufferedReader;
 import java.io.File;

src/zutil/network/http/multipart/MultipartFile.java

@@ -1,4 +1,4 @@
-package zutil.network.http.multipart;
+package zutil.net.http.multipart;
 
 import java.io.BufferedReader;
 import java.io.File;

src/zutil/network/http/multipart/MultipartParser.java

@@ -1,4 +1,4 @@
-package zutil.network.http.multipart;
+package zutil.net.http.multipart;
 
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
@@ -13,7 +13,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 
 import zutil.ProgressListener;
-import zutil.network.http.HTTPHeaderParser;
+import zutil.net.http.HTTPHeaderParser;
 
 /**
  * Parses a multipart/form-data http request, 

src/zutil/network/http/soap/SOAPClientFactory.java

@@ -1,4 +1,4 @@
-package zutil.network.http.soap;
+package zutil.net.http.soap;
 
 import javax.wsdl.WSDLException;
 
@@ -8,9 +8,9 @@ import javassist.CtClass;
 import javassist.CtMethod;
 import javassist.CtNewMethod;
 import javassist.NotFoundException;
-import zutil.network.ws.WSInterface;
-import zutil.network.ws.WSMethodDef;
-import zutil.network.ws.WebServiceDef;
+import zutil.net.ws.WSInterface;
+import zutil.net.ws.WSMethodDef;
+import zutil.net.ws.WebServiceDef;
 
 /**
  * This is an factory that generates clients for web services

src/zutil/network/http/soap/SOAPException.java

@@ -1,4 +1,4 @@
-package zutil.network.http.soap;
+package zutil.net.http.soap;
 
 /**
  * This generates an client fault message 

src/zutil/network/http/soap/SOAPHttpPage.java

@@ -1,4 +1,4 @@
-package zutil.network.http.soap;
+package zutil.net.http.soap;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Array;
@@ -49,14 +49,14 @@ import org.xml.sax.SAXException;
 import zutil.converters.Converter;
 import zutil.io.StringOutputStream;
 import zutil.log.LogUtil;
-import zutil.network.http.HttpPage;
-import zutil.network.http.HttpPrintStream;
-import zutil.network.ws.WSInterface;
-import zutil.network.ws.WSObject;
-import zutil.network.ws.WSReturnValueList;
-import zutil.network.ws.WSInterface.WSDocumentation;
-import zutil.network.ws.WSInterface.WSParamDocumentation;
-import zutil.network.ws.WSObject.WSFieldName;
+import zutil.net.http.HttpPage;
+import zutil.net.http.HttpPrintStream;
+import zutil.net.ws.WSInterface;
+import zutil.net.ws.WSObject;
+import zutil.net.ws.WSReturnValueList;
+import zutil.net.ws.WSInterface.WSDocumentation;
+import zutil.net.ws.WSInterface.WSParamDocumentation;
+import zutil.net.ws.WSObject.WSFieldName;
 
 import com.ibm.wsdl.extensions.PopulatedExtensionRegistry;
 import com.ibm.wsdl.extensions.soap.SOAPConstants;

src/zutil/network/nio/NioClient.java

@@ -1,4 +1,4 @@
-package zutil.network.nio;
+package zutil.net.nio;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -7,9 +7,9 @@ import java.nio.channels.Selector;
 import java.nio.channels.SocketChannel;
 import java.nio.channels.spi.SelectorProvider;
 
-import zutil.network.nio.message.Message;
-import zutil.network.nio.message.type.ResponseRequestMessage;
-import zutil.network.nio.response.ResponseEvent;
+import zutil.net.nio.message.Message;
+import zutil.net.nio.message.type.ResponseRequestMessage;
+import zutil.net.nio.response.ResponseEvent;
 
 
 public class NioClient extends NioNetwork{

src/zutil/network/nio/NioNetwork.java

@@ -1,4 +1,4 @@
-package zutil.network.nio;
+package zutil.net.nio;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -21,13 +21,13 @@ import zutil.converters.Converter;
 import zutil.io.DynamicByteArrayStream;
 import zutil.io.MultiPrintStream;
 import zutil.log.LogUtil;
-import zutil.network.nio.message.type.ResponseRequestMessage;
-import zutil.network.nio.message.type.SystemMessage;
-import zutil.network.nio.response.ResponseEvent;
-import zutil.network.nio.server.ChangeRequest;
-import zutil.network.nio.server.ClientData;
-import zutil.network.nio.worker.SystemWorker;
-import zutil.network.nio.worker.Worker;
+import zutil.net.nio.message.type.ResponseRequestMessage;
+import zutil.net.nio.message.type.SystemMessage;
+import zutil.net.nio.response.ResponseEvent;
+import zutil.net.nio.server.ChangeRequest;
+import zutil.net.nio.server.ClientData;
+import zutil.net.nio.worker.SystemWorker;
+import zutil.net.nio.worker.Worker;
 
 
 public abstract class NioNetwork implements Runnable {

src/zutil/network/nio/NioServer.java

@@ -1,4 +1,4 @@
-package zutil.network.nio;
+package zutil.net.nio;
 
 import java.io.IOException;
 import java.net.InetAddress;

src/zutil/network/nio/message/ChatMessage.java

@@ -1,4 +1,4 @@
-package zutil.network.nio.message;
+package zutil.net.nio.message;
 
 public class ChatMessage extends Message{
 	private static final long serialVersionUID = 1L;

src/zutil/network/nio/message/GraphicsSyncMessage.java

@@ -1,4 +1,4 @@
-package zutil.network.nio.message;
+package zutil.net.nio.message;
 
 
 public class GraphicsSyncMessage extends SyncMessage{

src/zutil/network/nio/message/GridMessage.java

@@ -1,4 +1,4 @@
-package zutil.network.nio.message;
+package zutil.net.nio.message;
 
 public class GridMessage<T> extends Message{
 	private static final long serialVersionUID = 1L;

src/zutil/network/nio/message/KeepAliveMessage.java

@@ -1,6 +1,6 @@
-package zutil.network.nio.message;
+package zutil.net.nio.message;
 
-import zutil.network.nio.message.type.SystemMessage;
+import zutil.net.nio.message.type.SystemMessage;
 
 /**
  * Tells the destination that the 

src/zutil/network/nio/message/Message.java

@@ -1,4 +1,4 @@
-package zutil.network.nio.message;
+package zutil.net.nio.message;
 
 import java.io.Serializable;
 

src/zutil/network/nio/message/StringMessage.java

@@ -1,7 +1,7 @@
-package zutil.network.nio.message;
+package zutil.net.nio.message;
 
-import zutil.network.nio.message.type.EchoMessage;
-import zutil.network.nio.message.type.ResponseRequestMessage;
+import zutil.net.nio.message.type.EchoMessage;
+import zutil.net.nio.message.type.ResponseRequestMessage;
 
 
 

src/zutil/network/nio/message/SyncMessage.java

@@ -1,6 +1,6 @@
-package zutil.network.nio.message;
+package zutil.net.nio.message;
 
-import zutil.network.nio.message.type.SystemMessage;
+import zutil.net.nio.message.type.SystemMessage;
 
 public class SyncMessage extends Message implements SystemMessage{
 	private static final long serialVersionUID = 1L;

src/zutil/network/nio/message/type/EchoMessage.java

@@ -1,6 +1,6 @@
-package zutil.network.nio.message.type;
+package zutil.net.nio.message.type;
 
-import zutil.network.nio.message.Message;
+import zutil.net.nio.message.Message;
 
 /**
  * The reciver will echo out this message to the sender

src/zutil/network/nio/message/type/ResponseRequestMessage.java

@@ -1,4 +1,4 @@
-package zutil.network.nio.message.type;
+package zutil.net.nio.message.type;
 
 /**
  * This interface means that the sender 

src/zutil/network/nio/message/type/SystemMessage.java

@@ -1,4 +1,4 @@
-package zutil.network.nio.message.type;
+package zutil.net.nio.message.type;
 
 /**
  * A message that implements this will be 

src/zutil/network/nio/response/PrintRsp.java

@@ -1,4 +1,4 @@
-package zutil.network.nio.response;
+package zutil.net.nio.response;
 
 import zutil.io.MultiPrintStream;
 

src/zutil/network/nio/response/ResponseEvent.java

@@ -1,4 +1,4 @@
-package zutil.network.nio.response;
+package zutil.net.nio.response;
 
 
 public abstract class ResponseEvent {

src/zutil/network/nio/response/ResponseHandler.java

@@ -1,4 +1,4 @@
-package zutil.network.nio.response;
+package zutil.net.nio.response;
 
 import java.util.LinkedList;
 import java.util.List;

src/zutil/network/nio/server/ChangeRequest.java

@@ -1,4 +1,4 @@
-package zutil.network.nio.server;
+package zutil.net.nio.server;
 
 import java.nio.channels.SocketChannel;
 

src/zutil/network/nio/server/ClientData.java

@@ -1,4 +1,4 @@
-package zutil.network.nio.server;
+package zutil.net.nio.server;
 
 import java.net.InetSocketAddress;
 import java.nio.channels.SocketChannel;

src/zutil/network/nio/service/NetworkService.java

@@ -1,9 +1,9 @@
-package zutil.network.nio.service;
+package zutil.net.nio.service;
 
 import java.nio.channels.SocketChannel;
 
-import zutil.network.nio.NioNetwork;
-import zutil.network.nio.message.Message;
+import zutil.net.nio.NioNetwork;
+import zutil.net.nio.message.Message;
 
 public abstract class NetworkService {
 	protected static NetworkService instance;

src/zutil/network/nio/service/chat/ChatListener.java

@@ -1,4 +1,4 @@
-package zutil.network.nio.service.chat;
+package zutil.net.nio.service.chat;
 
 /**
  * Tis is a listener class for new chat messages

src/zutil/network/nio/service/chat/ChatService.java

@@ -1,4 +1,4 @@
-package zutil.network.nio.service.chat;
+package zutil.net.nio.service.chat;
 
 import java.nio.channels.SocketChannel;
 import java.util.HashMap;
@@ -6,10 +6,10 @@ import java.util.LinkedList;
 import java.util.logging.Logger;
 
 import zutil.log.LogUtil;
-import zutil.network.nio.NioNetwork;
-import zutil.network.nio.message.ChatMessage;
-import zutil.network.nio.message.Message;
-import zutil.network.nio.service.NetworkService;
+import zutil.net.nio.NioNetwork;
+import zutil.net.nio.message.ChatMessage;
+import zutil.net.nio.message.Message;
+import zutil.net.nio.service.NetworkService;
 
 /**
  * A simple chat service with users and rooms

src/zutil/network/nio/service/sync/ObjectSync.java

@@ -1,6 +1,6 @@
-package zutil.network.nio.service.sync;
+package zutil.net.nio.service.sync;
 
-import zutil.network.nio.message.SyncMessage;
+import zutil.net.nio.message.SyncMessage;
 
 public abstract class ObjectSync {
 	public String id;

src/zutil/network/nio/service/sync/SyncService.java

@@ -1,14 +1,14 @@
-package zutil.network.nio.service.sync;
+package zutil.net.nio.service.sync;
 
 import java.nio.channels.SocketChannel;
 import java.util.HashMap;
 import java.util.logging.Logger;
 
 import zutil.log.LogUtil;
-import zutil.network.nio.NioNetwork;
-import zutil.network.nio.message.Message;
-import zutil.network.nio.message.SyncMessage;
-import zutil.network.nio.service.NetworkService;
+import zutil.net.nio.NioNetwork;
+import zutil.net.nio.message.Message;
+import zutil.net.nio.message.SyncMessage;
+import zutil.net.nio.service.NetworkService;
 
 public class SyncService extends NetworkService{
 	private static Logger logger = LogUtil.getLogger();

src/zutil/network/nio/worker/EchoWorker.java

@@ -1,4 +1,4 @@
-package zutil.network.nio.worker;
+package zutil.net.nio.worker;
 
 import java.io.IOException;
 

src/zutil/network/nio/worker/SystemWorker.java

@@ -1,20 +1,20 @@
-package zutil.network.nio.worker;
+package zutil.net.nio.worker;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
 
 import zutil.log.LogUtil;
-import zutil.network.nio.NioNetwork;
-import zutil.network.nio.message.ChatMessage;
-import zutil.network.nio.message.Message;
-import zutil.network.nio.message.SyncMessage;
-import zutil.network.nio.message.type.EchoMessage;
-import zutil.network.nio.message.type.ResponseRequestMessage;
-import zutil.network.nio.response.ResponseEvent;
-import zutil.network.nio.service.NetworkService;
-import zutil.network.nio.service.chat.ChatService;
-import zutil.network.nio.service.sync.SyncService;
+import zutil.net.nio.NioNetwork;
+import zutil.net.nio.message.ChatMessage;
+import zutil.net.nio.message.Message;
+import zutil.net.nio.message.SyncMessage;
+import zutil.net.nio.message.type.EchoMessage;
+import zutil.net.nio.message.type.ResponseRequestMessage;
+import zutil.net.nio.response.ResponseEvent;
+import zutil.net.nio.service.NetworkService;
+import zutil.net.nio.service.chat.ChatService;
+import zutil.net.nio.service.sync.SyncService;
 
 
 public class SystemWorker extends ThreadedEventWorker {

src/zutil/network/nio/worker/ThreadedEventWorker.java

@@ -1,4 +1,4 @@
-package zutil.network.nio.worker;
+package zutil.net.nio.worker;
 
 public abstract class ThreadedEventWorker extends Worker{
 	private Thread thread;

src/zutil/network/nio/worker/Worker.java

@@ -1,10 +1,10 @@
-package zutil.network.nio.worker;
+package zutil.net.nio.worker;
 
 import java.nio.channels.SocketChannel;
 import java.util.LinkedList;
 import java.util.List;
 
-import zutil.network.nio.NioNetwork;
+import zutil.net.nio.NioNetwork;
 
 
 public abstract class Worker implements Runnable {

src/zutil/network/nio/worker/WorkerDataEvent.java

@@ -1,8 +1,8 @@
-package zutil.network.nio.worker;
+package zutil.net.nio.worker;
 
 import java.nio.channels.SocketChannel;
 
-import zutil.network.nio.NioNetwork;
+import zutil.net.nio.NioNetwork;
 
 
 public class WorkerDataEvent {

src/zutil/network/nio/worker/grid/GridClient.java

@@ -1,14 +1,14 @@
-package zutil.network.nio.worker.grid;
+package zutil.net.nio.worker.grid;
 
 import java.io.IOException;
 import java.util.LinkedList;
 import java.util.Queue;
 
 import zutil.io.MultiPrintStream;
-import zutil.network.nio.NioClient;
-import zutil.network.nio.message.GridMessage;
-import zutil.network.nio.worker.ThreadedEventWorker;
-import zutil.network.nio.worker.WorkerDataEvent;
+import zutil.net.nio.NioClient;
+import zutil.net.nio.message.GridMessage;
+import zutil.net.nio.worker.ThreadedEventWorker;
+import zutil.net.nio.worker.WorkerDataEvent;
 
 /**
  * This class is the client part of the grid.

src/zutil/network/nio/worker/grid/GridJob.java

@@ -1,4 +1,4 @@
-package zutil.network.nio.worker.grid;
+package zutil.net.nio.worker.grid;
 
 /**
  * A internal class for handling the jobs

src/zutil/network/nio/worker/grid/GridJobGenerator.java

@@ -1,4 +1,4 @@
-package zutil.network.nio.worker.grid;
+package zutil.net.nio.worker.grid;
 
 
 /**

src/zutil/network/nio/worker/grid/GridResultHandler.java

@@ -1,4 +1,4 @@
-package zutil.network.nio.worker.grid;
+package zutil.net.nio.worker.grid;
 
 /**
  * Handles the incoming results from the grid

src/zutil/network/nio/worker/grid/GridServerWorker.java

@@ -1,13 +1,13 @@
-package zutil.network.nio.worker.grid;
+package zutil.net.nio.worker.grid;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Queue;
 
-import zutil.network.nio.message.GridMessage;
-import zutil.network.nio.worker.ThreadedEventWorker;
-import zutil.network.nio.worker.WorkerDataEvent;
+import zutil.net.nio.message.GridMessage;
+import zutil.net.nio.worker.ThreadedEventWorker;
+import zutil.net.nio.worker.WorkerDataEvent;
 
 /**
  * Implements a simple network computing server

src/zutil/network/nio/worker/grid/GridThread.java

@@ -1,4 +1,4 @@
-package zutil.network.nio.worker.grid;
+package zutil.net.nio.worker.grid;
 
 /**
  * This interface is the thread that will do 

src/zutil/network/ssdp/SSDPClient.java

@@ -1,4 +1,4 @@
-package zutil.network.ssdp;
+package zutil.net.ssdp;
 
 import java.io.IOException;
 import java.net.DatagramPacket;
@@ -10,10 +10,10 @@ import java.util.logging.Logger;
 
 import zutil.io.StringOutputStream;
 import zutil.log.LogUtil;
-import zutil.network.http.HTTPHeaderParser;
-import zutil.network.http.HttpPrintStream;
-import zutil.network.threaded.ThreadedUDPNetwork;
-import zutil.network.threaded.ThreadedUDPNetworkThread;
+import zutil.net.http.HTTPHeaderParser;
+import zutil.net.http.HttpPrintStream;
+import zutil.net.threaded.ThreadedUDPNetwork;
+import zutil.net.threaded.ThreadedUDPNetworkThread;
 
 /**
  * An SSDP client class that will request

src/zutil/network/ssdp/SSDPServer.java

@@ -1,4 +1,4 @@
-package zutil.network.ssdp;
+package zutil.net.ssdp;
 
 import java.io.IOException;
 import java.net.DatagramPacket;
@@ -12,10 +12,10 @@ import java.util.logging.Logger;
 import zutil.io.MultiPrintStream;
 import zutil.io.StringOutputStream;
 import zutil.log.LogUtil;
-import zutil.network.http.HTTPHeaderParser;
-import zutil.network.http.HttpPrintStream;
-import zutil.network.threaded.ThreadedUDPNetworkThread;
-import zutil.network.threaded.ThreadedUDPNetwork;
+import zutil.net.http.HTTPHeaderParser;
+import zutil.net.http.HttpPrintStream;
+import zutil.net.threaded.ThreadedUDPNetworkThread;
+import zutil.net.threaded.ThreadedUDPNetwork;
 
 /**
  * A Server class that announces an service by the SSDP 

src/zutil/network/ssdp/SSDPServiceInfo.java

@@ -1,4 +1,4 @@
-package zutil.network.ssdp;
+package zutil.net.ssdp;
 
 /**
  * This class contains information about a service from

src/zutil/network/ssdp/StandardSSDPInfo.java

@@ -1,4 +1,4 @@
-package zutil.network.ssdp;
+package zutil.net.ssdp;
 
 import java.util.Date;
 import java.util.UUID;

src/zutil/network/threaded/ThreadedTCPNetworkServer.java

@@ -1,4 +1,4 @@
-package zutil.network.threaded;
+package zutil.net.threaded;
 
 import java.io.File;
 import java.io.IOException;

src/zutil/network/threaded/ThreadedTCPNetworkServerThread.java

@@ -1,4 +1,4 @@
-package zutil.network.threaded;
+package zutil.net.threaded;
 
 /**
  * The class that will handle the TCP connection will incclude 

src/zutil/network/threaded/ThreadedUDPNetwork.java

@@ -1,4 +1,4 @@
-package zutil.network.threaded;
+package zutil.net.threaded;
 
 import java.io.IOException;
 import java.net.DatagramPacket;

src/zutil/network/threaded/ThreadedUDPNetworkThread.java

@@ -1,4 +1,4 @@
-package zutil.network.threaded;
+package zutil.net.threaded;
 
 import java.net.DatagramPacket;
 

src/zutil/network/torrent/Torrent.java

@@ -1,4 +1,4 @@
-package zutil.network.torrent;
+package zutil.net.torrent;
 
 import java.io.File;
 import java.io.IOException;

src/zutil/network/torrent/TorrentParser.java

@@ -1,4 +1,4 @@
-package zutil.network.torrent;
+package zutil.net.torrent;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;

src/zutil/network/upnp/UPnPMediaServer.java

@@ -1,9 +1,9 @@
-package zutil.network.upnp;
+package zutil.net.upnp;
 
 import java.util.Map;
 import java.util.UUID;
 
-import zutil.network.http.HttpPrintStream;
+import zutil.net.http.HttpPrintStream;
 
 /**
  * This class is a UPnP AV Media Server that handles all the

src/zutil/network/upnp/UPnPRootDevice.java

@@ -1,7 +1,7 @@
-package zutil.network.upnp;
+package zutil.net.upnp;
 
-import zutil.network.http.HttpPage;
-import zutil.network.ssdp.SSDPServiceInfo;
+import zutil.net.http.HttpPage;
+import zutil.net.ssdp.SSDPServiceInfo;
 /**
  * This class is a UPnP Server class that will be extended 
  * by all root devices handles all the other UPnP services

src/zutil/network/upnp/UPnPService.java

@@ -1,4 +1,4 @@
-package zutil.network.upnp;
+package zutil.net.upnp;
 
 /**
  * Information about a UPNP Service

src/zutil/network/upnp/services/BrowseRetObj.java

@@ -1,6 +1,6 @@
-package zutil.network.upnp.services;
+package zutil.net.upnp.services;
 
-import zutil.network.ws.WSReturnValueList;
+import zutil.net.ws.WSReturnValueList;
 
 public class BrowseRetObj extends WSReturnValueList{
 		@WSValueName("Result")

src/zutil/network/upnp/services/UPnPContentDirectory.java

@@ -1,4 +1,4 @@
-package zutil.network.upnp.services;
+package zutil.net.upnp.services;
 
 import java.io.File;
 import java.util.LinkedList;
@@ -8,11 +8,11 @@ import java.util.Map;
 import org.dom4j.DocumentException;
 
 import zutil.io.file.FileUtil;
-import zutil.network.http.HttpPage;
-import zutil.network.http.HttpPrintStream;
-import zutil.network.upnp.UPnPService;
-import zutil.network.ws.WSInterface;
-import zutil.network.ws.WSReturnValueList;
+import zutil.net.http.HttpPage;
+import zutil.net.http.HttpPrintStream;
+import zutil.net.upnp.UPnPService;
+import zutil.net.ws.WSInterface;
+import zutil.net.ws.WSReturnValueList;
 
 /**
  * Information about a UPNP Service

src/zutil/network/ws/WSInterface.java

@@ -1,4 +1,4 @@
-package zutil.network.ws;
+package zutil.net.ws;
 
 import java.lang.annotation.*;
 /**

src/zutil/network/ws/WSMethodDef.java

@@ -1,4 +1,4 @@
-package zutil.network.ws;
+package zutil.net.ws;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
@@ -6,7 +6,7 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 
-import zutil.network.ws.WSInterface.WSDocumentation;
+import zutil.net.ws.WSInterface.WSDocumentation;
 
 // TODO: Header parameters
 public class WSMethodDef {

src/zutil/network/ws/WSObject.java

@@ -1,4 +1,4 @@
-package zutil.network.ws;
+package zutil.net.ws;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/zutil/network/ws/WSParameterDef.java

@@ -1,4 +1,5 @@
-package zutil.network.ws;
+package zutil.net.ws;
+
 public class WSParameterDef{
 	/** The class type of the parameter **/
 	protected Class<?> paramClass;

src/zutil/network/ws/WSReturnValueList.java

@@ -1,4 +1,4 @@
-package zutil.network.ws;
+package zutil.net.ws;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/zutil/network/ws/WebServiceDef.java

@@ -1,4 +1,4 @@
-package zutil.network.ws;
+package zutil.net.ws;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;