diff --git a/ext/winping/src/WindowsPinger.c b/ext/winping/src/WindowsPinger.c
index b43c097b..9631b23b 100755
--- a/ext/winping/src/WindowsPinger.c
+++ b/ext/winping/src/WindowsPinger.c
@@ -1,67 +1,67 @@
-/* 
- * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+/* 
+ * This file is a part of Angry IP Scanner source code,
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  *
- * Windows JNI pinger using Microsoft's ICMP.DLL
- * Author: Anton Keks 
+ * Windows JNI pinger using Microsoft's ICMP.DLL
+ * Author: Anton Keks 
  */
-
-#include <windows.h>
+
+#include <windows.h>
 
 #include "WindowsPinger.h"
-
-
-FARPROC IcmpCreateFile = NULL;
+
+
+FARPROC IcmpCreateFile = NULL;
 
 typedef BOOL (FAR WINAPI *TIcmpCloseHandle)(HANDLE IcmpHandle);
-TIcmpCloseHandle IcmpCloseHandle = NULL;
+TIcmpCloseHandle IcmpCloseHandle = NULL;
 
-typedef DWORD (FAR WINAPI *TIcmpSendEcho)(
+typedef DWORD (FAR WINAPI *TIcmpSendEcho)(
   HANDLE IcmpHandle, 	/* handle returned from IcmpCreateFile() */  
-  u_long DestAddress, /* destination IP address (in network order) */  
-  LPVOID RequestData, /* pointer to buffer to send */  
-  WORD RequestSize,	/* length of data in buffer */  
-  LPVOID RequestOptns,  /* see Note 2 */  
-  LPVOID ReplyBuffer, /* see Note 1 */  
-  DWORD ReplySize, 	/* length of reply (must allow at least 1 reply) */  
+  u_long DestAddress, /* destination IP address (in network order) */  
+  LPVOID RequestData, /* pointer to buffer to send */  
+  WORD RequestSize,	/* length of data in buffer */  
+  LPVOID RequestOptns,  /* see Note 2 */  
+  LPVOID ReplyBuffer, /* see Note 1 */  
+  DWORD ReplySize, 	/* length of reply (must allow at least 1 reply) */  
   DWORD Timeout 	/* time in milliseconds to wait for reply */
 );
-TIcmpSendEcho IcmpSendEcho = NULL;
+TIcmpSendEcho IcmpSendEcho = NULL;
 
-/* 
+/* 
  * Class:     net_azib_ipscan_core_net_WindowsPinger
  * Method:    nativeIcmpCreateFile
  */
-JNIEXPORT jint JNICALL
+JNIEXPORT jint JNICALL
 Java_net_azib_ipscan_core_net_WindowsPinger_nativeIcmpCreateFile
 (JNIEnv *env, jclass cls)
-{  
-  // Initialize dlls on first use
-  if (IcmpCreateFile == NULL) {
+{  
+  // Initialize dlls on first use
+  if (IcmpCreateFile == NULL) {
     HMODULE hICMP = LoadLibrary("icmp.dll");
-    if (!hICMP) {
+    if (!hICMP) {
       // newer versions of Windows should include this one instead
       hICMP = LoadLibrary("iphlpapi.dll");
     }
-
+
     if (!hICMP) {
       return -1;
     }
-
+
     IcmpCreateFile  = (FARPROC) GetProcAddress(hICMP, "IcmpCreateFile");
     IcmpCloseHandle = (TIcmpCloseHandle) GetProcAddress(hICMP, "IcmpCloseHandle");
     IcmpSendEcho    = (TIcmpSendEcho) GetProcAddress(hICMP, "IcmpSendEcho");
   }
 
   return IcmpCreateFile();
-}
+}
 
 /*
  * Class:     net_azib_ipscan_core_net_WindowsPinger
  * Method:    nativeIcmpCloseHandle
  */
-JNIEXPORT void JNICALL
+JNIEXPORT void JNICALL
 Java_net_azib_ipscan_core_net_WindowsPinger_nativeIcmpCloseHandle
 (JNIEnv *env, jclass cls, jint handle)
 {
@@ -72,10 +72,10 @@ Java_net_azib_ipscan_core_net_WindowsPinger_nativeIcmpCloseHandle
  * Class:     net_azib_ipscan_core_net_WindowsPinger
  * Method:    nativeIcmpSendEcho
  */
-
-JNIEXPORT jint JNICALL
+
+JNIEXPORT jint JNICALL
 Java_net_azib_ipscan_core_net_WindowsPinger_nativeIcmpSendEcho
-(JNIEnv *env, jclass cls, jint handle, jbyteArray address, jbyteArray pingData, jbyteArray replyData, jint timeout)
+(JNIEnv *env, jclass cls, jint handle, jbyteArray address, jbyteArray pingData, jbyteArray replyData, jint timeout)
 {
   DWORD replyCount;
   jbyte *addrBuf, *pingDataBuf, *replyDataBuf;
@@ -90,7 +90,7 @@ Java_net_azib_ipscan_core_net_WindowsPinger_nativeIcmpSendEcho
 
   pingDataLen = (*env)->GetArrayLength(env, pingData);
   replyDataLen = (*env)->GetArrayLength(env, replyData);
-
+
   ip = *((u_long*)addrBuf);
   replyCount = IcmpSendEcho((HANDLE)handle, ip, pingDataBuf, pingDataLen,
                             NULL, replyDataBuf, replyDataLen, timeout);
diff --git a/ext/winping/src/WindowsPinger.h b/ext/winping/src/WindowsPinger.h
index 6925c333..4533e0d9 100644
--- a/ext/winping/src/WindowsPinger.h
+++ b/ext/winping/src/WindowsPinger.h
@@ -1,6 +1,6 @@
 /*
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  *
  * Windows JNI pinger using Microsoft's ICMP.DLL
diff --git a/src/net/azib/ipscan/Main.java b/src/net/azib/ipscan/Main.java
index 19a2438e..b00ef0b5 100755
--- a/src/net/azib/ipscan/Main.java
+++ b/src/net/azib/ipscan/Main.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan;
diff --git a/src/net/azib/ipscan/config/CommandLineProcessor.java b/src/net/azib/ipscan/config/CommandLineProcessor.java
index 6152a613..991d5b9e 100644
--- a/src/net/azib/ipscan/config/CommandLineProcessor.java
+++ b/src/net/azib/ipscan/config/CommandLineProcessor.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/src/net/azib/ipscan/config/CommandProcessor.java b/src/net/azib/ipscan/config/CommandProcessor.java
index b7b3ff24..51173894 100644
--- a/src/net/azib/ipscan/config/CommandProcessor.java
+++ b/src/net/azib/ipscan/config/CommandProcessor.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/src/net/azib/ipscan/config/CommentsConfig.java b/src/net/azib/ipscan/config/CommentsConfig.java
index fb7eec58..2622a3e2 100644
--- a/src/net/azib/ipscan/config/CommentsConfig.java
+++ b/src/net/azib/ipscan/config/CommentsConfig.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/src/net/azib/ipscan/config/ComponentRegistry.java b/src/net/azib/ipscan/config/ComponentRegistry.java
index dba4b595..081ef3f3 100755
--- a/src/net/azib/ipscan/config/ComponentRegistry.java
+++ b/src/net/azib/ipscan/config/ComponentRegistry.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.config;
diff --git a/src/net/azib/ipscan/config/ConfigDetector.java b/src/net/azib/ipscan/config/ConfigDetector.java
index d67c6981..eb0f8375 100644
--- a/src/net/azib/ipscan/config/ConfigDetector.java
+++ b/src/net/azib/ipscan/config/ConfigDetector.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.config;
diff --git a/src/net/azib/ipscan/config/FavoritesConfig.java b/src/net/azib/ipscan/config/FavoritesConfig.java
index 858e256b..c928b5d8 100755
--- a/src/net/azib/ipscan/config/FavoritesConfig.java
+++ b/src/net/azib/ipscan/config/FavoritesConfig.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.config;
diff --git a/src/net/azib/ipscan/config/GUIConfig.java b/src/net/azib/ipscan/config/GUIConfig.java
index 4e6c1e7b..c7daa2ee 100755
--- a/src/net/azib/ipscan/config/GUIConfig.java
+++ b/src/net/azib/ipscan/config/GUIConfig.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.config;
diff --git a/src/net/azib/ipscan/config/Labels.java b/src/net/azib/ipscan/config/Labels.java
index 9c03b027..453814f6 100755
--- a/src/net/azib/ipscan/config/Labels.java
+++ b/src/net/azib/ipscan/config/Labels.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.config;
diff --git a/src/net/azib/ipscan/config/LoggerFactory.java b/src/net/azib/ipscan/config/LoggerFactory.java
index 48410062..049b93d0 100755
--- a/src/net/azib/ipscan/config/LoggerFactory.java
+++ b/src/net/azib/ipscan/config/LoggerFactory.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.config;
diff --git a/src/net/azib/ipscan/config/NamedListConfig.java b/src/net/azib/ipscan/config/NamedListConfig.java
index a53b00dc..4860c313 100755
--- a/src/net/azib/ipscan/config/NamedListConfig.java
+++ b/src/net/azib/ipscan/config/NamedListConfig.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.config;
diff --git a/src/net/azib/ipscan/config/OpenersConfig.java b/src/net/azib/ipscan/config/OpenersConfig.java
index 313fd93f..be4fe5cf 100755
--- a/src/net/azib/ipscan/config/OpenersConfig.java
+++ b/src/net/azib/ipscan/config/OpenersConfig.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.config;
@@ -32,7 +32,7 @@ public class OpenersConfig extends NamedListConfig {
 			add(labels.get("opener.traceroute"), new Opener((Platform.WINDOWS ? "tracert" : Platform.LINUX ? "tracepath" : "traceroute") + " ${fetcher.ip}", true, null));
 			if (!Platform.WINDOWS) add(labels.get("opener.ssh"), new Opener("ssh ${fetcher.ip}", true, null));
 			if (!Platform.WINDOWS) add(labels.get("opener.whois"), new Opener("whois ${fetcher.ip}", true, null));
-			add(labels.get("opener.geolocate"), new Opener("http://www.azib.net/iplocate.php?ip=${fetcher.ip}", false, null));
+			add(labels.get("opener.geolocate"), new Opener("http://www.angryip.org/iplocate.php?ip=${fetcher.ip}", false, null));
 			add(labels.get("opener.email"), new Opener("mailto:somebody@example.com?subject=${fetcher.ip} (${fetcher.hostname})", true, null));
 		}
 	}
diff --git a/src/net/azib/ipscan/config/Platform.java b/src/net/azib/ipscan/config/Platform.java
index 7bc564f5..34b0a995 100755
--- a/src/net/azib/ipscan/config/Platform.java
+++ b/src/net/azib/ipscan/config/Platform.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.config;
diff --git a/src/net/azib/ipscan/config/ScannerConfig.java b/src/net/azib/ipscan/config/ScannerConfig.java
index abce6fc9..0eccbc92 100755
--- a/src/net/azib/ipscan/config/ScannerConfig.java
+++ b/src/net/azib/ipscan/config/ScannerConfig.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.config;
diff --git a/src/net/azib/ipscan/core/LibraryLoader.java b/src/net/azib/ipscan/core/LibraryLoader.java
index ae9e72e9..3cd2b2ba 100644
--- a/src/net/azib/ipscan/core/LibraryLoader.java
+++ b/src/net/azib/ipscan/core/LibraryLoader.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/src/net/azib/ipscan/core/PortIterator.java b/src/net/azib/ipscan/core/PortIterator.java
index 9b07c49d..3a9066b6 100755
--- a/src/net/azib/ipscan/core/PortIterator.java
+++ b/src/net/azib/ipscan/core/PortIterator.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core;
diff --git a/src/net/azib/ipscan/core/Scanner.java b/src/net/azib/ipscan/core/Scanner.java
index 1f0e3814..ea9d5cb7 100755
--- a/src/net/azib/ipscan/core/Scanner.java
+++ b/src/net/azib/ipscan/core/Scanner.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core;
diff --git a/src/net/azib/ipscan/core/ScannerDispatcherThread.java b/src/net/azib/ipscan/core/ScannerDispatcherThread.java
index 0c930066..3a9102be 100755
--- a/src/net/azib/ipscan/core/ScannerDispatcherThread.java
+++ b/src/net/azib/ipscan/core/ScannerDispatcherThread.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core;
diff --git a/src/net/azib/ipscan/core/ScannerDispatcherThreadFactory.java b/src/net/azib/ipscan/core/ScannerDispatcherThreadFactory.java
index c44f2b88..63019dc1 100755
--- a/src/net/azib/ipscan/core/ScannerDispatcherThreadFactory.java
+++ b/src/net/azib/ipscan/core/ScannerDispatcherThreadFactory.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core;
diff --git a/src/net/azib/ipscan/core/ScanningProgressCallback.java b/src/net/azib/ipscan/core/ScanningProgressCallback.java
index 7b835fec..feca06bf 100755
--- a/src/net/azib/ipscan/core/ScanningProgressCallback.java
+++ b/src/net/azib/ipscan/core/ScanningProgressCallback.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core;
diff --git a/src/net/azib/ipscan/core/ScanningResult.java b/src/net/azib/ipscan/core/ScanningResult.java
index 9341c447..6ab78ba6 100755
--- a/src/net/azib/ipscan/core/ScanningResult.java
+++ b/src/net/azib/ipscan/core/ScanningResult.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core;
diff --git a/src/net/azib/ipscan/core/ScanningResultCallback.java b/src/net/azib/ipscan/core/ScanningResultCallback.java
index d189a57e..17899dcc 100755
--- a/src/net/azib/ipscan/core/ScanningResultCallback.java
+++ b/src/net/azib/ipscan/core/ScanningResultCallback.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core;
diff --git a/src/net/azib/ipscan/core/ScanningResultComparator.java b/src/net/azib/ipscan/core/ScanningResultComparator.java
index 26757bbc..ac048f79 100644
--- a/src/net/azib/ipscan/core/ScanningResultComparator.java
+++ b/src/net/azib/ipscan/core/ScanningResultComparator.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core;
diff --git a/src/net/azib/ipscan/core/ScanningResultList.java b/src/net/azib/ipscan/core/ScanningResultList.java
index ecc92c53..f04bab23 100755
--- a/src/net/azib/ipscan/core/ScanningResultList.java
+++ b/src/net/azib/ipscan/core/ScanningResultList.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core;
diff --git a/src/net/azib/ipscan/core/ScanningSubject.java b/src/net/azib/ipscan/core/ScanningSubject.java
index a6b2c2ef..3d2bbed4 100755
--- a/src/net/azib/ipscan/core/ScanningSubject.java
+++ b/src/net/azib/ipscan/core/ScanningSubject.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core;
diff --git a/src/net/azib/ipscan/core/UserErrorException.java b/src/net/azib/ipscan/core/UserErrorException.java
index 77e4c00d..5c751afa 100755
--- a/src/net/azib/ipscan/core/UserErrorException.java
+++ b/src/net/azib/ipscan/core/UserErrorException.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core;
diff --git a/src/net/azib/ipscan/core/net/CombinedUnprivilegedPinger.java b/src/net/azib/ipscan/core/net/CombinedUnprivilegedPinger.java
index 9fb9a595..f1a824c0 100644
--- a/src/net/azib/ipscan/core/net/CombinedUnprivilegedPinger.java
+++ b/src/net/azib/ipscan/core/net/CombinedUnprivilegedPinger.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/src/net/azib/ipscan/core/net/ICMPPinger.java b/src/net/azib/ipscan/core/net/ICMPPinger.java
index c071ca8d..a35473a6 100644
--- a/src/net/azib/ipscan/core/net/ICMPPinger.java
+++ b/src/net/azib/ipscan/core/net/ICMPPinger.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core.net;
diff --git a/src/net/azib/ipscan/core/net/ICMPSharedPinger.java b/src/net/azib/ipscan/core/net/ICMPSharedPinger.java
index da6e7796..ac2b6b85 100755
--- a/src/net/azib/ipscan/core/net/ICMPSharedPinger.java
+++ b/src/net/azib/ipscan/core/net/ICMPSharedPinger.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core.net;
diff --git a/src/net/azib/ipscan/core/net/PingResult.java b/src/net/azib/ipscan/core/net/PingResult.java
index 39168fef..01685072 100755
--- a/src/net/azib/ipscan/core/net/PingResult.java
+++ b/src/net/azib/ipscan/core/net/PingResult.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core.net;
diff --git a/src/net/azib/ipscan/core/net/Pinger.java b/src/net/azib/ipscan/core/net/Pinger.java
index fece80ac..70b3967a 100755
--- a/src/net/azib/ipscan/core/net/Pinger.java
+++ b/src/net/azib/ipscan/core/net/Pinger.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core.net;
diff --git a/src/net/azib/ipscan/core/net/PingerRegistry.java b/src/net/azib/ipscan/core/net/PingerRegistry.java
index eae36c52..126ecb9a 100755
--- a/src/net/azib/ipscan/core/net/PingerRegistry.java
+++ b/src/net/azib/ipscan/core/net/PingerRegistry.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core.net;
diff --git a/src/net/azib/ipscan/core/net/PingerRegistryImpl.java b/src/net/azib/ipscan/core/net/PingerRegistryImpl.java
index c3ec0d92..5946ec65 100755
--- a/src/net/azib/ipscan/core/net/PingerRegistryImpl.java
+++ b/src/net/azib/ipscan/core/net/PingerRegistryImpl.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core.net;
diff --git a/src/net/azib/ipscan/core/net/TCPPinger.java b/src/net/azib/ipscan/core/net/TCPPinger.java
index e666cbd3..43c5d605 100755
--- a/src/net/azib/ipscan/core/net/TCPPinger.java
+++ b/src/net/azib/ipscan/core/net/TCPPinger.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core.net;
diff --git a/src/net/azib/ipscan/core/net/UDPPinger.java b/src/net/azib/ipscan/core/net/UDPPinger.java
index 63433826..7c0d628e 100755
--- a/src/net/azib/ipscan/core/net/UDPPinger.java
+++ b/src/net/azib/ipscan/core/net/UDPPinger.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core.net;
diff --git a/src/net/azib/ipscan/core/net/WindowsPinger.java b/src/net/azib/ipscan/core/net/WindowsPinger.java
index ba52da7c..8b520999 100644
--- a/src/net/azib/ipscan/core/net/WindowsPinger.java
+++ b/src/net/azib/ipscan/core/net/WindowsPinger.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core.net;
diff --git a/src/net/azib/ipscan/core/plugins/Pluggable.java b/src/net/azib/ipscan/core/plugins/Pluggable.java
index 1f020914..4dfd4056 100644
--- a/src/net/azib/ipscan/core/plugins/Pluggable.java
+++ b/src/net/azib/ipscan/core/plugins/Pluggable.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/src/net/azib/ipscan/core/state/ScanningState.java b/src/net/azib/ipscan/core/state/ScanningState.java
index f7549d11..625bddf0 100644
--- a/src/net/azib/ipscan/core/state/ScanningState.java
+++ b/src/net/azib/ipscan/core/state/ScanningState.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/src/net/azib/ipscan/core/state/StateMachine.java b/src/net/azib/ipscan/core/state/StateMachine.java
index 33fd8948..58898a73 100644
--- a/src/net/azib/ipscan/core/state/StateMachine.java
+++ b/src/net/azib/ipscan/core/state/StateMachine.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core.state;
diff --git a/src/net/azib/ipscan/core/state/StateTransitionListener.java b/src/net/azib/ipscan/core/state/StateTransitionListener.java
index e4ce67ad..15c68286 100644
--- a/src/net/azib/ipscan/core/state/StateTransitionListener.java
+++ b/src/net/azib/ipscan/core/state/StateTransitionListener.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/src/net/azib/ipscan/core/values/Empty.java b/src/net/azib/ipscan/core/values/Empty.java
index 30da22ce..fcaa03cc 100644
--- a/src/net/azib/ipscan/core/values/Empty.java
+++ b/src/net/azib/ipscan/core/values/Empty.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/src/net/azib/ipscan/core/values/InetAddressHolder.java b/src/net/azib/ipscan/core/values/InetAddressHolder.java
index 90620436..1124c1f4 100644
--- a/src/net/azib/ipscan/core/values/InetAddressHolder.java
+++ b/src/net/azib/ipscan/core/values/InetAddressHolder.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/src/net/azib/ipscan/core/values/IntegerWithUnit.java b/src/net/azib/ipscan/core/values/IntegerWithUnit.java
index 0d9408df..8c91b290 100755
--- a/src/net/azib/ipscan/core/values/IntegerWithUnit.java
+++ b/src/net/azib/ipscan/core/values/IntegerWithUnit.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core.values;
diff --git a/src/net/azib/ipscan/core/values/NumericRangeList.java b/src/net/azib/ipscan/core/values/NumericRangeList.java
index b6406667..75558b71 100755
--- a/src/net/azib/ipscan/core/values/NumericRangeList.java
+++ b/src/net/azib/ipscan/core/values/NumericRangeList.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core.values;
diff --git a/src/net/azib/ipscan/exporters/AbstractExporter.java b/src/net/azib/ipscan/exporters/AbstractExporter.java
index 245e8839..fce04864 100644
--- a/src/net/azib/ipscan/exporters/AbstractExporter.java
+++ b/src/net/azib/ipscan/exporters/AbstractExporter.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/src/net/azib/ipscan/exporters/ExportProcessor.java b/src/net/azib/ipscan/exporters/ExportProcessor.java
index 03984348..8ee75785 100755
--- a/src/net/azib/ipscan/exporters/ExportProcessor.java
+++ b/src/net/azib/ipscan/exporters/ExportProcessor.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.exporters;
diff --git a/src/net/azib/ipscan/exporters/Exporter.java b/src/net/azib/ipscan/exporters/Exporter.java
index 97ff6c5e..c6f427d4 100755
--- a/src/net/azib/ipscan/exporters/Exporter.java
+++ b/src/net/azib/ipscan/exporters/Exporter.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.exporters;
diff --git a/src/net/azib/ipscan/exporters/ExporterException.java b/src/net/azib/ipscan/exporters/ExporterException.java
index 88dfda10..b182d2fd 100755
--- a/src/net/azib/ipscan/exporters/ExporterException.java
+++ b/src/net/azib/ipscan/exporters/ExporterException.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.exporters;
diff --git a/src/net/azib/ipscan/exporters/ExporterRegistry.java b/src/net/azib/ipscan/exporters/ExporterRegistry.java
index 0d372bbe..0f459b55 100755
--- a/src/net/azib/ipscan/exporters/ExporterRegistry.java
+++ b/src/net/azib/ipscan/exporters/ExporterRegistry.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.exporters;
diff --git a/src/net/azib/ipscan/exporters/XMLExporter.java b/src/net/azib/ipscan/exporters/XMLExporter.java
index b7362e49..3d6f3a4b 100755
--- a/src/net/azib/ipscan/exporters/XMLExporter.java
+++ b/src/net/azib/ipscan/exporters/XMLExporter.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.exporters;
diff --git a/src/net/azib/ipscan/feeders/AbstractFeeder.java b/src/net/azib/ipscan/feeders/AbstractFeeder.java
index 8a1d50d9..25a6e73a 100644
--- a/src/net/azib/ipscan/feeders/AbstractFeeder.java
+++ b/src/net/azib/ipscan/feeders/AbstractFeeder.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/src/net/azib/ipscan/feeders/Feeder.java b/src/net/azib/ipscan/feeders/Feeder.java
index 857fd11a..3f3fac55 100755
--- a/src/net/azib/ipscan/feeders/Feeder.java
+++ b/src/net/azib/ipscan/feeders/Feeder.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.feeders;
diff --git a/src/net/azib/ipscan/feeders/FeederCreator.java b/src/net/azib/ipscan/feeders/FeederCreator.java
index f9ae30fa..5af3505b 100644
--- a/src/net/azib/ipscan/feeders/FeederCreator.java
+++ b/src/net/azib/ipscan/feeders/FeederCreator.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/src/net/azib/ipscan/feeders/FeederException.java b/src/net/azib/ipscan/feeders/FeederException.java
index 16a815f2..61f457f3 100755
--- a/src/net/azib/ipscan/feeders/FeederException.java
+++ b/src/net/azib/ipscan/feeders/FeederException.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.feeders;
diff --git a/src/net/azib/ipscan/feeders/FeederRegistry.java b/src/net/azib/ipscan/feeders/FeederRegistry.java
index cc53165e..ef159484 100644
--- a/src/net/azib/ipscan/feeders/FeederRegistry.java
+++ b/src/net/azib/ipscan/feeders/FeederRegistry.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/src/net/azib/ipscan/feeders/FileFeeder.java b/src/net/azib/ipscan/feeders/FileFeeder.java
index aa115fc7..e149049a 100755
--- a/src/net/azib/ipscan/feeders/FileFeeder.java
+++ b/src/net/azib/ipscan/feeders/FileFeeder.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.feeders;
diff --git a/src/net/azib/ipscan/feeders/RandomFeeder.java b/src/net/azib/ipscan/feeders/RandomFeeder.java
index fd23cd39..42371e38 100755
--- a/src/net/azib/ipscan/feeders/RandomFeeder.java
+++ b/src/net/azib/ipscan/feeders/RandomFeeder.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.feeders;
diff --git a/src/net/azib/ipscan/feeders/RangeFeeder.java b/src/net/azib/ipscan/feeders/RangeFeeder.java
index 5acba780..4caf24ac 100755
--- a/src/net/azib/ipscan/feeders/RangeFeeder.java
+++ b/src/net/azib/ipscan/feeders/RangeFeeder.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.feeders;
diff --git a/src/net/azib/ipscan/feeders/RescanFeeder.java b/src/net/azib/ipscan/feeders/RescanFeeder.java
index 0aa32e1a..01281e98 100644
--- a/src/net/azib/ipscan/feeders/RescanFeeder.java
+++ b/src/net/azib/ipscan/feeders/RescanFeeder.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.feeders;
diff --git a/src/net/azib/ipscan/feeders/SmartTextFeeder.java b/src/net/azib/ipscan/feeders/SmartTextFeeder.java
index 849ab3ac..73259fd4 100755
--- a/src/net/azib/ipscan/feeders/SmartTextFeeder.java
+++ b/src/net/azib/ipscan/feeders/SmartTextFeeder.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.feeders;
diff --git a/src/net/azib/ipscan/fetchers/AbstractFetcher.java b/src/net/azib/ipscan/fetchers/AbstractFetcher.java
index 8e37c1bd..0de58209 100644
--- a/src/net/azib/ipscan/fetchers/AbstractFetcher.java
+++ b/src/net/azib/ipscan/fetchers/AbstractFetcher.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.fetchers;
diff --git a/src/net/azib/ipscan/fetchers/CommentFetcher.java b/src/net/azib/ipscan/fetchers/CommentFetcher.java
index 4ec34853..335bb1b1 100755
--- a/src/net/azib/ipscan/fetchers/CommentFetcher.java
+++ b/src/net/azib/ipscan/fetchers/CommentFetcher.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  */
 package net.azib.ipscan.fetchers;
 
diff --git a/src/net/azib/ipscan/fetchers/Fetcher.java b/src/net/azib/ipscan/fetchers/Fetcher.java
index a86f6061..faa2e737 100755
--- a/src/net/azib/ipscan/fetchers/Fetcher.java
+++ b/src/net/azib/ipscan/fetchers/Fetcher.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  */
 package net.azib.ipscan.fetchers;
 
diff --git a/src/net/azib/ipscan/fetchers/FetcherException.java b/src/net/azib/ipscan/fetchers/FetcherException.java
index f76955ea..e90fcf70 100755
--- a/src/net/azib/ipscan/fetchers/FetcherException.java
+++ b/src/net/azib/ipscan/fetchers/FetcherException.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.fetchers;
diff --git a/src/net/azib/ipscan/fetchers/FetcherPrefs.java b/src/net/azib/ipscan/fetchers/FetcherPrefs.java
index 0b2a80ae..26dfabd7 100644
--- a/src/net/azib/ipscan/fetchers/FetcherPrefs.java
+++ b/src/net/azib/ipscan/fetchers/FetcherPrefs.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/src/net/azib/ipscan/fetchers/FetcherRegistry.java b/src/net/azib/ipscan/fetchers/FetcherRegistry.java
index 1a6b7c28..15151979 100755
--- a/src/net/azib/ipscan/fetchers/FetcherRegistry.java
+++ b/src/net/azib/ipscan/fetchers/FetcherRegistry.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.fetchers;
diff --git a/src/net/azib/ipscan/fetchers/FetcherRegistryImpl.java b/src/net/azib/ipscan/fetchers/FetcherRegistryImpl.java
index c05cdc29..ff363e2e 100755
--- a/src/net/azib/ipscan/fetchers/FetcherRegistryImpl.java
+++ b/src/net/azib/ipscan/fetchers/FetcherRegistryImpl.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.fetchers;
diff --git a/src/net/azib/ipscan/fetchers/FetcherRegistryUpdateListener.java b/src/net/azib/ipscan/fetchers/FetcherRegistryUpdateListener.java
index b5b89090..c01ead93 100755
--- a/src/net/azib/ipscan/fetchers/FetcherRegistryUpdateListener.java
+++ b/src/net/azib/ipscan/fetchers/FetcherRegistryUpdateListener.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.fetchers;
diff --git a/src/net/azib/ipscan/fetchers/FilteredPortsFetcher.java b/src/net/azib/ipscan/fetchers/FilteredPortsFetcher.java
index dfee5d8f..111533d9 100755
--- a/src/net/azib/ipscan/fetchers/FilteredPortsFetcher.java
+++ b/src/net/azib/ipscan/fetchers/FilteredPortsFetcher.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.fetchers;
diff --git a/src/net/azib/ipscan/fetchers/HTTPSenderFetcher.java b/src/net/azib/ipscan/fetchers/HTTPSenderFetcher.java
index 500cf410..9ef50d59 100644
--- a/src/net/azib/ipscan/fetchers/HTTPSenderFetcher.java
+++ b/src/net/azib/ipscan/fetchers/HTTPSenderFetcher.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/src/net/azib/ipscan/fetchers/HostnameFetcher.java b/src/net/azib/ipscan/fetchers/HostnameFetcher.java
index bbd27fff..2cd5eb4f 100755
--- a/src/net/azib/ipscan/fetchers/HostnameFetcher.java
+++ b/src/net/azib/ipscan/fetchers/HostnameFetcher.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  */
 package net.azib.ipscan.fetchers;
 
diff --git a/src/net/azib/ipscan/fetchers/IPFetcher.java b/src/net/azib/ipscan/fetchers/IPFetcher.java
index 9d9b6ce3..5adac38b 100755
--- a/src/net/azib/ipscan/fetchers/IPFetcher.java
+++ b/src/net/azib/ipscan/fetchers/IPFetcher.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  */
 package net.azib.ipscan.fetchers;
 
diff --git a/src/net/azib/ipscan/fetchers/LastAliveTimeFetcher.java b/src/net/azib/ipscan/fetchers/LastAliveTimeFetcher.java
index 99153d2b..765931e2 100644
--- a/src/net/azib/ipscan/fetchers/LastAliveTimeFetcher.java
+++ b/src/net/azib/ipscan/fetchers/LastAliveTimeFetcher.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/src/net/azib/ipscan/fetchers/NetBIOSInfoFetcher.java b/src/net/azib/ipscan/fetchers/NetBIOSInfoFetcher.java
index 785675eb..736917e4 100644
--- a/src/net/azib/ipscan/fetchers/NetBIOSInfoFetcher.java
+++ b/src/net/azib/ipscan/fetchers/NetBIOSInfoFetcher.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/src/net/azib/ipscan/fetchers/PacketLossFetcher.java b/src/net/azib/ipscan/fetchers/PacketLossFetcher.java
index 468f3fe2..59425948 100755
--- a/src/net/azib/ipscan/fetchers/PacketLossFetcher.java
+++ b/src/net/azib/ipscan/fetchers/PacketLossFetcher.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.fetchers;
diff --git a/src/net/azib/ipscan/fetchers/PingFetcher.java b/src/net/azib/ipscan/fetchers/PingFetcher.java
index 38294f56..9326bd90 100755
--- a/src/net/azib/ipscan/fetchers/PingFetcher.java
+++ b/src/net/azib/ipscan/fetchers/PingFetcher.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  */
 package net.azib.ipscan.fetchers;
 
diff --git a/src/net/azib/ipscan/fetchers/PingTTLFetcher.java b/src/net/azib/ipscan/fetchers/PingTTLFetcher.java
index 1eb9d67f..0dd20ee1 100755
--- a/src/net/azib/ipscan/fetchers/PingTTLFetcher.java
+++ b/src/net/azib/ipscan/fetchers/PingTTLFetcher.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  */
 package net.azib.ipscan.fetchers;
 
diff --git a/src/net/azib/ipscan/fetchers/PortTextFetcher.java b/src/net/azib/ipscan/fetchers/PortTextFetcher.java
index 5155a012..ab3e07f0 100644
--- a/src/net/azib/ipscan/fetchers/PortTextFetcher.java
+++ b/src/net/azib/ipscan/fetchers/PortTextFetcher.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.fetchers;
diff --git a/src/net/azib/ipscan/fetchers/PortsFetcher.java b/src/net/azib/ipscan/fetchers/PortsFetcher.java
index ff8b12f1..51742672 100755
--- a/src/net/azib/ipscan/fetchers/PortsFetcher.java
+++ b/src/net/azib/ipscan/fetchers/PortsFetcher.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.fetchers;
diff --git a/src/net/azib/ipscan/fetchers/WebDetectFetcher.java b/src/net/azib/ipscan/fetchers/WebDetectFetcher.java
index a2633a29..b0d107fd 100644
--- a/src/net/azib/ipscan/fetchers/WebDetectFetcher.java
+++ b/src/net/azib/ipscan/fetchers/WebDetectFetcher.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/src/net/azib/ipscan/gui/AbstractModalDialog.java b/src/net/azib/ipscan/gui/AbstractModalDialog.java
index 2c88a441..4405a135 100755
--- a/src/net/azib/ipscan/gui/AbstractModalDialog.java
+++ b/src/net/azib/ipscan/gui/AbstractModalDialog.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui;
diff --git a/src/net/azib/ipscan/gui/ConfigDetectorDialog.java b/src/net/azib/ipscan/gui/ConfigDetectorDialog.java
index 063341a0..096bd6fb 100644
--- a/src/net/azib/ipscan/gui/ConfigDetectorDialog.java
+++ b/src/net/azib/ipscan/gui/ConfigDetectorDialog.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui;
diff --git a/src/net/azib/ipscan/gui/InfoDialog.java b/src/net/azib/ipscan/gui/InfoDialog.java
index cf74fa85..e2847fa2 100644
--- a/src/net/azib/ipscan/gui/InfoDialog.java
+++ b/src/net/azib/ipscan/gui/InfoDialog.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/src/net/azib/ipscan/gui/InputDialog.java b/src/net/azib/ipscan/gui/InputDialog.java
index 4decc91f..ae29300f 100755
--- a/src/net/azib/ipscan/gui/InputDialog.java
+++ b/src/net/azib/ipscan/gui/InputDialog.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui;
diff --git a/src/net/azib/ipscan/gui/MainMenu.java b/src/net/azib/ipscan/gui/MainMenu.java
index 860f2c2c..0b5df224 100755
--- a/src/net/azib/ipscan/gui/MainMenu.java
+++ b/src/net/azib/ipscan/gui/MainMenu.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui;
diff --git a/src/net/azib/ipscan/gui/MainWindow.java b/src/net/azib/ipscan/gui/MainWindow.java
index a7bd03c8..f8b6d3be 100755
--- a/src/net/azib/ipscan/gui/MainWindow.java
+++ b/src/net/azib/ipscan/gui/MainWindow.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui;
diff --git a/src/net/azib/ipscan/gui/PreferencesDialog.java b/src/net/azib/ipscan/gui/PreferencesDialog.java
index 7034b051..b1e3a3dc 100755
--- a/src/net/azib/ipscan/gui/PreferencesDialog.java
+++ b/src/net/azib/ipscan/gui/PreferencesDialog.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui;
diff --git a/src/net/azib/ipscan/gui/ResultTable.java b/src/net/azib/ipscan/gui/ResultTable.java
index eefb4983..20d932bb 100755
--- a/src/net/azib/ipscan/gui/ResultTable.java
+++ b/src/net/azib/ipscan/gui/ResultTable.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui;
diff --git a/src/net/azib/ipscan/gui/SWTAwareStateMachine.java b/src/net/azib/ipscan/gui/SWTAwareStateMachine.java
index 3a472128..bf56ee08 100644
--- a/src/net/azib/ipscan/gui/SWTAwareStateMachine.java
+++ b/src/net/azib/ipscan/gui/SWTAwareStateMachine.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/src/net/azib/ipscan/gui/SelectFetchersDialog.java b/src/net/azib/ipscan/gui/SelectFetchersDialog.java
index a1d20e37..935cc943 100755
--- a/src/net/azib/ipscan/gui/SelectFetchersDialog.java
+++ b/src/net/azib/ipscan/gui/SelectFetchersDialog.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui;
diff --git a/src/net/azib/ipscan/gui/StatisticsDialog.java b/src/net/azib/ipscan/gui/StatisticsDialog.java
index b7739d49..bcc4cde7 100644
--- a/src/net/azib/ipscan/gui/StatisticsDialog.java
+++ b/src/net/azib/ipscan/gui/StatisticsDialog.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/src/net/azib/ipscan/gui/StatusBar.java b/src/net/azib/ipscan/gui/StatusBar.java
index ccc3abf0..ef1a554a 100755
--- a/src/net/azib/ipscan/gui/StatusBar.java
+++ b/src/net/azib/ipscan/gui/StatusBar.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui;
diff --git a/src/net/azib/ipscan/gui/actions/BrowserLauncher.java b/src/net/azib/ipscan/gui/actions/BrowserLauncher.java
index 79cb239e..863e8cea 100755
--- a/src/net/azib/ipscan/gui/actions/BrowserLauncher.java
+++ b/src/net/azib/ipscan/gui/actions/BrowserLauncher.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui.actions;
diff --git a/src/net/azib/ipscan/gui/actions/ColumnsActions.java b/src/net/azib/ipscan/gui/actions/ColumnsActions.java
index 7e4b5f10..9215dd7f 100755
--- a/src/net/azib/ipscan/gui/actions/ColumnsActions.java
+++ b/src/net/azib/ipscan/gui/actions/ColumnsActions.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui.actions;
diff --git a/src/net/azib/ipscan/gui/actions/CommandsMenuActions.java b/src/net/azib/ipscan/gui/actions/CommandsMenuActions.java
index 97b40cda..dfaab786 100755
--- a/src/net/azib/ipscan/gui/actions/CommandsMenuActions.java
+++ b/src/net/azib/ipscan/gui/actions/CommandsMenuActions.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui.actions;
diff --git a/src/net/azib/ipscan/gui/actions/FavoritesMenuActions.java b/src/net/azib/ipscan/gui/actions/FavoritesMenuActions.java
index 5fec7583..e8fa9dfd 100755
--- a/src/net/azib/ipscan/gui/actions/FavoritesMenuActions.java
+++ b/src/net/azib/ipscan/gui/actions/FavoritesMenuActions.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui.actions;
diff --git a/src/net/azib/ipscan/gui/actions/GotoMenuActions.java b/src/net/azib/ipscan/gui/actions/GotoMenuActions.java
index 272cc8f4..9e024dc4 100755
--- a/src/net/azib/ipscan/gui/actions/GotoMenuActions.java
+++ b/src/net/azib/ipscan/gui/actions/GotoMenuActions.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui.actions;
diff --git a/src/net/azib/ipscan/gui/actions/HelpMenuActions.java b/src/net/azib/ipscan/gui/actions/HelpMenuActions.java
index 2376a164..8891de93 100755
--- a/src/net/azib/ipscan/gui/actions/HelpMenuActions.java
+++ b/src/net/azib/ipscan/gui/actions/HelpMenuActions.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui.actions;
diff --git a/src/net/azib/ipscan/gui/actions/OpenerLauncher.java b/src/net/azib/ipscan/gui/actions/OpenerLauncher.java
index 99b564fe..b337828c 100755
--- a/src/net/azib/ipscan/gui/actions/OpenerLauncher.java
+++ b/src/net/azib/ipscan/gui/actions/OpenerLauncher.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui.actions;
diff --git a/src/net/azib/ipscan/gui/actions/ScanMenuActions.java b/src/net/azib/ipscan/gui/actions/ScanMenuActions.java
index a0e79998..5cd4d8c5 100755
--- a/src/net/azib/ipscan/gui/actions/ScanMenuActions.java
+++ b/src/net/azib/ipscan/gui/actions/ScanMenuActions.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui.actions;
diff --git a/src/net/azib/ipscan/gui/actions/StartStopScanningAction.java b/src/net/azib/ipscan/gui/actions/StartStopScanningAction.java
index 9ee0d131..da77ca56 100755
--- a/src/net/azib/ipscan/gui/actions/StartStopScanningAction.java
+++ b/src/net/azib/ipscan/gui/actions/StartStopScanningAction.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui.actions;
diff --git a/src/net/azib/ipscan/gui/actions/TerminalLauncher.java b/src/net/azib/ipscan/gui/actions/TerminalLauncher.java
index 0ccc6b14..3da184ec 100755
--- a/src/net/azib/ipscan/gui/actions/TerminalLauncher.java
+++ b/src/net/azib/ipscan/gui/actions/TerminalLauncher.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui.actions;
diff --git a/src/net/azib/ipscan/gui/actions/ToolsActions.java b/src/net/azib/ipscan/gui/actions/ToolsActions.java
index 90a93e42..4aef941f 100755
--- a/src/net/azib/ipscan/gui/actions/ToolsActions.java
+++ b/src/net/azib/ipscan/gui/actions/ToolsActions.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui.actions;
diff --git a/src/net/azib/ipscan/gui/feeders/AbstractFeederGUI.java b/src/net/azib/ipscan/gui/feeders/AbstractFeederGUI.java
index 0e0acc70..366670a8 100755
--- a/src/net/azib/ipscan/gui/feeders/AbstractFeederGUI.java
+++ b/src/net/azib/ipscan/gui/feeders/AbstractFeederGUI.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui.feeders;
diff --git a/src/net/azib/ipscan/gui/feeders/FeederGUIRegistry.java b/src/net/azib/ipscan/gui/feeders/FeederGUIRegistry.java
index afc714a0..aa86d633 100755
--- a/src/net/azib/ipscan/gui/feeders/FeederGUIRegistry.java
+++ b/src/net/azib/ipscan/gui/feeders/FeederGUIRegistry.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui.feeders;
diff --git a/src/net/azib/ipscan/gui/feeders/FileFeederGUI.java b/src/net/azib/ipscan/gui/feeders/FileFeederGUI.java
index bdaa3ad7..33410615 100755
--- a/src/net/azib/ipscan/gui/feeders/FileFeederGUI.java
+++ b/src/net/azib/ipscan/gui/feeders/FileFeederGUI.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui.feeders;
diff --git a/src/net/azib/ipscan/gui/feeders/RandomFeederGUI.java b/src/net/azib/ipscan/gui/feeders/RandomFeederGUI.java
index 41ff6a87..f738e5cc 100755
--- a/src/net/azib/ipscan/gui/feeders/RandomFeederGUI.java
+++ b/src/net/azib/ipscan/gui/feeders/RandomFeederGUI.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui.feeders;
diff --git a/src/net/azib/ipscan/gui/feeders/RangeFeederGUI.java b/src/net/azib/ipscan/gui/feeders/RangeFeederGUI.java
index d2e0a5c6..4cacf95b 100755
--- a/src/net/azib/ipscan/gui/feeders/RangeFeederGUI.java
+++ b/src/net/azib/ipscan/gui/feeders/RangeFeederGUI.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui.feeders;
diff --git a/src/net/azib/ipscan/gui/fetchers/PingFetcherPrefs.java b/src/net/azib/ipscan/gui/fetchers/PingFetcherPrefs.java
index fd91a359..3a5bb7a7 100644
--- a/src/net/azib/ipscan/gui/fetchers/PingFetcherPrefs.java
+++ b/src/net/azib/ipscan/gui/fetchers/PingFetcherPrefs.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/src/net/azib/ipscan/gui/fetchers/PortTextFetcherPrefs.java b/src/net/azib/ipscan/gui/fetchers/PortTextFetcherPrefs.java
index 888107f3..5b8c5ea9 100644
--- a/src/net/azib/ipscan/gui/fetchers/PortTextFetcherPrefs.java
+++ b/src/net/azib/ipscan/gui/fetchers/PortTextFetcherPrefs.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui.fetchers;
diff --git a/src/net/azib/ipscan/gui/fetchers/PortsFetcherPrefs.java b/src/net/azib/ipscan/gui/fetchers/PortsFetcherPrefs.java
index 0c164e70..d2d916ff 100644
--- a/src/net/azib/ipscan/gui/fetchers/PortsFetcherPrefs.java
+++ b/src/net/azib/ipscan/gui/fetchers/PortsFetcherPrefs.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/src/net/azib/ipscan/gui/util/LayoutHelper.java b/src/net/azib/ipscan/gui/util/LayoutHelper.java
index 0262c12c..4d4061bf 100644
--- a/src/net/azib/ipscan/gui/util/LayoutHelper.java
+++ b/src/net/azib/ipscan/gui/util/LayoutHelper.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/src/net/azib/ipscan/util/InetAddressUtils.java b/src/net/azib/ipscan/util/InetAddressUtils.java
index 5e2d1fbd..919e9c65 100755
--- a/src/net/azib/ipscan/util/InetAddressUtils.java
+++ b/src/net/azib/ipscan/util/InetAddressUtils.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.util;
diff --git a/src/net/azib/ipscan/util/SequenceIterator.java b/src/net/azib/ipscan/util/SequenceIterator.java
index ad7a6d6b..3ec4ed13 100644
--- a/src/net/azib/ipscan/util/SequenceIterator.java
+++ b/src/net/azib/ipscan/util/SequenceIterator.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/test/net/azib/ipscan/config/CommandLineProcessorTest.java b/test/net/azib/ipscan/config/CommandLineProcessorTest.java
index a6ed2d8b..dd49b780 100644
--- a/test/net/azib/ipscan/config/CommandLineProcessorTest.java
+++ b/test/net/azib/ipscan/config/CommandLineProcessorTest.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/test/net/azib/ipscan/core/ScannerDispatcherThreadTest.java b/test/net/azib/ipscan/core/ScannerDispatcherThreadTest.java
index 72c76916..675e3e25 100644
--- a/test/net/azib/ipscan/core/ScannerDispatcherThreadTest.java
+++ b/test/net/azib/ipscan/core/ScannerDispatcherThreadTest.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core;
diff --git a/test/net/azib/ipscan/core/ScanningResultComparatorTest.java b/test/net/azib/ipscan/core/ScanningResultComparatorTest.java
index 7f415ea6..1c426fc9 100644
--- a/test/net/azib/ipscan/core/ScanningResultComparatorTest.java
+++ b/test/net/azib/ipscan/core/ScanningResultComparatorTest.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core;
diff --git a/test/net/azib/ipscan/core/ScanningSubjectTest.java b/test/net/azib/ipscan/core/ScanningSubjectTest.java
index 15e76844..ec546453 100644
--- a/test/net/azib/ipscan/core/ScanningSubjectTest.java
+++ b/test/net/azib/ipscan/core/ScanningSubjectTest.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core;
diff --git a/test/net/azib/ipscan/core/state/ScanningStateTest.java b/test/net/azib/ipscan/core/state/ScanningStateTest.java
index 32b9eed2..0ea42f09 100644
--- a/test/net/azib/ipscan/core/state/ScanningStateTest.java
+++ b/test/net/azib/ipscan/core/state/ScanningStateTest.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/test/net/azib/ipscan/core/state/StateMachineTest.java b/test/net/azib/ipscan/core/state/StateMachineTest.java
index dfffd9c2..5a71b03f 100644
--- a/test/net/azib/ipscan/core/state/StateMachineTest.java
+++ b/test/net/azib/ipscan/core/state/StateMachineTest.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core.state;
diff --git a/test/net/azib/ipscan/core/values/InetAddressHolderTest.java b/test/net/azib/ipscan/core/values/InetAddressHolderTest.java
index 9f74addc..fb19cb0b 100644
--- a/test/net/azib/ipscan/core/values/InetAddressHolderTest.java
+++ b/test/net/azib/ipscan/core/values/InetAddressHolderTest.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/test/net/azib/ipscan/core/values/NumericRangeListTest.java b/test/net/azib/ipscan/core/values/NumericRangeListTest.java
index 60889ac7..62c61322 100755
--- a/test/net/azib/ipscan/core/values/NumericRangeListTest.java
+++ b/test/net/azib/ipscan/core/values/NumericRangeListTest.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.core.values;
diff --git a/test/net/azib/ipscan/feeders/RescanFeederTest.java b/test/net/azib/ipscan/feeders/RescanFeederTest.java
index 9f5085c8..a7a56f0c 100644
--- a/test/net/azib/ipscan/feeders/RescanFeederTest.java
+++ b/test/net/azib/ipscan/feeders/RescanFeederTest.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/test/net/azib/ipscan/fetchers/NetBIOSInfoFetcherTest.java b/test/net/azib/ipscan/fetchers/NetBIOSInfoFetcherTest.java
index 4cb52771..66c7f47d 100644
--- a/test/net/azib/ipscan/fetchers/NetBIOSInfoFetcherTest.java
+++ b/test/net/azib/ipscan/fetchers/NetBIOSInfoFetcherTest.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/test/net/azib/ipscan/gui/InputDialogTest.java b/test/net/azib/ipscan/gui/InputDialogTest.java
index 8b018c6a..2bd2cf58 100644
--- a/test/net/azib/ipscan/gui/InputDialogTest.java
+++ b/test/net/azib/ipscan/gui/InputDialogTest.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/test/net/azib/ipscan/gui/PreferencesDialogTest.java b/test/net/azib/ipscan/gui/PreferencesDialogTest.java
index 1d9d86c1..376511cd 100644
--- a/test/net/azib/ipscan/gui/PreferencesDialogTest.java
+++ b/test/net/azib/ipscan/gui/PreferencesDialogTest.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui;
diff --git a/test/net/azib/ipscan/gui/SWTTestCase.java b/test/net/azib/ipscan/gui/SWTTestCase.java
index 1a11107e..bca99c8a 100644
--- a/test/net/azib/ipscan/gui/SWTTestCase.java
+++ b/test/net/azib/ipscan/gui/SWTTestCase.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/test/net/azib/ipscan/gui/SelectFetchersDialogTest.java b/test/net/azib/ipscan/gui/SelectFetchersDialogTest.java
index ef9a6c3f..662a7a4d 100755
--- a/test/net/azib/ipscan/gui/SelectFetchersDialogTest.java
+++ b/test/net/azib/ipscan/gui/SelectFetchersDialogTest.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui;
diff --git a/test/net/azib/ipscan/gui/StatisticsDialogTest.java b/test/net/azib/ipscan/gui/StatisticsDialogTest.java
index e4c89062..4226e861 100644
--- a/test/net/azib/ipscan/gui/StatisticsDialogTest.java
+++ b/test/net/azib/ipscan/gui/StatisticsDialogTest.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/test/net/azib/ipscan/gui/actions/GotoActionsTest.java b/test/net/azib/ipscan/gui/actions/GotoActionsTest.java
index 7aeefa87..c17108aa 100644
--- a/test/net/azib/ipscan/gui/actions/GotoActionsTest.java
+++ b/test/net/azib/ipscan/gui/actions/GotoActionsTest.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui.actions;
diff --git a/test/net/azib/ipscan/gui/actions/StartStopScanningActionTest.java b/test/net/azib/ipscan/gui/actions/StartStopScanningActionTest.java
index 9220cbea..2af8d179 100644
--- a/test/net/azib/ipscan/gui/actions/StartStopScanningActionTest.java
+++ b/test/net/azib/ipscan/gui/actions/StartStopScanningActionTest.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 
diff --git a/test/net/azib/ipscan/gui/feeders/FeederGUIRegistryTest.java b/test/net/azib/ipscan/gui/feeders/FeederGUIRegistryTest.java
index b3a032c4..9d75bed5 100644
--- a/test/net/azib/ipscan/gui/feeders/FeederGUIRegistryTest.java
+++ b/test/net/azib/ipscan/gui/feeders/FeederGUIRegistryTest.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.gui.feeders;
diff --git a/test/net/azib/ipscan/util/SequenceIteratorTest.java b/test/net/azib/ipscan/util/SequenceIteratorTest.java
index 25fa0505..8d567c09 100644
--- a/test/net/azib/ipscan/util/SequenceIteratorTest.java
+++ b/test/net/azib/ipscan/util/SequenceIteratorTest.java
@@ -1,6 +1,6 @@
 /**
  * This file is a part of Angry IP Scanner source code,
- * see http://www.azib.net/ for more information.
+ * see http://www.angryip.org/ for more information.
  * Licensed under GPLv2.
  */
 package net.azib.ipscan.util;