diff --git a/src/zutil/network/FTPClient.java b/src/zutil/net/FTPClient.java
similarity index 100%
rename from src/zutil/network/FTPClient.java
rename to src/zutil/net/FTPClient.java
diff --git a/src/zutil/network/POP3Client.java b/src/zutil/net/POP3Client.java
similarity index 100%
rename from src/zutil/network/POP3Client.java
rename to src/zutil/net/POP3Client.java
diff --git a/src/zutil/network/SMTPClient.java b/src/zutil/net/SMTPClient.java
similarity index 100%
rename from src/zutil/network/SMTPClient.java
rename to src/zutil/net/SMTPClient.java
diff --git a/src/zutil/network/ServerFind.java b/src/zutil/net/ServerFind.java
similarity index 100%
rename from src/zutil/network/ServerFind.java
rename to src/zutil/net/ServerFind.java
diff --git a/src/zutil/network/ServerFindClient.java b/src/zutil/net/ServerFindClient.java
similarity index 100%
rename from src/zutil/network/ServerFindClient.java
rename to src/zutil/net/ServerFindClient.java
diff --git a/src/zutil/network/UpdateClient.java b/src/zutil/net/UpdateClient.java
similarity index 100%
rename from src/zutil/network/UpdateClient.java
rename to src/zutil/net/UpdateClient.java
diff --git a/src/zutil/network/UpdateServer.java b/src/zutil/net/UpdateServer.java
similarity index 100%
rename from src/zutil/network/UpdateServer.java
rename to src/zutil/net/UpdateServer.java
diff --git a/src/zutil/network/Zupdater.java b/src/zutil/net/Zupdater.java
similarity index 100%
rename from src/zutil/network/Zupdater.java
rename to src/zutil/net/Zupdater.java
diff --git a/src/zutil/network/http/HTTPHeaderParser.java b/src/zutil/net/http/HTTPHeaderParser.java
similarity index 100%
rename from src/zutil/network/http/HTTPHeaderParser.java
rename to src/zutil/net/http/HTTPHeaderParser.java
diff --git a/src/zutil/network/http/HttpPage.java b/src/zutil/net/http/HttpPage.java
similarity index 100%
rename from src/zutil/network/http/HttpPage.java
rename to src/zutil/net/http/HttpPage.java
diff --git a/src/zutil/network/http/HttpPrintStream.java b/src/zutil/net/http/HttpPrintStream.java
similarity index 100%
rename from src/zutil/network/http/HttpPrintStream.java
rename to src/zutil/net/http/HttpPrintStream.java
diff --git a/src/zutil/network/http/HttpServer.java b/src/zutil/net/http/HttpServer.java
similarity index 100%
rename from src/zutil/network/http/HttpServer.java
rename to src/zutil/net/http/HttpServer.java
diff --git a/src/zutil/network/http/multipart/MultipartField.java b/src/zutil/net/http/multipart/MultipartField.java
similarity index 100%
rename from src/zutil/network/http/multipart/MultipartField.java
rename to src/zutil/net/http/multipart/MultipartField.java
diff --git a/src/zutil/network/http/multipart/MultipartFile.java b/src/zutil/net/http/multipart/MultipartFile.java
similarity index 100%
rename from src/zutil/network/http/multipart/MultipartFile.java
rename to src/zutil/net/http/multipart/MultipartFile.java
diff --git a/src/zutil/network/http/multipart/MultipartParser.java b/src/zutil/net/http/multipart/MultipartParser.java
similarity index 100%
rename from src/zutil/network/http/multipart/MultipartParser.java
rename to src/zutil/net/http/multipart/MultipartParser.java
diff --git a/src/zutil/network/http/soap/SOAPClientFactory.java b/src/zutil/net/http/soap/SOAPClientFactory.java
similarity index 100%
rename from src/zutil/network/http/soap/SOAPClientFactory.java
rename to src/zutil/net/http/soap/SOAPClientFactory.java
diff --git a/src/zutil/network/http/soap/SOAPException.java b/src/zutil/net/http/soap/SOAPException.java
similarity index 100%
rename from src/zutil/network/http/soap/SOAPException.java
rename to src/zutil/net/http/soap/SOAPException.java
diff --git a/src/zutil/network/http/soap/SOAPHttpPage.java b/src/zutil/net/http/soap/SOAPHttpPage.java
similarity index 100%
rename from src/zutil/network/http/soap/SOAPHttpPage.java
rename to src/zutil/net/http/soap/SOAPHttpPage.java
diff --git a/src/zutil/network/nio/NioClient.java b/src/zutil/net/nio/NioClient.java
similarity index 100%
rename from src/zutil/network/nio/NioClient.java
rename to src/zutil/net/nio/NioClient.java
diff --git a/src/zutil/network/nio/NioNetwork.java b/src/zutil/net/nio/NioNetwork.java
similarity index 100%
rename from src/zutil/network/nio/NioNetwork.java
rename to src/zutil/net/nio/NioNetwork.java
diff --git a/src/zutil/network/nio/NioServer.java b/src/zutil/net/nio/NioServer.java
similarity index 100%
rename from src/zutil/network/nio/NioServer.java
rename to src/zutil/net/nio/NioServer.java
diff --git a/src/zutil/network/nio/message/ChatMessage.java b/src/zutil/net/nio/message/ChatMessage.java
similarity index 100%
rename from src/zutil/network/nio/message/ChatMessage.java
rename to src/zutil/net/nio/message/ChatMessage.java
diff --git a/src/zutil/network/nio/message/GraphicsSyncMessage.java b/src/zutil/net/nio/message/GraphicsSyncMessage.java
similarity index 100%
rename from src/zutil/network/nio/message/GraphicsSyncMessage.java
rename to src/zutil/net/nio/message/GraphicsSyncMessage.java
diff --git a/src/zutil/network/nio/message/GridMessage.java b/src/zutil/net/nio/message/GridMessage.java
similarity index 100%
rename from src/zutil/network/nio/message/GridMessage.java
rename to src/zutil/net/nio/message/GridMessage.java
diff --git a/src/zutil/network/nio/message/KeepAliveMessage.java b/src/zutil/net/nio/message/KeepAliveMessage.java
similarity index 100%
rename from src/zutil/network/nio/message/KeepAliveMessage.java
rename to src/zutil/net/nio/message/KeepAliveMessage.java
diff --git a/src/zutil/network/nio/message/Message.java b/src/zutil/net/nio/message/Message.java
similarity index 100%
rename from src/zutil/network/nio/message/Message.java
rename to src/zutil/net/nio/message/Message.java
diff --git a/src/zutil/network/nio/message/StringMessage.java b/src/zutil/net/nio/message/StringMessage.java
similarity index 100%
rename from src/zutil/network/nio/message/StringMessage.java
rename to src/zutil/net/nio/message/StringMessage.java
diff --git a/src/zutil/network/nio/message/SyncMessage.java b/src/zutil/net/nio/message/SyncMessage.java
similarity index 100%
rename from src/zutil/network/nio/message/SyncMessage.java
rename to src/zutil/net/nio/message/SyncMessage.java
diff --git a/src/zutil/network/nio/message/type/EchoMessage.java b/src/zutil/net/nio/message/type/EchoMessage.java
similarity index 100%
rename from src/zutil/network/nio/message/type/EchoMessage.java
rename to src/zutil/net/nio/message/type/EchoMessage.java
diff --git a/src/zutil/network/nio/message/type/ResponseRequestMessage.java b/src/zutil/net/nio/message/type/ResponseRequestMessage.java
similarity index 100%
rename from src/zutil/network/nio/message/type/ResponseRequestMessage.java
rename to src/zutil/net/nio/message/type/ResponseRequestMessage.java
diff --git a/src/zutil/network/nio/message/type/SystemMessage.java b/src/zutil/net/nio/message/type/SystemMessage.java
similarity index 100%
rename from src/zutil/network/nio/message/type/SystemMessage.java
rename to src/zutil/net/nio/message/type/SystemMessage.java
diff --git a/src/zutil/network/nio/response/PrintRsp.java b/src/zutil/net/nio/response/PrintRsp.java
similarity index 100%
rename from src/zutil/network/nio/response/PrintRsp.java
rename to src/zutil/net/nio/response/PrintRsp.java
diff --git a/src/zutil/network/nio/response/ResponseEvent.java b/src/zutil/net/nio/response/ResponseEvent.java
similarity index 100%
rename from src/zutil/network/nio/response/ResponseEvent.java
rename to src/zutil/net/nio/response/ResponseEvent.java
diff --git a/src/zutil/network/nio/response/ResponseHandler.java b/src/zutil/net/nio/response/ResponseHandler.java
similarity index 100%
rename from src/zutil/network/nio/response/ResponseHandler.java
rename to src/zutil/net/nio/response/ResponseHandler.java
diff --git a/src/zutil/network/nio/server/ChangeRequest.java b/src/zutil/net/nio/server/ChangeRequest.java
similarity index 100%
rename from src/zutil/network/nio/server/ChangeRequest.java
rename to src/zutil/net/nio/server/ChangeRequest.java
diff --git a/src/zutil/network/nio/server/ClientData.java b/src/zutil/net/nio/server/ClientData.java
similarity index 100%
rename from src/zutil/network/nio/server/ClientData.java
rename to src/zutil/net/nio/server/ClientData.java
diff --git a/src/zutil/network/nio/service/NetworkService.java b/src/zutil/net/nio/service/NetworkService.java
similarity index 100%
rename from src/zutil/network/nio/service/NetworkService.java
rename to src/zutil/net/nio/service/NetworkService.java
diff --git a/src/zutil/network/nio/service/chat/ChatListener.java b/src/zutil/net/nio/service/chat/ChatListener.java
similarity index 100%
rename from src/zutil/network/nio/service/chat/ChatListener.java
rename to src/zutil/net/nio/service/chat/ChatListener.java
diff --git a/src/zutil/network/nio/service/chat/ChatService.java b/src/zutil/net/nio/service/chat/ChatService.java
similarity index 100%
rename from src/zutil/network/nio/service/chat/ChatService.java
rename to src/zutil/net/nio/service/chat/ChatService.java
diff --git a/src/zutil/network/nio/service/sync/ObjectSync.java b/src/zutil/net/nio/service/sync/ObjectSync.java
similarity index 100%
rename from src/zutil/network/nio/service/sync/ObjectSync.java
rename to src/zutil/net/nio/service/sync/ObjectSync.java
diff --git a/src/zutil/network/nio/service/sync/SyncService.java b/src/zutil/net/nio/service/sync/SyncService.java
similarity index 100%
rename from src/zutil/network/nio/service/sync/SyncService.java
rename to src/zutil/net/nio/service/sync/SyncService.java
diff --git a/src/zutil/network/nio/worker/EchoWorker.java b/src/zutil/net/nio/worker/EchoWorker.java
similarity index 100%
rename from src/zutil/network/nio/worker/EchoWorker.java
rename to src/zutil/net/nio/worker/EchoWorker.java
diff --git a/src/zutil/network/nio/worker/SystemWorker.java b/src/zutil/net/nio/worker/SystemWorker.java
similarity index 100%
rename from src/zutil/network/nio/worker/SystemWorker.java
rename to src/zutil/net/nio/worker/SystemWorker.java
diff --git a/src/zutil/network/nio/worker/ThreadedEventWorker.java b/src/zutil/net/nio/worker/ThreadedEventWorker.java
similarity index 100%
rename from src/zutil/network/nio/worker/ThreadedEventWorker.java
rename to src/zutil/net/nio/worker/ThreadedEventWorker.java
diff --git a/src/zutil/network/nio/worker/Worker.java b/src/zutil/net/nio/worker/Worker.java
similarity index 100%
rename from src/zutil/network/nio/worker/Worker.java
rename to src/zutil/net/nio/worker/Worker.java
diff --git a/src/zutil/network/nio/worker/WorkerDataEvent.java b/src/zutil/net/nio/worker/WorkerDataEvent.java
similarity index 100%
rename from src/zutil/network/nio/worker/WorkerDataEvent.java
rename to src/zutil/net/nio/worker/WorkerDataEvent.java
diff --git a/src/zutil/network/nio/worker/grid/GridClient.java b/src/zutil/net/nio/worker/grid/GridClient.java
similarity index 100%
rename from src/zutil/network/nio/worker/grid/GridClient.java
rename to src/zutil/net/nio/worker/grid/GridClient.java
diff --git a/src/zutil/network/nio/worker/grid/GridJob.java b/src/zutil/net/nio/worker/grid/GridJob.java
similarity index 100%
rename from src/zutil/network/nio/worker/grid/GridJob.java
rename to src/zutil/net/nio/worker/grid/GridJob.java
diff --git a/src/zutil/network/nio/worker/grid/GridJobGenerator.java b/src/zutil/net/nio/worker/grid/GridJobGenerator.java
similarity index 100%
rename from src/zutil/network/nio/worker/grid/GridJobGenerator.java
rename to src/zutil/net/nio/worker/grid/GridJobGenerator.java
diff --git a/src/zutil/network/nio/worker/grid/GridResultHandler.java b/src/zutil/net/nio/worker/grid/GridResultHandler.java
similarity index 100%
rename from src/zutil/network/nio/worker/grid/GridResultHandler.java
rename to src/zutil/net/nio/worker/grid/GridResultHandler.java
diff --git a/src/zutil/network/nio/worker/grid/GridServerWorker.java b/src/zutil/net/nio/worker/grid/GridServerWorker.java
similarity index 100%
rename from src/zutil/network/nio/worker/grid/GridServerWorker.java
rename to src/zutil/net/nio/worker/grid/GridServerWorker.java
diff --git a/src/zutil/network/nio/worker/grid/GridThread.java b/src/zutil/net/nio/worker/grid/GridThread.java
similarity index 100%
rename from src/zutil/network/nio/worker/grid/GridThread.java
rename to src/zutil/net/nio/worker/grid/GridThread.java
diff --git a/src/zutil/network/ssdp/SSDPClient.java b/src/zutil/net/ssdp/SSDPClient.java
similarity index 100%
rename from src/zutil/network/ssdp/SSDPClient.java
rename to src/zutil/net/ssdp/SSDPClient.java
diff --git a/src/zutil/network/ssdp/SSDPServer.java b/src/zutil/net/ssdp/SSDPServer.java
similarity index 100%
rename from src/zutil/network/ssdp/SSDPServer.java
rename to src/zutil/net/ssdp/SSDPServer.java
diff --git a/src/zutil/network/ssdp/SSDPServiceInfo.java b/src/zutil/net/ssdp/SSDPServiceInfo.java
similarity index 100%
rename from src/zutil/network/ssdp/SSDPServiceInfo.java
rename to src/zutil/net/ssdp/SSDPServiceInfo.java
diff --git a/src/zutil/network/ssdp/StandardSSDPInfo.java b/src/zutil/net/ssdp/StandardSSDPInfo.java
similarity index 100%
rename from src/zutil/network/ssdp/StandardSSDPInfo.java
rename to src/zutil/net/ssdp/StandardSSDPInfo.java
diff --git a/src/zutil/network/threaded/ThreadedTCPNetworkServer.java b/src/zutil/net/threaded/ThreadedTCPNetworkServer.java
similarity index 100%
rename from src/zutil/network/threaded/ThreadedTCPNetworkServer.java
rename to src/zutil/net/threaded/ThreadedTCPNetworkServer.java
diff --git a/src/zutil/network/threaded/ThreadedTCPNetworkServerThread.java b/src/zutil/net/threaded/ThreadedTCPNetworkServerThread.java
similarity index 100%
rename from src/zutil/network/threaded/ThreadedTCPNetworkServerThread.java
rename to src/zutil/net/threaded/ThreadedTCPNetworkServerThread.java
diff --git a/src/zutil/network/threaded/ThreadedUDPNetwork.java b/src/zutil/net/threaded/ThreadedUDPNetwork.java
similarity index 100%
rename from src/zutil/network/threaded/ThreadedUDPNetwork.java
rename to src/zutil/net/threaded/ThreadedUDPNetwork.java
diff --git a/src/zutil/network/threaded/ThreadedUDPNetworkThread.java b/src/zutil/net/threaded/ThreadedUDPNetworkThread.java
similarity index 100%
rename from src/zutil/network/threaded/ThreadedUDPNetworkThread.java
rename to src/zutil/net/threaded/ThreadedUDPNetworkThread.java
diff --git a/src/zutil/network/torrent/Torrent.java b/src/zutil/net/torrent/Torrent.java
similarity index 100%
rename from src/zutil/network/torrent/Torrent.java
rename to src/zutil/net/torrent/Torrent.java
diff --git a/src/zutil/network/torrent/TorrentParser.java b/src/zutil/net/torrent/TorrentParser.java
similarity index 100%
rename from src/zutil/network/torrent/TorrentParser.java
rename to src/zutil/net/torrent/TorrentParser.java
diff --git a/src/zutil/network/upnp/UPnPMediaServer.java b/src/zutil/net/upnp/UPnPMediaServer.java
similarity index 100%
rename from src/zutil/network/upnp/UPnPMediaServer.java
rename to src/zutil/net/upnp/UPnPMediaServer.java
diff --git a/src/zutil/network/upnp/UPnPRootDevice.java b/src/zutil/net/upnp/UPnPRootDevice.java
similarity index 100%
rename from src/zutil/network/upnp/UPnPRootDevice.java
rename to src/zutil/net/upnp/UPnPRootDevice.java
diff --git a/src/zutil/network/upnp/UPnPService.java b/src/zutil/net/upnp/UPnPService.java
similarity index 100%
rename from src/zutil/network/upnp/UPnPService.java
rename to src/zutil/net/upnp/UPnPService.java
diff --git a/src/zutil/network/upnp/services/BrowseRetObj.java b/src/zutil/net/upnp/services/BrowseRetObj.java
similarity index 100%
rename from src/zutil/network/upnp/services/BrowseRetObj.java
rename to src/zutil/net/upnp/services/BrowseRetObj.java
diff --git a/src/zutil/network/upnp/services/UPnPContentDirectory.java b/src/zutil/net/upnp/services/UPnPContentDirectory.java
similarity index 100%
rename from src/zutil/network/upnp/services/UPnPContentDirectory.java
rename to src/zutil/net/upnp/services/UPnPContentDirectory.java
diff --git a/src/zutil/network/ws/WSInterface.java b/src/zutil/net/ws/WSInterface.java
similarity index 100%
rename from src/zutil/network/ws/WSInterface.java
rename to src/zutil/net/ws/WSInterface.java
diff --git a/src/zutil/network/ws/WSMethodDef.java b/src/zutil/net/ws/WSMethodDef.java
similarity index 100%
rename from src/zutil/network/ws/WSMethodDef.java
rename to src/zutil/net/ws/WSMethodDef.java
diff --git a/src/zutil/network/ws/WSObject.java b/src/zutil/net/ws/WSObject.java
similarity index 100%
rename from src/zutil/network/ws/WSObject.java
rename to src/zutil/net/ws/WSObject.java
diff --git a/src/zutil/network/ws/WSParameterDef.java b/src/zutil/net/ws/WSParameterDef.java
similarity index 100%
rename from src/zutil/network/ws/WSParameterDef.java
rename to src/zutil/net/ws/WSParameterDef.java
diff --git a/src/zutil/network/ws/WSReturnValueList.java b/src/zutil/net/ws/WSReturnValueList.java
similarity index 100%
rename from src/zutil/network/ws/WSReturnValueList.java
rename to src/zutil/net/ws/WSReturnValueList.java
diff --git a/src/zutil/network/ws/WebServiceDef.java b/src/zutil/net/ws/WebServiceDef.java
similarity index 100%
rename from src/zutil/network/ws/WebServiceDef.java
rename to src/zutil/net/ws/WebServiceDef.java