diff --git a/LICSENE b/LICENSE
similarity index 100%
rename from LICSENE
rename to LICENSE
diff --git a/pom.xml b/pom.xml
index 05c9175..b5d97ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,48 +1,66 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.productivity.java</groupId>
-  <artifactId>syslog4j-graylog2</artifactId>
-  <version>0.9.48-graylog2</version>
-  <packaging>jar</packaging>
+    <groupId>org.graylog2</groupId>
+    <artifactId>syslog4j</artifactId>
+    <version>0.9.48</version>
+    <packaging>jar</packaging>
 
-  <name>syslog4j-graylog2</name>
-  <url>http://maven.apache.org</url>
+    <name>syslog4j-graylog2</name>
+    <url>http://maven.apache.org</url>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
+    <licenses>
+        <license>
+            <name>LGPL</name>
+            <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
+        </license>
+    </licenses>
 
-  <dependencies>
-    <dependency>
-        <groupId>joda-time</groupId>
-        <artifactId>joda-time</artifactId>
-        <version>1.6.2</version>
-    </dependency>
-    <dependency>
-        <groupId>commons-pool</groupId>
-        <artifactId>commons-pool</artifactId>
-        <version>1.5.4</version>
-        <optional>true</optional>
-    </dependency>
-    <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>1.2.14</version>
-        <optional>true</optional>
-    </dependency>
-    <dependency>
-        <groupId>com.sun.jna</groupId>
-        <artifactId>jna</artifactId>
-        <version>3.0.9</version>
-        <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+    <description>Syslog4j provides client and server implementations of the BSD Syslog protocol (RFC 3164) and the draft "structured syslog" protocol (RFC Draft).
+        This is a repackaged fork used in Graylog2, as the original package has no recent versions published to Maven Central.
+    </description>
+
+    <scm>
+        <url>https://github.com/Graylog2/syslog4j-graylog2</url>
+        <connection>scm:git:git://github.com/Graylog2/syslog4j-graylog2.git</connection>
+        <developerConnection>scm:git:ssh://git@github.com:Graylog2/syslog4j-graylog2.git</developerConnection>
+        <tag>HEAD</tag>
+    </scm>
+    
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>1.6.2</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-pool</groupId>
+            <artifactId>commons-pool</artifactId>
+            <version>1.5.4</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.14</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.jna</groupId>
+            <artifactId>jna</artifactId>
+            <version>3.0.9</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/src/main/java/org/productivity/java/syslog4j/Syslog.java b/src/main/java/org/graylog2/syslog4j/Syslog.java
similarity index 91%
rename from src/main/java/org/productivity/java/syslog4j/Syslog.java
rename to src/main/java/org/graylog2/syslog4j/Syslog.java
index 23681bb..cf5269f 100644
--- a/src/main/java/org/productivity/java/syslog4j/Syslog.java
+++ b/src/main/java/org/graylog2/syslog4j/Syslog.java
@@ -1,16 +1,16 @@
-package org.productivity.java.syslog4j;
+package org.graylog2.syslog4j;
 
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import org.productivity.java.syslog4j.impl.net.tcp.TCPNetSyslogConfig;
-import org.productivity.java.syslog4j.impl.net.udp.UDPNetSyslogConfig;
-import org.productivity.java.syslog4j.impl.unix.UnixSyslogConfig;
-import org.productivity.java.syslog4j.impl.unix.socket.UnixSocketSyslogConfig;
-import org.productivity.java.syslog4j.util.OSDetectUtility;
-import org.productivity.java.syslog4j.util.SyslogUtility;
+import org.graylog2.syslog4j.impl.net.tcp.TCPNetSyslogConfig;
+import org.graylog2.syslog4j.impl.net.udp.UDPNetSyslogConfig;
+import org.graylog2.syslog4j.impl.unix.UnixSyslogConfig;
+import org.graylog2.syslog4j.impl.unix.socket.UnixSocketSyslogConfig;
+import org.graylog2.syslog4j.util.OSDetectUtility;
+import org.graylog2.syslog4j.util.SyslogUtility;
 
 /**
  * This class provides a Singleton interface for Syslog4j client implementations.
diff --git a/src/main/java/org/productivity/java/syslog4j/Syslog4jVersion.java b/src/main/java/org/graylog2/syslog4j/Syslog4jVersion.java
similarity index 78%
rename from src/main/java/org/productivity/java/syslog4j/Syslog4jVersion.java
rename to src/main/java/org/graylog2/syslog4j/Syslog4jVersion.java
index 077855d..ff1a977 100644
--- a/src/main/java/org/productivity/java/syslog4j/Syslog4jVersion.java
+++ b/src/main/java/org/graylog2/syslog4j/Syslog4jVersion.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j;
+package org.graylog2.syslog4j;
 
 /**
 * Syslog4jVersion provides a unique version identifier that is created during
@@ -12,5 +12,5 @@ package org.productivity.java.syslog4j;
 * @version $Id: Syslog4jVersion.java,v 1.2 2008/10/28 01:07:06 cvs Exp $
 */
 public final class Syslog4jVersion {
-	public static final String VERSION = "Syslog4j 0.9.46 2011-01-23 14:49:24 jpy";
+	public static final String VERSION = "Syslog4j-graylog2 0.9.48 kroepke";
 }
diff --git a/src/main/java/org/productivity/java/syslog4j/SyslogBackLogHandlerIF.java b/src/main/java/org/graylog2/syslog4j/SyslogBackLogHandlerIF.java
similarity index 95%
rename from src/main/java/org/productivity/java/syslog4j/SyslogBackLogHandlerIF.java
rename to src/main/java/org/graylog2/syslog4j/SyslogBackLogHandlerIF.java
index d88a5c6..95f9864 100644
--- a/src/main/java/org/productivity/java/syslog4j/SyslogBackLogHandlerIF.java
+++ b/src/main/java/org/graylog2/syslog4j/SyslogBackLogHandlerIF.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j;
+package org.graylog2.syslog4j;
 
 /**
 * SyslogBackLogHandlerIF provides a last-chance mechanism to log messages that fail
diff --git a/src/main/java/org/productivity/java/syslog4j/SyslogCharSetIF.java b/src/main/java/org/graylog2/syslog4j/SyslogCharSetIF.java
similarity index 91%
rename from src/main/java/org/productivity/java/syslog4j/SyslogCharSetIF.java
rename to src/main/java/org/graylog2/syslog4j/SyslogCharSetIF.java
index 62a6bb6..77a5900 100644
--- a/src/main/java/org/productivity/java/syslog4j/SyslogCharSetIF.java
+++ b/src/main/java/org/graylog2/syslog4j/SyslogCharSetIF.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j;
+package org.graylog2.syslog4j;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/org/productivity/java/syslog4j/SyslogConfigIF.java b/src/main/java/org/graylog2/syslog4j/SyslogConfigIF.java
similarity index 95%
rename from src/main/java/org/productivity/java/syslog4j/SyslogConfigIF.java
rename to src/main/java/org/graylog2/syslog4j/SyslogConfigIF.java
index ac4ed64..1fd8152 100644
--- a/src/main/java/org/productivity/java/syslog4j/SyslogConfigIF.java
+++ b/src/main/java/org/graylog2/syslog4j/SyslogConfigIF.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j;
+package org.graylog2.syslog4j;
 
 /**
 * SyslogConfigIF provides a common, extensible configuration interface for all
diff --git a/src/main/java/org/productivity/java/syslog4j/SyslogConstants.java b/src/main/java/org/graylog2/syslog4j/SyslogConstants.java
similarity index 97%
rename from src/main/java/org/productivity/java/syslog4j/SyslogConstants.java
rename to src/main/java/org/graylog2/syslog4j/SyslogConstants.java
index 175f4e8..ac95c68 100644
--- a/src/main/java/org/productivity/java/syslog4j/SyslogConstants.java
+++ b/src/main/java/org/graylog2/syslog4j/SyslogConstants.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j;
+package org.graylog2.syslog4j;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/org/productivity/java/syslog4j/SyslogIF.java b/src/main/java/org/graylog2/syslog4j/SyslogIF.java
similarity index 95%
rename from src/main/java/org/productivity/java/syslog4j/SyslogIF.java
rename to src/main/java/org/graylog2/syslog4j/SyslogIF.java
index b69a995..c5dbf18 100644
--- a/src/main/java/org/productivity/java/syslog4j/SyslogIF.java
+++ b/src/main/java/org/graylog2/syslog4j/SyslogIF.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j;
+package org.graylog2.syslog4j;
 
 /**
 * SyslogIF provides a common interface for all Syslog4j client implementations.
diff --git a/src/main/java/org/productivity/java/syslog4j/SyslogMain.java b/src/main/java/org/graylog2/syslog4j/SyslogMain.java
similarity index 95%
rename from src/main/java/org/productivity/java/syslog4j/SyslogMain.java
rename to src/main/java/org/graylog2/syslog4j/SyslogMain.java
index 69a6e51..fc1a255 100644
--- a/src/main/java/org/productivity/java/syslog4j/SyslogMain.java
+++ b/src/main/java/org/graylog2/syslog4j/SyslogMain.java
@@ -1,12 +1,12 @@
-package org.productivity.java.syslog4j;
+package org.graylog2.syslog4j;
+
+import org.graylog2.syslog4j.util.SyslogUtility;
 
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
-import org.productivity.java.syslog4j.util.SyslogUtility;
-
 /**
  * This class provides a command-line interface for Syslog4j
  * server implementations.
diff --git a/src/main/java/org/productivity/java/syslog4j/SyslogMessageIF.java b/src/main/java/org/graylog2/syslog4j/SyslogMessageIF.java
similarity index 90%
rename from src/main/java/org/productivity/java/syslog4j/SyslogMessageIF.java
rename to src/main/java/org/graylog2/syslog4j/SyslogMessageIF.java
index 0007a94..25cc467 100644
--- a/src/main/java/org/productivity/java/syslog4j/SyslogMessageIF.java
+++ b/src/main/java/org/graylog2/syslog4j/SyslogMessageIF.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j;
+package org.graylog2.syslog4j;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/org/productivity/java/syslog4j/SyslogMessageModifierConfigIF.java b/src/main/java/org/graylog2/syslog4j/SyslogMessageModifierConfigIF.java
similarity index 92%
rename from src/main/java/org/productivity/java/syslog4j/SyslogMessageModifierConfigIF.java
rename to src/main/java/org/graylog2/syslog4j/SyslogMessageModifierConfigIF.java
index 08e51ab..86d4361 100644
--- a/src/main/java/org/productivity/java/syslog4j/SyslogMessageModifierConfigIF.java
+++ b/src/main/java/org/graylog2/syslog4j/SyslogMessageModifierConfigIF.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j;
+package org.graylog2.syslog4j;
 
 /**
 * SyslogMessageModifierConfigIF provides a common configuration interface for all
diff --git a/src/main/java/org/productivity/java/syslog4j/SyslogMessageModifierIF.java b/src/main/java/org/graylog2/syslog4j/SyslogMessageModifierIF.java
similarity index 91%
rename from src/main/java/org/productivity/java/syslog4j/SyslogMessageModifierIF.java
rename to src/main/java/org/graylog2/syslog4j/SyslogMessageModifierIF.java
index 4d68756..da017bf 100644
--- a/src/main/java/org/productivity/java/syslog4j/SyslogMessageModifierIF.java
+++ b/src/main/java/org/graylog2/syslog4j/SyslogMessageModifierIF.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j;
+package org.graylog2.syslog4j;
 
 /**
 * SyslogMessageModifierIF provides a common interface for all
diff --git a/src/main/java/org/productivity/java/syslog4j/SyslogMessageProcessorIF.java b/src/main/java/org/graylog2/syslog4j/SyslogMessageProcessorIF.java
similarity index 93%
rename from src/main/java/org/productivity/java/syslog4j/SyslogMessageProcessorIF.java
rename to src/main/java/org/graylog2/syslog4j/SyslogMessageProcessorIF.java
index c886dd8..25c19ae 100644
--- a/src/main/java/org/productivity/java/syslog4j/SyslogMessageProcessorIF.java
+++ b/src/main/java/org/graylog2/syslog4j/SyslogMessageProcessorIF.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j;
+package org.graylog2.syslog4j;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/org/productivity/java/syslog4j/SyslogPoolConfigIF.java b/src/main/java/org/graylog2/syslog4j/SyslogPoolConfigIF.java
similarity index 94%
rename from src/main/java/org/productivity/java/syslog4j/SyslogPoolConfigIF.java
rename to src/main/java/org/graylog2/syslog4j/SyslogPoolConfigIF.java
index 18c4404..1366704 100644
--- a/src/main/java/org/productivity/java/syslog4j/SyslogPoolConfigIF.java
+++ b/src/main/java/org/graylog2/syslog4j/SyslogPoolConfigIF.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j;
+package org.graylog2.syslog4j;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/org/productivity/java/syslog4j/SyslogRuntimeException.java b/src/main/java/org/graylog2/syslog4j/SyslogRuntimeException.java
similarity index 92%
rename from src/main/java/org/productivity/java/syslog4j/SyslogRuntimeException.java
rename to src/main/java/org/graylog2/syslog4j/SyslogRuntimeException.java
index 2c4f311..11e13c1 100644
--- a/src/main/java/org/productivity/java/syslog4j/SyslogRuntimeException.java
+++ b/src/main/java/org/graylog2/syslog4j/SyslogRuntimeException.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j;
+package org.graylog2.syslog4j;
 
 /**
 * SyslogRuntimeException provides an extension of RuntimeException thrown
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/AbstractSyslog.java b/src/main/java/org/graylog2/syslog4j/impl/AbstractSyslog.java
similarity index 89%
rename from src/main/java/org/productivity/java/syslog4j/impl/AbstractSyslog.java
rename to src/main/java/org/graylog2/syslog4j/impl/AbstractSyslog.java
index 86ed89c..91e915a 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/AbstractSyslog.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/AbstractSyslog.java
@@ -1,20 +1,20 @@
-package org.productivity.java.syslog4j.impl;
+package org.graylog2.syslog4j.impl;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.productivity.java.syslog4j.SyslogBackLogHandlerIF;
-import org.productivity.java.syslog4j.SyslogConfigIF;
-import org.productivity.java.syslog4j.SyslogIF;
-import org.productivity.java.syslog4j.SyslogMessageIF;
-import org.productivity.java.syslog4j.SyslogMessageModifierIF;
-import org.productivity.java.syslog4j.SyslogMessageProcessorIF;
-import org.productivity.java.syslog4j.SyslogRuntimeException;
-import org.productivity.java.syslog4j.impl.message.processor.SyslogMessageProcessor;
-import org.productivity.java.syslog4j.impl.message.processor.structured.StructuredSyslogMessageProcessor;
-import org.productivity.java.syslog4j.impl.message.structured.StructuredSyslogMessage;
-import org.productivity.java.syslog4j.impl.message.structured.StructuredSyslogMessageIF;
-import org.productivity.java.syslog4j.util.SyslogUtility;
+import org.graylog2.syslog4j.SyslogBackLogHandlerIF;
+import org.graylog2.syslog4j.SyslogConfigIF;
+import org.graylog2.syslog4j.SyslogIF;
+import org.graylog2.syslog4j.SyslogMessageIF;
+import org.graylog2.syslog4j.SyslogMessageModifierIF;
+import org.graylog2.syslog4j.SyslogMessageProcessorIF;
+import org.graylog2.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.impl.message.processor.SyslogMessageProcessor;
+import org.graylog2.syslog4j.impl.message.processor.structured.StructuredSyslogMessageProcessor;
+import org.graylog2.syslog4j.impl.message.structured.StructuredSyslogMessage;
+import org.graylog2.syslog4j.impl.message.structured.StructuredSyslogMessageIF;
+import org.graylog2.syslog4j.util.SyslogUtility;
 
 /**
 * AbstractSyslog provides a base abstract implementation of the SyslogIF.
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/AbstractSyslogConfig.java b/src/main/java/org/graylog2/syslog4j/impl/AbstractSyslogConfig.java
similarity index 92%
rename from src/main/java/org/productivity/java/syslog4j/impl/AbstractSyslogConfig.java
rename to src/main/java/org/graylog2/syslog4j/impl/AbstractSyslogConfig.java
index ff602f7..3cc0820 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/AbstractSyslogConfig.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/AbstractSyslogConfig.java
@@ -1,13 +1,13 @@
-package org.productivity.java.syslog4j.impl;
+package org.graylog2.syslog4j.impl;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.productivity.java.syslog4j.SyslogBackLogHandlerIF;
-import org.productivity.java.syslog4j.SyslogMessageModifierIF;
-import org.productivity.java.syslog4j.SyslogRuntimeException;
-import org.productivity.java.syslog4j.impl.backlog.printstream.SystemErrSyslogBackLogHandler;
-import org.productivity.java.syslog4j.util.SyslogUtility;
+import org.graylog2.syslog4j.SyslogBackLogHandlerIF;
+import org.graylog2.syslog4j.SyslogMessageModifierIF;
+import org.graylog2.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.impl.backlog.printstream.SystemErrSyslogBackLogHandler;
+import org.graylog2.syslog4j.util.SyslogUtility;
 
 /**
 * AbstractSyslog provides a base abstract implementation of the SyslogConfigIF
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/AbstractSyslogConfigIF.java b/src/main/java/org/graylog2/syslog4j/impl/AbstractSyslogConfigIF.java
similarity index 91%
rename from src/main/java/org/productivity/java/syslog4j/impl/AbstractSyslogConfigIF.java
rename to src/main/java/org/graylog2/syslog4j/impl/AbstractSyslogConfigIF.java
index cc3ed03..bae1e2d 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/AbstractSyslogConfigIF.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/AbstractSyslogConfigIF.java
@@ -1,8 +1,8 @@
-package org.productivity.java.syslog4j.impl;
+package org.graylog2.syslog4j.impl;
 
 import java.util.List;
 
-import org.productivity.java.syslog4j.SyslogConfigIF;
+import org.graylog2.syslog4j.SyslogConfigIF;
 
 /**
 * AbstractSyslogConfigIF provides an interface for all Abstract Syslog
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/AbstractSyslogWriter.java b/src/main/java/org/graylog2/syslog4j/impl/AbstractSyslogWriter.java
similarity index 90%
rename from src/main/java/org/productivity/java/syslog4j/impl/AbstractSyslogWriter.java
rename to src/main/java/org/graylog2/syslog4j/impl/AbstractSyslogWriter.java
index 5386105..6457805 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/AbstractSyslogWriter.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/AbstractSyslogWriter.java
@@ -1,12 +1,12 @@
-package org.productivity.java.syslog4j.impl;
+package org.graylog2.syslog4j.impl;
 
 import java.io.Serializable;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.productivity.java.syslog4j.SyslogConstants;
-import org.productivity.java.syslog4j.SyslogRuntimeException;
-import org.productivity.java.syslog4j.util.SyslogUtility;
+import org.graylog2.syslog4j.SyslogConstants;
+import org.graylog2.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.util.SyslogUtility;
 
 /**
 * AbstractSyslogWriter is an implementation of Runnable that supports sending
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/backlog/AbstractSyslogBackLogHandler.java b/src/main/java/org/graylog2/syslog4j/impl/backlog/AbstractSyslogBackLogHandler.java
similarity index 81%
rename from src/main/java/org/productivity/java/syslog4j/impl/backlog/AbstractSyslogBackLogHandler.java
rename to src/main/java/org/graylog2/syslog4j/impl/backlog/AbstractSyslogBackLogHandler.java
index 09dd6a6..aebb4fc 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/backlog/AbstractSyslogBackLogHandler.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/backlog/AbstractSyslogBackLogHandler.java
@@ -1,8 +1,8 @@
-package org.productivity.java.syslog4j.impl.backlog;
+package org.graylog2.syslog4j.impl.backlog;
 
-import org.productivity.java.syslog4j.SyslogBackLogHandlerIF;
-import org.productivity.java.syslog4j.SyslogIF;
-import org.productivity.java.syslog4j.util.SyslogUtility;
+import org.graylog2.syslog4j.SyslogBackLogHandlerIF;
+import org.graylog2.syslog4j.SyslogIF;
+import org.graylog2.syslog4j.util.SyslogUtility;
 
 /**
 * AbstractSyslogBackLogHandler is an implementation of SyslogBackLogHandlerIF
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/backlog/NullSyslogBackLogHandler.java b/src/main/java/org/graylog2/syslog4j/impl/backlog/NullSyslogBackLogHandler.java
similarity index 81%
rename from src/main/java/org/productivity/java/syslog4j/impl/backlog/NullSyslogBackLogHandler.java
rename to src/main/java/org/graylog2/syslog4j/impl/backlog/NullSyslogBackLogHandler.java
index 74ddab2..d4f4911 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/backlog/NullSyslogBackLogHandler.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/backlog/NullSyslogBackLogHandler.java
@@ -1,7 +1,7 @@
-package org.productivity.java.syslog4j.impl.backlog;
+package org.graylog2.syslog4j.impl.backlog;
 
-import org.productivity.java.syslog4j.SyslogBackLogHandlerIF;
-import org.productivity.java.syslog4j.SyslogIF;
+import org.graylog2.syslog4j.SyslogBackLogHandlerIF;
+import org.graylog2.syslog4j.SyslogIF;
 
 /**
 * NullSyslogBackLogHandler can be used if there's no need for a last-chance
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/backlog/Syslog4jBackLogHandler.java b/src/main/java/org/graylog2/syslog4j/impl/backlog/Syslog4jBackLogHandler.java
similarity index 86%
rename from src/main/java/org/productivity/java/syslog4j/impl/backlog/Syslog4jBackLogHandler.java
rename to src/main/java/org/graylog2/syslog4j/impl/backlog/Syslog4jBackLogHandler.java
index bf819ec..abf467d 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/backlog/Syslog4jBackLogHandler.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/backlog/Syslog4jBackLogHandler.java
@@ -1,9 +1,9 @@
-package org.productivity.java.syslog4j.impl.backlog;
+package org.graylog2.syslog4j.impl.backlog;
 
-import org.productivity.java.syslog4j.Syslog;
-import org.productivity.java.syslog4j.SyslogConstants;
-import org.productivity.java.syslog4j.SyslogIF;
-import org.productivity.java.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.Syslog;
+import org.graylog2.syslog4j.SyslogConstants;
+import org.graylog2.syslog4j.SyslogIF;
+import org.graylog2.syslog4j.SyslogRuntimeException;
 
 /**
 * Syslog4jBackLogHandler is used to send Syslog backLog messages to
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/backlog/log4j/Log4jSyslogBackLogHandler.java b/src/main/java/org/graylog2/syslog4j/impl/backlog/log4j/Log4jSyslogBackLogHandler.java
similarity index 90%
rename from src/main/java/org/productivity/java/syslog4j/impl/backlog/log4j/Log4jSyslogBackLogHandler.java
rename to src/main/java/org/graylog2/syslog4j/impl/backlog/log4j/Log4jSyslogBackLogHandler.java
index b05cecc..99319aa 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/backlog/log4j/Log4jSyslogBackLogHandler.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/backlog/log4j/Log4jSyslogBackLogHandler.java
@@ -1,12 +1,12 @@
-package org.productivity.java.syslog4j.impl.backlog.log4j;
+package org.graylog2.syslog4j.impl.backlog.log4j;
 
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.spi.LoggerFactory;
-import org.productivity.java.syslog4j.SyslogConstants;
-import org.productivity.java.syslog4j.SyslogIF;
-import org.productivity.java.syslog4j.SyslogRuntimeException;
-import org.productivity.java.syslog4j.impl.backlog.AbstractSyslogBackLogHandler;
+import org.graylog2.syslog4j.SyslogConstants;
+import org.graylog2.syslog4j.SyslogIF;
+import org.graylog2.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.impl.backlog.AbstractSyslogBackLogHandler;
 
 /**
 * Log4jSyslogBackLogHandler is used to send Syslog backLog messages to
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/backlog/printstream/PrintStreamSyslogBackLogHandler.java b/src/main/java/org/graylog2/syslog4j/impl/backlog/printstream/PrintStreamSyslogBackLogHandler.java
similarity index 86%
rename from src/main/java/org/productivity/java/syslog4j/impl/backlog/printstream/PrintStreamSyslogBackLogHandler.java
rename to src/main/java/org/graylog2/syslog4j/impl/backlog/printstream/PrintStreamSyslogBackLogHandler.java
index d9fc80c..ee65a4e 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/backlog/printstream/PrintStreamSyslogBackLogHandler.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/backlog/printstream/PrintStreamSyslogBackLogHandler.java
@@ -1,10 +1,10 @@
-package org.productivity.java.syslog4j.impl.backlog.printstream;
+package org.graylog2.syslog4j.impl.backlog.printstream;
 
 import java.io.PrintStream;
 
-import org.productivity.java.syslog4j.SyslogIF;
-import org.productivity.java.syslog4j.SyslogRuntimeException;
-import org.productivity.java.syslog4j.impl.backlog.AbstractSyslogBackLogHandler;
+import org.graylog2.syslog4j.SyslogIF;
+import org.graylog2.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.impl.backlog.AbstractSyslogBackLogHandler;
 
 /**
 * PrintStreamSyslogBackLogHandler provides a last-chance mechanism to log messages that fail
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/backlog/printstream/SystemErrSyslogBackLogHandler.java b/src/main/java/org/graylog2/syslog4j/impl/backlog/printstream/SystemErrSyslogBackLogHandler.java
similarity index 85%
rename from src/main/java/org/productivity/java/syslog4j/impl/backlog/printstream/SystemErrSyslogBackLogHandler.java
rename to src/main/java/org/graylog2/syslog4j/impl/backlog/printstream/SystemErrSyslogBackLogHandler.java
index 814e5eb..56edb78 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/backlog/printstream/SystemErrSyslogBackLogHandler.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/backlog/printstream/SystemErrSyslogBackLogHandler.java
@@ -1,6 +1,6 @@
-package org.productivity.java.syslog4j.impl.backlog.printstream;
+package org.graylog2.syslog4j.impl.backlog.printstream;
 
-import org.productivity.java.syslog4j.SyslogBackLogHandlerIF;
+import org.graylog2.syslog4j.SyslogBackLogHandlerIF;
 
 /**
 * SystemErrSyslogBackLogHandler provides a last-chance mechanism to log messages that fail
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/backlog/printstream/SystemOutSyslogBackLogHandler.java b/src/main/java/org/graylog2/syslog4j/impl/backlog/printstream/SystemOutSyslogBackLogHandler.java
similarity index 85%
rename from src/main/java/org/productivity/java/syslog4j/impl/backlog/printstream/SystemOutSyslogBackLogHandler.java
rename to src/main/java/org/graylog2/syslog4j/impl/backlog/printstream/SystemOutSyslogBackLogHandler.java
index 48e0062..7634b7e 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/backlog/printstream/SystemOutSyslogBackLogHandler.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/backlog/printstream/SystemOutSyslogBackLogHandler.java
@@ -1,6 +1,6 @@
-package org.productivity.java.syslog4j.impl.backlog.printstream;
+package org.graylog2.syslog4j.impl.backlog.printstream;
 
-import org.productivity.java.syslog4j.SyslogBackLogHandlerIF;
+import org.graylog2.syslog4j.SyslogBackLogHandlerIF;
 
 /**
 * SystemOutSyslogBackLogHandler provides a last-chance mechanism to log messages that fail
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/log4j/Syslog4jAppender.java b/src/main/java/org/graylog2/syslog4j/impl/log4j/Syslog4jAppender.java
similarity index 89%
rename from src/main/java/org/productivity/java/syslog4j/impl/log4j/Syslog4jAppender.java
rename to src/main/java/org/graylog2/syslog4j/impl/log4j/Syslog4jAppender.java
index 604530b..efeae4b 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/log4j/Syslog4jAppender.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/log4j/Syslog4jAppender.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j.impl.log4j;
+package org.graylog2.syslog4j.impl.log4j;
 
 import org.apache.log4j.helpers.LogLog;
 
@@ -11,7 +11,7 @@ import org.apache.log4j.helpers.LogLog;
  * 
  * <pre>
  * <code>
-   &lt;appender name="Syslog4j" class="org.productivity.java.syslog4j.impl.log4j.Syslog4jAppender"&gt;
+   &lt;appender name="Syslog4j" class="org.graylog2.syslog4j.impl.log4j.Syslog4jAppender"&gt;
 		&lt;param name="Facility" value="user"/&gt;
 		&lt;param name="Protocol" value="tcp"/&gt;
 		&lt;param name="Host" value="192.168.0.1"/&gt;
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/log4j/Syslog4jAppenderSkeleton.java b/src/main/java/org/graylog2/syslog4j/impl/log4j/Syslog4jAppenderSkeleton.java
similarity index 92%
rename from src/main/java/org/productivity/java/syslog4j/impl/log4j/Syslog4jAppenderSkeleton.java
rename to src/main/java/org/graylog2/syslog4j/impl/log4j/Syslog4jAppenderSkeleton.java
index cc7f7e7..79a3ec9 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/log4j/Syslog4jAppenderSkeleton.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/log4j/Syslog4jAppenderSkeleton.java
@@ -1,14 +1,14 @@
-package org.productivity.java.syslog4j.impl.log4j;
+package org.graylog2.syslog4j.impl.log4j;
 
 import org.apache.log4j.AppenderSkeleton;
 import org.apache.log4j.helpers.LogLog;
 import org.apache.log4j.spi.LoggingEvent;
-import org.productivity.java.syslog4j.Syslog;
-import org.productivity.java.syslog4j.SyslogConstants;
-import org.productivity.java.syslog4j.SyslogIF;
-import org.productivity.java.syslog4j.SyslogRuntimeException;
-import org.productivity.java.syslog4j.impl.AbstractSyslogConfigIF;
-import org.productivity.java.syslog4j.util.SyslogUtility;
+import org.graylog2.syslog4j.Syslog;
+import org.graylog2.syslog4j.SyslogConstants;
+import org.graylog2.syslog4j.SyslogIF;
+import org.graylog2.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.impl.AbstractSyslogConfigIF;
+import org.graylog2.syslog4j.util.SyslogUtility;
 
 /**
  * Syslog4jAppenderSkeleton provides an extensible Log4j Appender wrapper for Syslog4j.
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/message/AbstractSyslogMessage.java b/src/main/java/org/graylog2/syslog4j/impl/message/AbstractSyslogMessage.java
similarity index 92%
rename from src/main/java/org/productivity/java/syslog4j/impl/message/AbstractSyslogMessage.java
rename to src/main/java/org/graylog2/syslog4j/impl/message/AbstractSyslogMessage.java
index f6cee50..d23ef82 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/message/AbstractSyslogMessage.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/message/AbstractSyslogMessage.java
@@ -1,11 +1,11 @@
-package org.productivity.java.syslog4j.impl.message;
+package org.graylog2.syslog4j.impl.message;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import org.productivity.java.syslog4j.SyslogMessageIF;
+import org.graylog2.syslog4j.SyslogMessageIF;
 
 /**
 * AbstractSyslogMessage provides support for turning POJO (Plain Ol'
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/AbstractSyslogMessageModifier.java b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/AbstractSyslogMessageModifier.java
similarity index 86%
rename from src/main/java/org/productivity/java/syslog4j/impl/message/modifier/AbstractSyslogMessageModifier.java
rename to src/main/java/org/graylog2/syslog4j/impl/message/modifier/AbstractSyslogMessageModifier.java
index 33b586b..d721691 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/AbstractSyslogMessageModifier.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/AbstractSyslogMessageModifier.java
@@ -1,7 +1,7 @@
-package org.productivity.java.syslog4j.impl.message.modifier;
+package org.graylog2.syslog4j.impl.message.modifier;
 
-import org.productivity.java.syslog4j.SyslogMessageModifierConfigIF;
-import org.productivity.java.syslog4j.SyslogMessageModifierIF;
+import org.graylog2.syslog4j.SyslogMessageModifierConfigIF;
+import org.graylog2.syslog4j.SyslogMessageModifierIF;
 
 public abstract class AbstractSyslogMessageModifier implements SyslogMessageModifierIF {
 	private static final long serialVersionUID = 7632959170109372003L;
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/AbstractSyslogMessageModifierConfig.java b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/AbstractSyslogMessageModifierConfig.java
similarity index 82%
rename from src/main/java/org/productivity/java/syslog4j/impl/message/modifier/AbstractSyslogMessageModifierConfig.java
rename to src/main/java/org/graylog2/syslog4j/impl/message/modifier/AbstractSyslogMessageModifierConfig.java
index cb97b71..c508344 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/AbstractSyslogMessageModifierConfig.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/AbstractSyslogMessageModifierConfig.java
@@ -1,8 +1,8 @@
-package org.productivity.java.syslog4j.impl.message.modifier;
+package org.graylog2.syslog4j.impl.message.modifier;
 
-import org.productivity.java.syslog4j.SyslogCharSetIF;
-import org.productivity.java.syslog4j.SyslogConstants;
-import org.productivity.java.syslog4j.SyslogMessageModifierConfigIF;
+import org.graylog2.syslog4j.SyslogCharSetIF;
+import org.graylog2.syslog4j.SyslogConstants;
+import org.graylog2.syslog4j.SyslogMessageModifierConfigIF;
 
 /**
 * AbstractSyslogMessageModifierConfig provides a base abstract implementation of the
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/checksum/ChecksumSyslogMessageModifier.java b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/checksum/ChecksumSyslogMessageModifier.java
similarity index 87%
rename from src/main/java/org/productivity/java/syslog4j/impl/message/modifier/checksum/ChecksumSyslogMessageModifier.java
rename to src/main/java/org/graylog2/syslog4j/impl/message/modifier/checksum/ChecksumSyslogMessageModifier.java
index 55b7f6b..fefd948 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/checksum/ChecksumSyslogMessageModifier.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/checksum/ChecksumSyslogMessageModifier.java
@@ -1,9 +1,9 @@
-package org.productivity.java.syslog4j.impl.message.modifier.checksum;
+package org.graylog2.syslog4j.impl.message.modifier.checksum;
 
-import org.productivity.java.syslog4j.SyslogIF;
-import org.productivity.java.syslog4j.SyslogRuntimeException;
-import org.productivity.java.syslog4j.impl.message.modifier.AbstractSyslogMessageModifier;
-import org.productivity.java.syslog4j.util.SyslogUtility;
+import org.graylog2.syslog4j.SyslogIF;
+import org.graylog2.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.impl.message.modifier.AbstractSyslogMessageModifier;
+import org.graylog2.syslog4j.util.SyslogUtility;
 
 /**
 * ChecksumSyslogMessageModifier is an implementation of SyslogMessageModifierIF
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/checksum/ChecksumSyslogMessageModifierConfig.java b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/checksum/ChecksumSyslogMessageModifierConfig.java
similarity index 87%
rename from src/main/java/org/productivity/java/syslog4j/impl/message/modifier/checksum/ChecksumSyslogMessageModifierConfig.java
rename to src/main/java/org/graylog2/syslog4j/impl/message/modifier/checksum/ChecksumSyslogMessageModifierConfig.java
index ebf2cc9..ea676fc 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/checksum/ChecksumSyslogMessageModifierConfig.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/checksum/ChecksumSyslogMessageModifierConfig.java
@@ -1,10 +1,10 @@
-package org.productivity.java.syslog4j.impl.message.modifier.checksum;
+package org.graylog2.syslog4j.impl.message.modifier.checksum;
 
 import java.util.zip.Adler32;
 import java.util.zip.CRC32;
 import java.util.zip.Checksum;
 
-import org.productivity.java.syslog4j.impl.message.modifier.AbstractSyslogMessageModifierConfig;
+import org.graylog2.syslog4j.impl.message.modifier.AbstractSyslogMessageModifierConfig;
 
 /**
 * ChecksumSyslogMessageModifierConfig is an implementation of AbstractSyslogMessageModifierConfig
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/escape/HTMLEntityEscapeSyslogMessageModifier.java b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/escape/HTMLEntityEscapeSyslogMessageModifier.java
similarity index 90%
rename from src/main/java/org/productivity/java/syslog4j/impl/message/modifier/escape/HTMLEntityEscapeSyslogMessageModifier.java
rename to src/main/java/org/graylog2/syslog4j/impl/message/modifier/escape/HTMLEntityEscapeSyslogMessageModifier.java
index 762ee98..944917c 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/escape/HTMLEntityEscapeSyslogMessageModifier.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/escape/HTMLEntityEscapeSyslogMessageModifier.java
@@ -1,7 +1,7 @@
-package org.productivity.java.syslog4j.impl.message.modifier.escape;
+package org.graylog2.syslog4j.impl.message.modifier.escape;
 
-import org.productivity.java.syslog4j.SyslogIF;
-import org.productivity.java.syslog4j.SyslogMessageModifierIF;
+import org.graylog2.syslog4j.SyslogIF;
+import org.graylog2.syslog4j.SyslogMessageModifierIF;
 
 /**
 * HTMLEntityEscapeSyslogMessageModifier is an implementation of SyslogMessageModifierIF
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/hash/HashSyslogMessageModifier.java b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/hash/HashSyslogMessageModifier.java
similarity index 88%
rename from src/main/java/org/productivity/java/syslog4j/impl/message/modifier/hash/HashSyslogMessageModifier.java
rename to src/main/java/org/graylog2/syslog4j/impl/message/modifier/hash/HashSyslogMessageModifier.java
index 300e8ce..93d82e2 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/hash/HashSyslogMessageModifier.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/hash/HashSyslogMessageModifier.java
@@ -1,14 +1,14 @@
-package org.productivity.java.syslog4j.impl.message.modifier.hash;
+package org.graylog2.syslog4j.impl.message.modifier.hash;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 
-import org.productivity.java.syslog4j.SyslogIF;
-import org.productivity.java.syslog4j.SyslogRuntimeException;
-import org.productivity.java.syslog4j.impl.message.modifier.AbstractSyslogMessageModifier;
-import org.productivity.java.syslog4j.util.Base64;
-import org.productivity.java.syslog4j.util.SyslogUtility;
+import org.graylog2.syslog4j.SyslogIF;
+import org.graylog2.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.impl.message.modifier.AbstractSyslogMessageModifier;
+import org.graylog2.syslog4j.util.Base64;
+import org.graylog2.syslog4j.util.SyslogUtility;
 
 /**
 * HashSyslogMessageModifier is an implementation of SyslogMessageModifierIF
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/hash/HashSyslogMessageModifierConfig.java b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/hash/HashSyslogMessageModifierConfig.java
similarity index 89%
rename from src/main/java/org/productivity/java/syslog4j/impl/message/modifier/hash/HashSyslogMessageModifierConfig.java
rename to src/main/java/org/graylog2/syslog4j/impl/message/modifier/hash/HashSyslogMessageModifierConfig.java
index 4dd0c8d..54a44af 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/hash/HashSyslogMessageModifierConfig.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/hash/HashSyslogMessageModifierConfig.java
@@ -1,6 +1,6 @@
-package org.productivity.java.syslog4j.impl.message.modifier.hash;
+package org.graylog2.syslog4j.impl.message.modifier.hash;
 
-import org.productivity.java.syslog4j.impl.message.modifier.AbstractSyslogMessageModifierConfig;
+import org.graylog2.syslog4j.impl.message.modifier.AbstractSyslogMessageModifierConfig;
 
 /**
 * HashSyslogMessageModifierConfig is an implementation of AbstractSyslogMessageModifierConfig
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/mac/MacSyslogMessageModifier.java b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/mac/MacSyslogMessageModifier.java
similarity index 88%
rename from src/main/java/org/productivity/java/syslog4j/impl/message/modifier/mac/MacSyslogMessageModifier.java
rename to src/main/java/org/graylog2/syslog4j/impl/message/modifier/mac/MacSyslogMessageModifier.java
index 492ec7b..5068cb7 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/mac/MacSyslogMessageModifier.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/mac/MacSyslogMessageModifier.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j.impl.message.modifier.mac;
+package org.graylog2.syslog4j.impl.message.modifier.mac;
 
 import java.security.InvalidKeyException;
 import java.security.Key;
@@ -7,11 +7,11 @@ import java.util.Arrays;
 
 import javax.crypto.Mac;
 
-import org.productivity.java.syslog4j.SyslogIF;
-import org.productivity.java.syslog4j.SyslogRuntimeException;
-import org.productivity.java.syslog4j.impl.message.modifier.AbstractSyslogMessageModifier;
-import org.productivity.java.syslog4j.util.Base64;
-import org.productivity.java.syslog4j.util.SyslogUtility;
+import org.graylog2.syslog4j.SyslogIF;
+import org.graylog2.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.impl.message.modifier.AbstractSyslogMessageModifier;
+import org.graylog2.syslog4j.util.Base64;
+import org.graylog2.syslog4j.util.SyslogUtility;
 
 /**
 * MacSyslogMessageModifier is an implementation of SyslogMessageModifierIF
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/mac/MacSyslogMessageModifierConfig.java b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/mac/MacSyslogMessageModifierConfig.java
similarity index 89%
rename from src/main/java/org/productivity/java/syslog4j/impl/message/modifier/mac/MacSyslogMessageModifierConfig.java
rename to src/main/java/org/graylog2/syslog4j/impl/message/modifier/mac/MacSyslogMessageModifierConfig.java
index ce055da..c680d89 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/mac/MacSyslogMessageModifierConfig.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/mac/MacSyslogMessageModifierConfig.java
@@ -1,12 +1,12 @@
-package org.productivity.java.syslog4j.impl.message.modifier.mac;
+package org.graylog2.syslog4j.impl.message.modifier.mac;
 
 import java.security.Key;
 
 import javax.crypto.spec.SecretKeySpec;
 
-import org.productivity.java.syslog4j.SyslogRuntimeException;
-import org.productivity.java.syslog4j.impl.message.modifier.AbstractSyslogMessageModifierConfig;
-import org.productivity.java.syslog4j.util.Base64;
+import org.graylog2.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.impl.message.modifier.AbstractSyslogMessageModifierConfig;
+import org.graylog2.syslog4j.util.Base64;
 
 /**
 * MacSyslogMessageModifierConfig is an implementation of AbstractSyslogMessageModifierConfig
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/sequential/SequentialSyslogMessageModifier.java b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/sequential/SequentialSyslogMessageModifier.java
similarity index 90%
rename from src/main/java/org/productivity/java/syslog4j/impl/message/modifier/sequential/SequentialSyslogMessageModifier.java
rename to src/main/java/org/graylog2/syslog4j/impl/message/modifier/sequential/SequentialSyslogMessageModifier.java
index 4ac5364..73cba63 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/sequential/SequentialSyslogMessageModifier.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/sequential/SequentialSyslogMessageModifier.java
@@ -1,7 +1,7 @@
-package org.productivity.java.syslog4j.impl.message.modifier.sequential;
+package org.graylog2.syslog4j.impl.message.modifier.sequential;
 
-import org.productivity.java.syslog4j.SyslogIF;
-import org.productivity.java.syslog4j.SyslogMessageModifierIF;
+import org.graylog2.syslog4j.SyslogIF;
+import org.graylog2.syslog4j.SyslogMessageModifierIF;
 
 /**
 * SequentialSyslogMessageModifier is an implementation of SyslogMessageModifierIF
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/sequential/SequentialSyslogMessageModifierConfig.java b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/sequential/SequentialSyslogMessageModifierConfig.java
similarity index 89%
rename from src/main/java/org/productivity/java/syslog4j/impl/message/modifier/sequential/SequentialSyslogMessageModifierConfig.java
rename to src/main/java/org/graylog2/syslog4j/impl/message/modifier/sequential/SequentialSyslogMessageModifierConfig.java
index 307ae86..a60627d 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/sequential/SequentialSyslogMessageModifierConfig.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/sequential/SequentialSyslogMessageModifierConfig.java
@@ -1,6 +1,6 @@
-package org.productivity.java.syslog4j.impl.message.modifier.sequential;
+package org.graylog2.syslog4j.impl.message.modifier.sequential;
 
-import org.productivity.java.syslog4j.impl.message.modifier.AbstractSyslogMessageModifierConfig;
+import org.graylog2.syslog4j.impl.message.modifier.AbstractSyslogMessageModifierConfig;
 
 /**
 * SequentialSyslogMessageModifierConfig is an implementation of AbstractSyslogMessageModifierConfig
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/text/PrefixSyslogMessageModifier.java b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/text/PrefixSyslogMessageModifier.java
similarity index 85%
rename from src/main/java/org/productivity/java/syslog4j/impl/message/modifier/text/PrefixSyslogMessageModifier.java
rename to src/main/java/org/graylog2/syslog4j/impl/message/modifier/text/PrefixSyslogMessageModifier.java
index 32afee0..8354477 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/text/PrefixSyslogMessageModifier.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/text/PrefixSyslogMessageModifier.java
@@ -1,7 +1,7 @@
-package org.productivity.java.syslog4j.impl.message.modifier.text;
+package org.graylog2.syslog4j.impl.message.modifier.text;
 
-import org.productivity.java.syslog4j.SyslogIF;
-import org.productivity.java.syslog4j.SyslogMessageModifierIF;
+import org.graylog2.syslog4j.SyslogIF;
+import org.graylog2.syslog4j.SyslogMessageModifierIF;
 
 /**
 * PrefixSyslogMessageModifier is an implementation of SyslogMessageModifierIF
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/text/StringCaseSyslogMessageModifier.java b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/text/StringCaseSyslogMessageModifier.java
similarity index 85%
rename from src/main/java/org/productivity/java/syslog4j/impl/message/modifier/text/StringCaseSyslogMessageModifier.java
rename to src/main/java/org/graylog2/syslog4j/impl/message/modifier/text/StringCaseSyslogMessageModifier.java
index bc76773..b96e8d9 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/text/StringCaseSyslogMessageModifier.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/text/StringCaseSyslogMessageModifier.java
@@ -1,8 +1,8 @@
-package org.productivity.java.syslog4j.impl.message.modifier.text;
+package org.graylog2.syslog4j.impl.message.modifier.text;
 
-import org.productivity.java.syslog4j.SyslogIF;
-import org.productivity.java.syslog4j.SyslogMessageModifierIF;
-import org.productivity.java.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.SyslogIF;
+import org.graylog2.syslog4j.SyslogMessageModifierIF;
+import org.graylog2.syslog4j.SyslogRuntimeException;
 
 /**
 * StringCaseSyslogMessageModifier is an implementation of SyslogMessageModifierIF
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/text/SuffixSyslogMessageModifier.java b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/text/SuffixSyslogMessageModifier.java
similarity index 85%
rename from src/main/java/org/productivity/java/syslog4j/impl/message/modifier/text/SuffixSyslogMessageModifier.java
rename to src/main/java/org/graylog2/syslog4j/impl/message/modifier/text/SuffixSyslogMessageModifier.java
index 7f20a23..e21598e 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/message/modifier/text/SuffixSyslogMessageModifier.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/message/modifier/text/SuffixSyslogMessageModifier.java
@@ -1,7 +1,7 @@
-package org.productivity.java.syslog4j.impl.message.modifier.text;
+package org.graylog2.syslog4j.impl.message.modifier.text;
 
-import org.productivity.java.syslog4j.SyslogIF;
-import org.productivity.java.syslog4j.SyslogMessageModifierIF;
+import org.graylog2.syslog4j.SyslogIF;
+import org.graylog2.syslog4j.SyslogMessageModifierIF;
 
 /**
 * SuffixSyslogMessageModifier is an implementation of SyslogMessageModifierIF
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/message/pci/PCISyslogMessage.java b/src/main/java/org/graylog2/syslog4j/impl/message/pci/PCISyslogMessage.java
similarity index 95%
rename from src/main/java/org/productivity/java/syslog4j/impl/message/pci/PCISyslogMessage.java
rename to src/main/java/org/graylog2/syslog4j/impl/message/pci/PCISyslogMessage.java
index 78afb42..79324f4 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/message/pci/PCISyslogMessage.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/message/pci/PCISyslogMessage.java
@@ -1,9 +1,9 @@
-package org.productivity.java.syslog4j.impl.message.pci;
+package org.graylog2.syslog4j.impl.message.pci;
 
 import java.util.Date;
 import java.util.Map;
 
-import org.productivity.java.syslog4j.impl.message.AbstractSyslogMessage;
+import org.graylog2.syslog4j.impl.message.AbstractSyslogMessage;
 
 /**
 * PCISyslogMessage provides support for audit trails defined by section
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/message/pci/PCISyslogMessageIF.java b/src/main/java/org/graylog2/syslog4j/impl/message/pci/PCISyslogMessageIF.java
similarity index 92%
rename from src/main/java/org/productivity/java/syslog4j/impl/message/pci/PCISyslogMessageIF.java
rename to src/main/java/org/graylog2/syslog4j/impl/message/pci/PCISyslogMessageIF.java
index 31499d6..3483443 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/message/pci/PCISyslogMessageIF.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/message/pci/PCISyslogMessageIF.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j.impl.message.pci;
+package org.graylog2.syslog4j.impl.message.pci;
 
 /**
 * PCISyslogMessageIF provides a definition of the fields for audit trails
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/message/processor/AbstractSyslogMessageProcessor.java b/src/main/java/org/graylog2/syslog4j/impl/message/processor/AbstractSyslogMessageProcessor.java
similarity index 89%
rename from src/main/java/org/productivity/java/syslog4j/impl/message/processor/AbstractSyslogMessageProcessor.java
rename to src/main/java/org/graylog2/syslog4j/impl/message/processor/AbstractSyslogMessageProcessor.java
index b21c23f..744d31b 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/message/processor/AbstractSyslogMessageProcessor.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/message/processor/AbstractSyslogMessageProcessor.java
@@ -1,12 +1,12 @@
-package org.productivity.java.syslog4j.impl.message.processor;
+package org.graylog2.syslog4j.impl.message.processor;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
-import org.productivity.java.syslog4j.SyslogConstants;
-import org.productivity.java.syslog4j.SyslogMessageProcessorIF;
-import org.productivity.java.syslog4j.util.SyslogUtility;
+import org.graylog2.syslog4j.SyslogConstants;
+import org.graylog2.syslog4j.SyslogMessageProcessorIF;
+import org.graylog2.syslog4j.util.SyslogUtility;
 
 /**
 * AbstractSyslogMessageProcessor provides the ability to split a syslog message
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/message/processor/SyslogMessageProcessor.java b/src/main/java/org/graylog2/syslog4j/impl/message/processor/SyslogMessageProcessor.java
similarity index 92%
rename from src/main/java/org/productivity/java/syslog4j/impl/message/processor/SyslogMessageProcessor.java
rename to src/main/java/org/graylog2/syslog4j/impl/message/processor/SyslogMessageProcessor.java
index da3ce3d..ee4e43e 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/message/processor/SyslogMessageProcessor.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/message/processor/SyslogMessageProcessor.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j.impl.message.processor;
+package org.graylog2.syslog4j.impl.message.processor;
 
 
 /**
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/message/processor/structured/StructuredSyslogMessageProcessor.java b/src/main/java/org/graylog2/syslog4j/impl/message/processor/structured/StructuredSyslogMessageProcessor.java
similarity index 90%
rename from src/main/java/org/productivity/java/syslog4j/impl/message/processor/structured/StructuredSyslogMessageProcessor.java
rename to src/main/java/org/graylog2/syslog4j/impl/message/processor/structured/StructuredSyslogMessageProcessor.java
index 0d5b769..cdf452c 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/message/processor/structured/StructuredSyslogMessageProcessor.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/message/processor/structured/StructuredSyslogMessageProcessor.java
@@ -1,9 +1,9 @@
-package org.productivity.java.syslog4j.impl.message.processor.structured;
+package org.graylog2.syslog4j.impl.message.processor.structured;
 
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.ISODateTimeFormat;
-import org.productivity.java.syslog4j.impl.message.processor.AbstractSyslogMessageProcessor;
-import org.productivity.java.syslog4j.impl.message.structured.StructuredSyslogMessage;
+import org.graylog2.syslog4j.impl.message.processor.AbstractSyslogMessageProcessor;
+import org.graylog2.syslog4j.impl.message.structured.StructuredSyslogMessage;
 
 /**
  * SyslogStructuredMessageProcessor extends SyslogMessageProcessor's ability to
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/message/structured/StructuredSyslogMessage.java b/src/main/java/org/graylog2/syslog4j/impl/message/structured/StructuredSyslogMessage.java
similarity index 95%
rename from src/main/java/org/productivity/java/syslog4j/impl/message/structured/StructuredSyslogMessage.java
rename to src/main/java/org/graylog2/syslog4j/impl/message/structured/StructuredSyslogMessage.java
index 2f71909..cc257fe 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/message/structured/StructuredSyslogMessage.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/message/structured/StructuredSyslogMessage.java
@@ -1,12 +1,12 @@
-package org.productivity.java.syslog4j.impl.message.structured;
+package org.graylog2.syslog4j.impl.message.structured;
 
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import org.productivity.java.syslog4j.SyslogConstants;
-import org.productivity.java.syslog4j.impl.message.AbstractSyslogMessage;
+import org.graylog2.syslog4j.SyslogConstants;
+import org.graylog2.syslog4j.impl.message.AbstractSyslogMessage;
 
 /**
  * SyslogStructuredMessage extends AbstractSyslogMessage's ability to provide
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/message/structured/StructuredSyslogMessageIF.java b/src/main/java/org/graylog2/syslog4j/impl/message/structured/StructuredSyslogMessageIF.java
similarity index 79%
rename from src/main/java/org/productivity/java/syslog4j/impl/message/structured/StructuredSyslogMessageIF.java
rename to src/main/java/org/graylog2/syslog4j/impl/message/structured/StructuredSyslogMessageIF.java
index 480120c..8ece185 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/message/structured/StructuredSyslogMessageIF.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/message/structured/StructuredSyslogMessageIF.java
@@ -1,6 +1,6 @@
-package org.productivity.java.syslog4j.impl.message.structured;
+package org.graylog2.syslog4j.impl.message.structured;
 
-import org.productivity.java.syslog4j.SyslogMessageIF;
+import org.graylog2.syslog4j.SyslogMessageIF;
 
 /**
 * StructuredSyslogMessageIF is a "marker" interface to identify structured
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/multiple/MultipleSyslog.java b/src/main/java/org/graylog2/syslog4j/impl/multiple/MultipleSyslog.java
similarity index 88%
rename from src/main/java/org/productivity/java/syslog4j/impl/multiple/MultipleSyslog.java
rename to src/main/java/org/graylog2/syslog4j/impl/multiple/MultipleSyslog.java
index 70e632f..9b5f9b4 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/multiple/MultipleSyslog.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/multiple/MultipleSyslog.java
@@ -1,12 +1,12 @@
-package org.productivity.java.syslog4j.impl.multiple;
+package org.graylog2.syslog4j.impl.multiple;
 
-import org.productivity.java.syslog4j.Syslog;
-import org.productivity.java.syslog4j.SyslogConfigIF;
-import org.productivity.java.syslog4j.SyslogConstants;
-import org.productivity.java.syslog4j.SyslogIF;
-import org.productivity.java.syslog4j.SyslogMessageIF;
-import org.productivity.java.syslog4j.SyslogMessageProcessorIF;
-import org.productivity.java.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.Syslog;
+import org.graylog2.syslog4j.SyslogConfigIF;
+import org.graylog2.syslog4j.SyslogConstants;
+import org.graylog2.syslog4j.SyslogIF;
+import org.graylog2.syslog4j.SyslogMessageIF;
+import org.graylog2.syslog4j.SyslogMessageProcessorIF;
+import org.graylog2.syslog4j.SyslogRuntimeException;
 
 /**
 * MultipleSyslog is an aggregator Syslog implementation for allowing a single
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/multiple/MultipleSyslogConfig.java b/src/main/java/org/graylog2/syslog4j/impl/multiple/MultipleSyslogConfig.java
similarity index 92%
rename from src/main/java/org/productivity/java/syslog4j/impl/multiple/MultipleSyslogConfig.java
rename to src/main/java/org/graylog2/syslog4j/impl/multiple/MultipleSyslogConfig.java
index 44ec5f3..542e89d 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/multiple/MultipleSyslogConfig.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/multiple/MultipleSyslogConfig.java
@@ -1,13 +1,13 @@
-package org.productivity.java.syslog4j.impl.multiple;
+package org.graylog2.syslog4j.impl.multiple;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.productivity.java.syslog4j.SyslogBackLogHandlerIF;
-import org.productivity.java.syslog4j.SyslogConfigIF;
-import org.productivity.java.syslog4j.SyslogConstants;
-import org.productivity.java.syslog4j.SyslogMessageModifierIF;
-import org.productivity.java.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.SyslogBackLogHandlerIF;
+import org.graylog2.syslog4j.SyslogConfigIF;
+import org.graylog2.syslog4j.SyslogConstants;
+import org.graylog2.syslog4j.SyslogMessageModifierIF;
+import org.graylog2.syslog4j.SyslogRuntimeException;
 
 /**
 * MultipleSyslogConfig is a configuration Object for allowing a single
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/net/AbstractNetSyslog.java b/src/main/java/org/graylog2/syslog4j/impl/net/AbstractNetSyslog.java
similarity index 85%
rename from src/main/java/org/productivity/java/syslog4j/impl/net/AbstractNetSyslog.java
rename to src/main/java/org/graylog2/syslog4j/impl/net/AbstractNetSyslog.java
index 73a9b01..74a8e6c 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/net/AbstractNetSyslog.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/net/AbstractNetSyslog.java
@@ -1,10 +1,10 @@
-package org.productivity.java.syslog4j.impl.net;
+package org.graylog2.syslog4j.impl.net;
 
 import java.net.InetAddress;
 
-import org.productivity.java.syslog4j.SyslogRuntimeException;
-import org.productivity.java.syslog4j.impl.AbstractSyslog;
-import org.productivity.java.syslog4j.util.SyslogUtility;
+import org.graylog2.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.impl.AbstractSyslog;
+import org.graylog2.syslog4j.util.SyslogUtility;
 
 /**
 * AbstractNetSyslog is an abstract extension of AbstractSyslog
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/net/AbstractNetSyslogConfig.java b/src/main/java/org/graylog2/syslog4j/impl/net/AbstractNetSyslogConfig.java
similarity index 90%
rename from src/main/java/org/productivity/java/syslog4j/impl/net/AbstractNetSyslogConfig.java
rename to src/main/java/org/graylog2/syslog4j/impl/net/AbstractNetSyslogConfig.java
index c829b70..ec9935e 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/net/AbstractNetSyslogConfig.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/net/AbstractNetSyslogConfig.java
@@ -1,6 +1,6 @@
-package org.productivity.java.syslog4j.impl.net;
+package org.graylog2.syslog4j.impl.net;
 
-import org.productivity.java.syslog4j.impl.AbstractSyslogConfig;
+import org.graylog2.syslog4j.impl.AbstractSyslogConfig;
 
 /**
 * AbstractNetSyslogConfig is an abstract extension of AbstractSyslogConfig
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/net/AbstractNetSyslogConfigIF.java b/src/main/java/org/graylog2/syslog4j/impl/net/AbstractNetSyslogConfigIF.java
similarity index 82%
rename from src/main/java/org/productivity/java/syslog4j/impl/net/AbstractNetSyslogConfigIF.java
rename to src/main/java/org/graylog2/syslog4j/impl/net/AbstractNetSyslogConfigIF.java
index 17d7940..53a522e 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/net/AbstractNetSyslogConfigIF.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/net/AbstractNetSyslogConfigIF.java
@@ -1,6 +1,6 @@
-package org.productivity.java.syslog4j.impl.net;
+package org.graylog2.syslog4j.impl.net;
 
-import org.productivity.java.syslog4j.impl.AbstractSyslogConfigIF;
+import org.graylog2.syslog4j.impl.AbstractSyslogConfigIF;
 
 /**
 * AbstractNetSyslogConfigIF is a configuration interface supporting network-based
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/net/tcp/TCPNetSyslog.java b/src/main/java/org/graylog2/syslog4j/impl/net/tcp/TCPNetSyslog.java
similarity index 86%
rename from src/main/java/org/productivity/java/syslog4j/impl/net/tcp/TCPNetSyslog.java
rename to src/main/java/org/graylog2/syslog4j/impl/net/tcp/TCPNetSyslog.java
index 9d3e949..2e3da7c 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/net/tcp/TCPNetSyslog.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/net/tcp/TCPNetSyslog.java
@@ -1,8 +1,8 @@
-package org.productivity.java.syslog4j.impl.net.tcp;
+package org.graylog2.syslog4j.impl.net.tcp;
 
-import org.productivity.java.syslog4j.SyslogRuntimeException;
-import org.productivity.java.syslog4j.impl.AbstractSyslogWriter;
-import org.productivity.java.syslog4j.impl.net.AbstractNetSyslog;
+import org.graylog2.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.impl.AbstractSyslogWriter;
+import org.graylog2.syslog4j.impl.net.AbstractNetSyslog;
 
 /**
 * TCPNetSyslog is an extension of AbstractSyslog that provides support for
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/net/tcp/TCPNetSyslogConfig.java b/src/main/java/org/graylog2/syslog4j/impl/net/tcp/TCPNetSyslogConfig.java
similarity index 90%
rename from src/main/java/org/productivity/java/syslog4j/impl/net/tcp/TCPNetSyslogConfig.java
rename to src/main/java/org/graylog2/syslog4j/impl/net/tcp/TCPNetSyslogConfig.java
index 49d8436..b4fda09 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/net/tcp/TCPNetSyslogConfig.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/net/tcp/TCPNetSyslogConfig.java
@@ -1,8 +1,8 @@
-package org.productivity.java.syslog4j.impl.net.tcp;
+package org.graylog2.syslog4j.impl.net.tcp;
 
-import org.productivity.java.syslog4j.SyslogConstants;
-import org.productivity.java.syslog4j.impl.net.AbstractNetSyslogConfig;
-import org.productivity.java.syslog4j.util.SyslogUtility;
+import org.graylog2.syslog4j.SyslogConstants;
+import org.graylog2.syslog4j.impl.net.AbstractNetSyslogConfig;
+import org.graylog2.syslog4j.util.SyslogUtility;
 
 /**
 * TCPNetSyslogConfig is an extension of AbstractNetSyslogConfig that provides
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/net/tcp/TCPNetSyslogConfigIF.java b/src/main/java/org/graylog2/syslog4j/impl/net/tcp/TCPNetSyslogConfigIF.java
similarity index 88%
rename from src/main/java/org/productivity/java/syslog4j/impl/net/tcp/TCPNetSyslogConfigIF.java
rename to src/main/java/org/graylog2/syslog4j/impl/net/tcp/TCPNetSyslogConfigIF.java
index 82318ad..6c03af2 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/net/tcp/TCPNetSyslogConfigIF.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/net/tcp/TCPNetSyslogConfigIF.java
@@ -1,6 +1,6 @@
-package org.productivity.java.syslog4j.impl.net.tcp;
+package org.graylog2.syslog4j.impl.net.tcp;
 
-import org.productivity.java.syslog4j.impl.net.AbstractNetSyslogConfigIF;
+import org.graylog2.syslog4j.impl.net.AbstractNetSyslogConfigIF;
 
 /**
 * TCPNetSyslogConfigIF is a configuration interface supporting TCP/IP-based
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/net/tcp/TCPNetSyslogWriter.java b/src/main/java/org/graylog2/syslog4j/impl/net/tcp/TCPNetSyslogWriter.java
similarity index 90%
rename from src/main/java/org/productivity/java/syslog4j/impl/net/tcp/TCPNetSyslogWriter.java
rename to src/main/java/org/graylog2/syslog4j/impl/net/tcp/TCPNetSyslogWriter.java
index 3e178af..68ab39a 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/net/tcp/TCPNetSyslogWriter.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/net/tcp/TCPNetSyslogWriter.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j.impl.net.tcp;
+package org.graylog2.syslog4j.impl.net.tcp;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -7,11 +7,11 @@ import java.net.Socket;
 
 import javax.net.SocketFactory;
 
-import org.productivity.java.syslog4j.SyslogConstants;
-import org.productivity.java.syslog4j.SyslogRuntimeException;
-import org.productivity.java.syslog4j.impl.AbstractSyslog;
-import org.productivity.java.syslog4j.impl.AbstractSyslogWriter;
-import org.productivity.java.syslog4j.util.SyslogUtility;
+import org.graylog2.syslog4j.SyslogConstants;
+import org.graylog2.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.impl.AbstractSyslog;
+import org.graylog2.syslog4j.impl.AbstractSyslogWriter;
+import org.graylog2.syslog4j.util.SyslogUtility;
 
 /**
 * TCPNetSyslogWriter is an implementation of Runnable that supports sending
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/net/tcp/pool/PooledTCPNetSyslog.java b/src/main/java/org/graylog2/syslog4j/impl/net/tcp/pool/PooledTCPNetSyslog.java
similarity index 77%
rename from src/main/java/org/productivity/java/syslog4j/impl/net/tcp/pool/PooledTCPNetSyslog.java
rename to src/main/java/org/graylog2/syslog4j/impl/net/tcp/pool/PooledTCPNetSyslog.java
index c1f7884..ee4a475 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/net/tcp/pool/PooledTCPNetSyslog.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/net/tcp/pool/PooledTCPNetSyslog.java
@@ -1,10 +1,10 @@
-package org.productivity.java.syslog4j.impl.net.tcp.pool;
+package org.graylog2.syslog4j.impl.net.tcp.pool;
 
-import org.productivity.java.syslog4j.SyslogRuntimeException;
-import org.productivity.java.syslog4j.impl.AbstractSyslogWriter;
-import org.productivity.java.syslog4j.impl.net.tcp.TCPNetSyslog;
-import org.productivity.java.syslog4j.impl.pool.AbstractSyslogPoolFactory;
-import org.productivity.java.syslog4j.impl.pool.generic.GenericSyslogPoolFactory;
+import org.graylog2.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.impl.AbstractSyslogWriter;
+import org.graylog2.syslog4j.impl.net.tcp.TCPNetSyslog;
+import org.graylog2.syslog4j.impl.pool.AbstractSyslogPoolFactory;
+import org.graylog2.syslog4j.impl.pool.generic.GenericSyslogPoolFactory;
 
 /**
 * PooledTCPNetSyslog is an extension of TCPNetSyslog which provides support
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/net/tcp/pool/PooledTCPNetSyslogConfig.java b/src/main/java/org/graylog2/syslog4j/impl/net/tcp/pool/PooledTCPNetSyslogConfig.java
similarity index 92%
rename from src/main/java/org/productivity/java/syslog4j/impl/net/tcp/pool/PooledTCPNetSyslogConfig.java
rename to src/main/java/org/graylog2/syslog4j/impl/net/tcp/pool/PooledTCPNetSyslogConfig.java
index 91a1ba4..f4ea8e1 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/net/tcp/pool/PooledTCPNetSyslogConfig.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/net/tcp/pool/PooledTCPNetSyslogConfig.java
@@ -1,8 +1,8 @@
-package org.productivity.java.syslog4j.impl.net.tcp.pool;
+package org.graylog2.syslog4j.impl.net.tcp.pool;
 
 import org.apache.commons.pool.impl.GenericObjectPool;
-import org.productivity.java.syslog4j.SyslogPoolConfigIF;
-import org.productivity.java.syslog4j.impl.net.tcp.TCPNetSyslogConfig;
+import org.graylog2.syslog4j.SyslogPoolConfigIF;
+import org.graylog2.syslog4j.impl.net.tcp.TCPNetSyslogConfig;
 
 /**
 * NetSyslogPoolFactory is an implementation of SyslogPoolConfigIF
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/net/tcp/ssl/SSLTCPNetSyslog.java b/src/main/java/org/graylog2/syslog4j/impl/net/tcp/ssl/SSLTCPNetSyslog.java
similarity index 87%
rename from src/main/java/org/productivity/java/syslog4j/impl/net/tcp/ssl/SSLTCPNetSyslog.java
rename to src/main/java/org/graylog2/syslog4j/impl/net/tcp/ssl/SSLTCPNetSyslog.java
index bb52c92..0cf6867 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/net/tcp/ssl/SSLTCPNetSyslog.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/net/tcp/ssl/SSLTCPNetSyslog.java
@@ -1,7 +1,7 @@
-package org.productivity.java.syslog4j.impl.net.tcp.ssl;
+package org.graylog2.syslog4j.impl.net.tcp.ssl;
 
-import org.productivity.java.syslog4j.SyslogRuntimeException;
-import org.productivity.java.syslog4j.impl.net.tcp.TCPNetSyslog;
+import org.graylog2.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.impl.net.tcp.TCPNetSyslog;
 
 /**
 * SSLTCPNetSyslog is an extension of AbstractSyslog that provides support for
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/net/tcp/ssl/SSLTCPNetSyslogConfig.java b/src/main/java/org/graylog2/syslog4j/impl/net/tcp/ssl/SSLTCPNetSyslogConfig.java
similarity index 90%
rename from src/main/java/org/productivity/java/syslog4j/impl/net/tcp/ssl/SSLTCPNetSyslogConfig.java
rename to src/main/java/org/graylog2/syslog4j/impl/net/tcp/ssl/SSLTCPNetSyslogConfig.java
index d1cf7de..a88a1bd 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/net/tcp/ssl/SSLTCPNetSyslogConfig.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/net/tcp/ssl/SSLTCPNetSyslogConfig.java
@@ -1,6 +1,6 @@
-package org.productivity.java.syslog4j.impl.net.tcp.ssl;
+package org.graylog2.syslog4j.impl.net.tcp.ssl;
 
-import org.productivity.java.syslog4j.impl.net.tcp.TCPNetSyslogConfig;
+import org.graylog2.syslog4j.impl.net.tcp.TCPNetSyslogConfig;
 
 /**
 * SSLTCPNetSyslogConfig is an extension of TCPNetSyslogConfig that provides
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/net/tcp/ssl/SSLTCPNetSyslogConfigIF.java b/src/main/java/org/graylog2/syslog4j/impl/net/tcp/ssl/SSLTCPNetSyslogConfigIF.java
similarity index 85%
rename from src/main/java/org/productivity/java/syslog4j/impl/net/tcp/ssl/SSLTCPNetSyslogConfigIF.java
rename to src/main/java/org/graylog2/syslog4j/impl/net/tcp/ssl/SSLTCPNetSyslogConfigIF.java
index 967631a..6065354 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/net/tcp/ssl/SSLTCPNetSyslogConfigIF.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/net/tcp/ssl/SSLTCPNetSyslogConfigIF.java
@@ -1,6 +1,6 @@
-package org.productivity.java.syslog4j.impl.net.tcp.ssl;
+package org.graylog2.syslog4j.impl.net.tcp.ssl;
 
-import org.productivity.java.syslog4j.impl.net.tcp.TCPNetSyslogConfigIF;
+import org.graylog2.syslog4j.impl.net.tcp.TCPNetSyslogConfigIF;
 
 /**
 * SSLTCPNetSyslogConfigIF is a configuration interface supporting TCP/IP-based
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/net/tcp/ssl/SSLTCPNetSyslogWriter.java b/src/main/java/org/graylog2/syslog4j/impl/net/tcp/ssl/SSLTCPNetSyslogWriter.java
similarity index 85%
rename from src/main/java/org/productivity/java/syslog4j/impl/net/tcp/ssl/SSLTCPNetSyslogWriter.java
rename to src/main/java/org/graylog2/syslog4j/impl/net/tcp/ssl/SSLTCPNetSyslogWriter.java
index 61a9de0..c60832f 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/net/tcp/ssl/SSLTCPNetSyslogWriter.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/net/tcp/ssl/SSLTCPNetSyslogWriter.java
@@ -1,9 +1,9 @@
-package org.productivity.java.syslog4j.impl.net.tcp.ssl;
+package org.graylog2.syslog4j.impl.net.tcp.ssl;
 
 import javax.net.SocketFactory;
 import javax.net.ssl.SSLSocketFactory;
 
-import org.productivity.java.syslog4j.impl.net.tcp.TCPNetSyslogWriter;
+import org.graylog2.syslog4j.impl.net.tcp.TCPNetSyslogWriter;
 
 /**
 * SSLTCPNetSyslogWriter is an implementation of Runnable that supports sending
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/net/tcp/ssl/pool/PooledSSLTCPNetSyslogConfig.java b/src/main/java/org/graylog2/syslog4j/impl/net/tcp/ssl/pool/PooledSSLTCPNetSyslogConfig.java
similarity index 82%
rename from src/main/java/org/productivity/java/syslog4j/impl/net/tcp/ssl/pool/PooledSSLTCPNetSyslogConfig.java
rename to src/main/java/org/graylog2/syslog4j/impl/net/tcp/ssl/pool/PooledSSLTCPNetSyslogConfig.java
index fb3f3fe..4591070 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/net/tcp/ssl/pool/PooledSSLTCPNetSyslogConfig.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/net/tcp/ssl/pool/PooledSSLTCPNetSyslogConfig.java
@@ -1,9 +1,9 @@
-package org.productivity.java.syslog4j.impl.net.tcp.ssl.pool;
+package org.graylog2.syslog4j.impl.net.tcp.ssl.pool;
 
-import org.productivity.java.syslog4j.impl.net.tcp.pool.PooledTCPNetSyslogConfig;
-import org.productivity.java.syslog4j.impl.net.tcp.ssl.SSLTCPNetSyslog;
-import org.productivity.java.syslog4j.impl.net.tcp.ssl.SSLTCPNetSyslogConfigIF;
-import org.productivity.java.syslog4j.impl.net.tcp.ssl.SSLTCPNetSyslogWriter;
+import org.graylog2.syslog4j.impl.net.tcp.pool.PooledTCPNetSyslogConfig;
+import org.graylog2.syslog4j.impl.net.tcp.ssl.SSLTCPNetSyslog;
+import org.graylog2.syslog4j.impl.net.tcp.ssl.SSLTCPNetSyslogConfigIF;
+import org.graylog2.syslog4j.impl.net.tcp.ssl.SSLTCPNetSyslogWriter;
 
 /**
 * PooledSSLTCPNetSyslogConfig is an extension of PooledTCPNetSyslogConfig
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/net/udp/UDPNetSyslog.java b/src/main/java/org/graylog2/syslog4j/impl/net/udp/UDPNetSyslog.java
similarity index 87%
rename from src/main/java/org/productivity/java/syslog4j/impl/net/udp/UDPNetSyslog.java
rename to src/main/java/org/graylog2/syslog4j/impl/net/udp/UDPNetSyslog.java
index 9b6f813..aea7a44 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/net/udp/UDPNetSyslog.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/net/udp/UDPNetSyslog.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j.impl.net.udp;
+package org.graylog2.syslog4j.impl.net.udp;
 
 import java.io.IOException;
 import java.net.DatagramPacket;
@@ -6,9 +6,9 @@ import java.net.DatagramSocket;
 import java.net.InetAddress;
 import java.net.SocketException;
 
-import org.productivity.java.syslog4j.SyslogRuntimeException;
-import org.productivity.java.syslog4j.impl.AbstractSyslogWriter;
-import org.productivity.java.syslog4j.impl.net.AbstractNetSyslog;
+import org.graylog2.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.impl.AbstractSyslogWriter;
+import org.graylog2.syslog4j.impl.net.AbstractNetSyslog;
 
 /**
 * UDPNetSyslog is an extension of AbstractSyslog that provides support for
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/net/udp/UDPNetSyslogConfig.java b/src/main/java/org/graylog2/syslog4j/impl/net/udp/UDPNetSyslogConfig.java
similarity index 86%
rename from src/main/java/org/productivity/java/syslog4j/impl/net/udp/UDPNetSyslogConfig.java
rename to src/main/java/org/graylog2/syslog4j/impl/net/udp/UDPNetSyslogConfig.java
index 9ab98e4..4310a45 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/net/udp/UDPNetSyslogConfig.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/net/udp/UDPNetSyslogConfig.java
@@ -1,6 +1,6 @@
-package org.productivity.java.syslog4j.impl.net.udp;
+package org.graylog2.syslog4j.impl.net.udp;
 
-import org.productivity.java.syslog4j.impl.net.AbstractNetSyslogConfig;
+import org.graylog2.syslog4j.impl.net.AbstractNetSyslogConfig;
 
 /**
 * UDPNetSyslogConfig is an extension of AbstractNetSyslogConfig that provides
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/pool/AbstractSyslogPoolFactory.java b/src/main/java/org/graylog2/syslog4j/impl/pool/AbstractSyslogPoolFactory.java
similarity index 82%
rename from src/main/java/org/productivity/java/syslog4j/impl/pool/AbstractSyslogPoolFactory.java
rename to src/main/java/org/graylog2/syslog4j/impl/pool/AbstractSyslogPoolFactory.java
index 14d3dfe..cb1a0c5 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/pool/AbstractSyslogPoolFactory.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/pool/AbstractSyslogPoolFactory.java
@@ -1,11 +1,11 @@
-package org.productivity.java.syslog4j.impl.pool;
+package org.graylog2.syslog4j.impl.pool;
 
 import org.apache.commons.pool.BasePoolableObjectFactory;
 import org.apache.commons.pool.ObjectPool;
-import org.productivity.java.syslog4j.SyslogRuntimeException;
-import org.productivity.java.syslog4j.impl.AbstractSyslog;
-import org.productivity.java.syslog4j.impl.AbstractSyslogConfigIF;
-import org.productivity.java.syslog4j.impl.AbstractSyslogWriter;
+import org.graylog2.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.impl.AbstractSyslog;
+import org.graylog2.syslog4j.impl.AbstractSyslogConfigIF;
+import org.graylog2.syslog4j.impl.AbstractSyslogWriter;
 
 /**
 * AbstractSyslogPoolFactory is an abstract implementation of the Apache Commons Pool
@@ -17,7 +17,7 @@ import org.productivity.java.syslog4j.impl.AbstractSyslogWriter;
 * 
 * @author &lt;syslog4j@productivity.org&gt;
 * @version $Id: AbstractSyslogPoolFactory.java,v 1.5 2008/12/10 04:15:11 cvs Exp $
-* @see org.productivity.java.syslog4j.impl.pool.generic.GenericSyslogPoolFactory
+* @see org.graylog2.syslog4j.impl.pool.generic.GenericSyslogPoolFactory
 */
 public abstract class AbstractSyslogPoolFactory extends BasePoolableObjectFactory {
 	private static final long serialVersionUID = -7441569603980981508L;
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/pool/generic/GenericSyslogPoolFactory.java b/src/main/java/org/graylog2/syslog4j/impl/pool/generic/GenericSyslogPoolFactory.java
similarity index 87%
rename from src/main/java/org/productivity/java/syslog4j/impl/pool/generic/GenericSyslogPoolFactory.java
rename to src/main/java/org/graylog2/syslog4j/impl/pool/generic/GenericSyslogPoolFactory.java
index 039eaf7..f291114 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/pool/generic/GenericSyslogPoolFactory.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/pool/generic/GenericSyslogPoolFactory.java
@@ -1,10 +1,10 @@
-package org.productivity.java.syslog4j.impl.pool.generic;
+package org.graylog2.syslog4j.impl.pool.generic;
 
 import org.apache.commons.pool.ObjectPool;
 import org.apache.commons.pool.impl.GenericObjectPool;
-import org.productivity.java.syslog4j.SyslogPoolConfigIF;
-import org.productivity.java.syslog4j.SyslogRuntimeException;
-import org.productivity.java.syslog4j.impl.pool.AbstractSyslogPoolFactory;
+import org.graylog2.syslog4j.SyslogPoolConfigIF;
+import org.graylog2.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.impl.pool.AbstractSyslogPoolFactory;
 
 /**
 * GenericSyslogPoolFactory is an implementation of the Apache Commons Pool
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/unix/UnixSyslog.java b/src/main/java/org/graylog2/syslog4j/impl/unix/UnixSyslog.java
similarity index 87%
rename from src/main/java/org/productivity/java/syslog4j/impl/unix/UnixSyslog.java
rename to src/main/java/org/graylog2/syslog4j/impl/unix/UnixSyslog.java
index b5e56af..e3e31ae 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/unix/UnixSyslog.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/unix/UnixSyslog.java
@@ -1,10 +1,10 @@
-package org.productivity.java.syslog4j.impl.unix;
+package org.graylog2.syslog4j.impl.unix;
 
-import org.productivity.java.syslog4j.SyslogMessageProcessorIF;
-import org.productivity.java.syslog4j.SyslogRuntimeException;
-import org.productivity.java.syslog4j.impl.AbstractSyslog;
-import org.productivity.java.syslog4j.impl.AbstractSyslogWriter;
-import org.productivity.java.syslog4j.util.OSDetectUtility;
+import org.graylog2.syslog4j.SyslogMessageProcessorIF;
+import org.graylog2.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.impl.AbstractSyslog;
+import org.graylog2.syslog4j.impl.AbstractSyslogWriter;
+import org.graylog2.syslog4j.util.OSDetectUtility;
 
 import com.sun.jna.Library;
 import com.sun.jna.Memory;
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/unix/UnixSyslogConfig.java b/src/main/java/org/graylog2/syslog4j/impl/unix/UnixSyslogConfig.java
similarity index 88%
rename from src/main/java/org/productivity/java/syslog4j/impl/unix/UnixSyslogConfig.java
rename to src/main/java/org/graylog2/syslog4j/impl/unix/UnixSyslogConfig.java
index 7db7c82..fc080b4 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/unix/UnixSyslogConfig.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/unix/UnixSyslogConfig.java
@@ -1,7 +1,7 @@
-package org.productivity.java.syslog4j.impl.unix;
+package org.graylog2.syslog4j.impl.unix;
 
-import org.productivity.java.syslog4j.SyslogRuntimeException;
-import org.productivity.java.syslog4j.impl.AbstractSyslogConfig;
+import org.graylog2.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.impl.AbstractSyslogConfig;
 
 /**
 * UnixSyslogConfig is an extension of AbstractNetSyslogConfig that provides
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/unix/socket/UnixSocketSyslog.java b/src/main/java/org/graylog2/syslog4j/impl/unix/socket/UnixSocketSyslog.java
similarity index 89%
rename from src/main/java/org/productivity/java/syslog4j/impl/unix/socket/UnixSocketSyslog.java
rename to src/main/java/org/graylog2/syslog4j/impl/unix/socket/UnixSocketSyslog.java
index eee1581..0435f0d 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/unix/socket/UnixSocketSyslog.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/unix/socket/UnixSocketSyslog.java
@@ -1,11 +1,11 @@
-package org.productivity.java.syslog4j.impl.unix.socket;
+package org.graylog2.syslog4j.impl.unix.socket;
 
 import java.nio.ByteBuffer;
 
-import org.productivity.java.syslog4j.SyslogRuntimeException;
-import org.productivity.java.syslog4j.impl.AbstractSyslog;
-import org.productivity.java.syslog4j.impl.AbstractSyslogWriter;
-import org.productivity.java.syslog4j.util.OSDetectUtility;
+import org.graylog2.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.impl.AbstractSyslog;
+import org.graylog2.syslog4j.impl.AbstractSyslogWriter;
+import org.graylog2.syslog4j.util.OSDetectUtility;
 
 import com.sun.jna.Library;
 import com.sun.jna.Native;
diff --git a/src/main/java/org/productivity/java/syslog4j/impl/unix/socket/UnixSocketSyslogConfig.java b/src/main/java/org/graylog2/syslog4j/impl/unix/socket/UnixSocketSyslogConfig.java
similarity index 91%
rename from src/main/java/org/productivity/java/syslog4j/impl/unix/socket/UnixSocketSyslogConfig.java
rename to src/main/java/org/graylog2/syslog4j/impl/unix/socket/UnixSocketSyslogConfig.java
index 65effb5..0381567 100644
--- a/src/main/java/org/productivity/java/syslog4j/impl/unix/socket/UnixSocketSyslogConfig.java
+++ b/src/main/java/org/graylog2/syslog4j/impl/unix/socket/UnixSocketSyslogConfig.java
@@ -1,7 +1,7 @@
-package org.productivity.java.syslog4j.impl.unix.socket;
+package org.graylog2.syslog4j.impl.unix.socket;
 
-import org.productivity.java.syslog4j.SyslogRuntimeException;
-import org.productivity.java.syslog4j.impl.AbstractSyslogConfig;
+import org.graylog2.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.impl.AbstractSyslogConfig;
 
 /**
 * UnixSocketSyslogConfig is an extension of AbstractNetSyslogConfig that provides
diff --git a/src/main/java/org/productivity/java/syslog4j/server/SyslogServer.java b/src/main/java/org/graylog2/syslog4j/server/SyslogServer.java
similarity index 90%
rename from src/main/java/org/productivity/java/syslog4j/server/SyslogServer.java
rename to src/main/java/org/graylog2/syslog4j/server/SyslogServer.java
index 19a70ed..4e05fb9 100644
--- a/src/main/java/org/productivity/java/syslog4j/server/SyslogServer.java
+++ b/src/main/java/org/graylog2/syslog4j/server/SyslogServer.java
@@ -1,16 +1,16 @@
-package org.productivity.java.syslog4j.server;
+package org.graylog2.syslog4j.server;
 
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import org.productivity.java.syslog4j.Syslog4jVersion;
-import org.productivity.java.syslog4j.SyslogConstants;
-import org.productivity.java.syslog4j.SyslogRuntimeException;
-import org.productivity.java.syslog4j.server.impl.net.tcp.TCPNetSyslogServerConfig;
-import org.productivity.java.syslog4j.server.impl.net.udp.UDPNetSyslogServerConfig;
-import org.productivity.java.syslog4j.util.SyslogUtility;
+import org.graylog2.syslog4j.Syslog4jVersion;
+import org.graylog2.syslog4j.SyslogConstants;
+import org.graylog2.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.server.impl.net.tcp.TCPNetSyslogServerConfig;
+import org.graylog2.syslog4j.server.impl.net.udp.UDPNetSyslogServerConfig;
+import org.graylog2.syslog4j.util.SyslogUtility;
 
 /**
  * This class provides a Singleton-based interface for Syslog4j
diff --git a/src/main/java/org/productivity/java/syslog4j/server/SyslogServerConfigIF.java b/src/main/java/org/graylog2/syslog4j/server/SyslogServerConfigIF.java
similarity index 85%
rename from src/main/java/org/productivity/java/syslog4j/server/SyslogServerConfigIF.java
rename to src/main/java/org/graylog2/syslog4j/server/SyslogServerConfigIF.java
index f0e5491..28e201c 100644
--- a/src/main/java/org/productivity/java/syslog4j/server/SyslogServerConfigIF.java
+++ b/src/main/java/org/graylog2/syslog4j/server/SyslogServerConfigIF.java
@@ -1,10 +1,10 @@
-package org.productivity.java.syslog4j.server;
+package org.graylog2.syslog4j.server;
 
 import java.util.List;
 
-import org.productivity.java.syslog4j.SyslogCharSetIF;
-import org.productivity.java.syslog4j.SyslogConstants;
-import org.productivity.java.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.SyslogCharSetIF;
+import org.graylog2.syslog4j.SyslogConstants;
+import org.graylog2.syslog4j.SyslogRuntimeException;
 
 /**
 * SyslogServerConfigIF provides a common, extensible configuration interface for all
diff --git a/src/main/java/org/productivity/java/syslog4j/server/SyslogServerEventHandlerIF.java b/src/main/java/org/graylog2/syslog4j/server/SyslogServerEventHandlerIF.java
similarity index 79%
rename from src/main/java/org/productivity/java/syslog4j/server/SyslogServerEventHandlerIF.java
rename to src/main/java/org/graylog2/syslog4j/server/SyslogServerEventHandlerIF.java
index 5d60558..8624789 100644
--- a/src/main/java/org/productivity/java/syslog4j/server/SyslogServerEventHandlerIF.java
+++ b/src/main/java/org/graylog2/syslog4j/server/SyslogServerEventHandlerIF.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j.server;
+package org.graylog2.syslog4j.server;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/org/productivity/java/syslog4j/server/SyslogServerEventIF.java b/src/main/java/org/graylog2/syslog4j/server/SyslogServerEventIF.java
similarity index 88%
rename from src/main/java/org/productivity/java/syslog4j/server/SyslogServerEventIF.java
rename to src/main/java/org/graylog2/syslog4j/server/SyslogServerEventIF.java
index cc578e0..c64a833 100644
--- a/src/main/java/org/productivity/java/syslog4j/server/SyslogServerEventIF.java
+++ b/src/main/java/org/graylog2/syslog4j/server/SyslogServerEventIF.java
@@ -1,8 +1,8 @@
-package org.productivity.java.syslog4j.server;
+package org.graylog2.syslog4j.server;
 
 import java.util.Date;
 
-import org.productivity.java.syslog4j.SyslogCharSetIF;
+import org.graylog2.syslog4j.SyslogCharSetIF;
 
 /**
 * SyslogServerEventIF provides an extensible interface for Syslog4j
diff --git a/src/main/java/org/productivity/java/syslog4j/server/SyslogServerIF.java b/src/main/java/org/graylog2/syslog4j/server/SyslogServerIF.java
similarity index 85%
rename from src/main/java/org/productivity/java/syslog4j/server/SyslogServerIF.java
rename to src/main/java/org/graylog2/syslog4j/server/SyslogServerIF.java
index 42f4433..2b1e7a3 100644
--- a/src/main/java/org/productivity/java/syslog4j/server/SyslogServerIF.java
+++ b/src/main/java/org/graylog2/syslog4j/server/SyslogServerIF.java
@@ -1,6 +1,6 @@
-package org.productivity.java.syslog4j.server;
+package org.graylog2.syslog4j.server;
 
-import org.productivity.java.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.SyslogRuntimeException;
 
 /**
 * SyslogServerIF provides a common interface for all Syslog4j server implementations.
diff --git a/src/main/java/org/productivity/java/syslog4j/server/SyslogServerMain.java b/src/main/java/org/graylog2/syslog4j/server/SyslogServerMain.java
similarity index 90%
rename from src/main/java/org/productivity/java/syslog4j/server/SyslogServerMain.java
rename to src/main/java/org/graylog2/syslog4j/server/SyslogServerMain.java
index 6637f94..3c396de 100644
--- a/src/main/java/org/productivity/java/syslog4j/server/SyslogServerMain.java
+++ b/src/main/java/org/graylog2/syslog4j/server/SyslogServerMain.java
@@ -1,9 +1,9 @@
-package org.productivity.java.syslog4j.server;
+package org.graylog2.syslog4j.server;
 
-import org.productivity.java.syslog4j.server.impl.event.printstream.FileSyslogServerEventHandler;
-import org.productivity.java.syslog4j.server.impl.event.printstream.SystemOutSyslogServerEventHandler;
-import org.productivity.java.syslog4j.server.impl.net.tcp.TCPNetSyslogServerConfigIF;
-import org.productivity.java.syslog4j.util.SyslogUtility;
+import org.graylog2.syslog4j.server.impl.event.printstream.FileSyslogServerEventHandler;
+import org.graylog2.syslog4j.server.impl.event.printstream.SystemOutSyslogServerEventHandler;
+import org.graylog2.syslog4j.server.impl.net.tcp.TCPNetSyslogServerConfigIF;
+import org.graylog2.syslog4j.util.SyslogUtility;
 
 /**
  * This class provides a command-line interface for Syslog4j
diff --git a/src/main/java/org/productivity/java/syslog4j/server/SyslogServerSessionEventHandlerIF.java b/src/main/java/org/graylog2/syslog4j/server/SyslogServerSessionEventHandlerIF.java
similarity index 90%
rename from src/main/java/org/productivity/java/syslog4j/server/SyslogServerSessionEventHandlerIF.java
rename to src/main/java/org/graylog2/syslog4j/server/SyslogServerSessionEventHandlerIF.java
index f1b7374..a9790bd 100644
--- a/src/main/java/org/productivity/java/syslog4j/server/SyslogServerSessionEventHandlerIF.java
+++ b/src/main/java/org/graylog2/syslog4j/server/SyslogServerSessionEventHandlerIF.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j.server;
+package org.graylog2.syslog4j.server;
 
 import java.net.SocketAddress;
 
diff --git a/src/main/java/org/productivity/java/syslog4j/server/SyslogServerSessionlessEventHandlerIF.java b/src/main/java/org/graylog2/syslog4j/server/SyslogServerSessionlessEventHandlerIF.java
similarity index 92%
rename from src/main/java/org/productivity/java/syslog4j/server/SyslogServerSessionlessEventHandlerIF.java
rename to src/main/java/org/graylog2/syslog4j/server/SyslogServerSessionlessEventHandlerIF.java
index e9c2bb2..ccdd5db 100644
--- a/src/main/java/org/productivity/java/syslog4j/server/SyslogServerSessionlessEventHandlerIF.java
+++ b/src/main/java/org/graylog2/syslog4j/server/SyslogServerSessionlessEventHandlerIF.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j.server;
+package org.graylog2.syslog4j.server;
 
 import java.net.SocketAddress;
 
diff --git a/src/main/java/org/productivity/java/syslog4j/server/impl/AbstractSyslogServer.java b/src/main/java/org/graylog2/syslog4j/server/impl/AbstractSyslogServer.java
similarity index 89%
rename from src/main/java/org/productivity/java/syslog4j/server/impl/AbstractSyslogServer.java
rename to src/main/java/org/graylog2/syslog4j/server/impl/AbstractSyslogServer.java
index d8cc44b..2b6f648 100644
--- a/src/main/java/org/productivity/java/syslog4j/server/impl/AbstractSyslogServer.java
+++ b/src/main/java/org/graylog2/syslog4j/server/impl/AbstractSyslogServer.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j.server.impl;
+package org.graylog2.syslog4j.server.impl;
 
 import java.net.DatagramPacket;
 import java.net.InetAddress;
@@ -9,17 +9,17 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.productivity.java.syslog4j.SyslogCharSetIF;
-import org.productivity.java.syslog4j.SyslogRuntimeException;
-import org.productivity.java.syslog4j.server.SyslogServerConfigIF;
-import org.productivity.java.syslog4j.server.SyslogServerEventHandlerIF;
-import org.productivity.java.syslog4j.server.SyslogServerEventIF;
-import org.productivity.java.syslog4j.server.SyslogServerIF;
-import org.productivity.java.syslog4j.server.SyslogServerSessionEventHandlerIF;
-import org.productivity.java.syslog4j.server.SyslogServerSessionlessEventHandlerIF;
-import org.productivity.java.syslog4j.server.impl.event.SyslogServerEvent;
-import org.productivity.java.syslog4j.server.impl.event.structured.StructuredSyslogServerEvent;
-import org.productivity.java.syslog4j.util.SyslogUtility;
+import org.graylog2.syslog4j.SyslogCharSetIF;
+import org.graylog2.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.server.SyslogServerConfigIF;
+import org.graylog2.syslog4j.server.SyslogServerEventHandlerIF;
+import org.graylog2.syslog4j.server.SyslogServerEventIF;
+import org.graylog2.syslog4j.server.SyslogServerIF;
+import org.graylog2.syslog4j.server.SyslogServerSessionEventHandlerIF;
+import org.graylog2.syslog4j.server.SyslogServerSessionlessEventHandlerIF;
+import org.graylog2.syslog4j.server.impl.event.SyslogServerEvent;
+import org.graylog2.syslog4j.server.impl.event.structured.StructuredSyslogServerEvent;
+import org.graylog2.syslog4j.util.SyslogUtility;
 
 /**
 * AbstractSyslogServer provides a base abstract implementation of the SyslogServerIF.
diff --git a/src/main/java/org/productivity/java/syslog4j/server/impl/AbstractSyslogServerConfig.java b/src/main/java/org/graylog2/syslog4j/server/impl/AbstractSyslogServerConfig.java
similarity index 88%
rename from src/main/java/org/productivity/java/syslog4j/server/impl/AbstractSyslogServerConfig.java
rename to src/main/java/org/graylog2/syslog4j/server/impl/AbstractSyslogServerConfig.java
index c999453..cd20d8d 100644
--- a/src/main/java/org/productivity/java/syslog4j/server/impl/AbstractSyslogServerConfig.java
+++ b/src/main/java/org/graylog2/syslog4j/server/impl/AbstractSyslogServerConfig.java
@@ -1,11 +1,11 @@
-package org.productivity.java.syslog4j.server.impl;
+package org.graylog2.syslog4j.server.impl;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.productivity.java.syslog4j.SyslogConstants;
-import org.productivity.java.syslog4j.server.SyslogServerConfigIF;
-import org.productivity.java.syslog4j.server.SyslogServerEventHandlerIF;
+import org.graylog2.syslog4j.SyslogConstants;
+import org.graylog2.syslog4j.server.SyslogServerConfigIF;
+import org.graylog2.syslog4j.server.SyslogServerEventHandlerIF;
 
 /**
 * AbstractSyslogServerConfig provides a base abstract implementation of the SyslogServerConfigIF
diff --git a/src/main/java/org/productivity/java/syslog4j/server/impl/event/SyslogServerEvent.java b/src/main/java/org/graylog2/syslog4j/server/impl/event/SyslogServerEvent.java
similarity index 92%
rename from src/main/java/org/productivity/java/syslog4j/server/impl/event/SyslogServerEvent.java
rename to src/main/java/org/graylog2/syslog4j/server/impl/event/SyslogServerEvent.java
index bd63bde..8bee401 100644
--- a/src/main/java/org/productivity/java/syslog4j/server/impl/event/SyslogServerEvent.java
+++ b/src/main/java/org/graylog2/syslog4j/server/impl/event/SyslogServerEvent.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j.server.impl.event;
+package org.graylog2.syslog4j.server.impl.event;
 
 import java.net.InetAddress;
 import java.text.DateFormat;
@@ -7,9 +7,9 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 
-import org.productivity.java.syslog4j.SyslogConstants;
-import org.productivity.java.syslog4j.server.SyslogServerEventIF;
-import org.productivity.java.syslog4j.util.SyslogUtility;
+import org.graylog2.syslog4j.SyslogConstants;
+import org.graylog2.syslog4j.server.SyslogServerEventIF;
+import org.graylog2.syslog4j.util.SyslogUtility;
 
 /**
 * SyslogServerEvent provides an implementation of the SyslogServerEventIF interface.
diff --git a/src/main/java/org/productivity/java/syslog4j/server/impl/event/printstream/FileSyslogServerEventHandler.java b/src/main/java/org/graylog2/syslog4j/server/impl/event/printstream/FileSyslogServerEventHandler.java
similarity index 89%
rename from src/main/java/org/productivity/java/syslog4j/server/impl/event/printstream/FileSyslogServerEventHandler.java
rename to src/main/java/org/graylog2/syslog4j/server/impl/event/printstream/FileSyslogServerEventHandler.java
index 7bf53b4..4747a8a 100644
--- a/src/main/java/org/productivity/java/syslog4j/server/impl/event/printstream/FileSyslogServerEventHandler.java
+++ b/src/main/java/org/graylog2/syslog4j/server/impl/event/printstream/FileSyslogServerEventHandler.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j.server.impl.event.printstream;
+package org.graylog2.syslog4j.server.impl.event.printstream;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/src/main/java/org/productivity/java/syslog4j/server/impl/event/printstream/PrintStreamSyslogServerEventHandler.java b/src/main/java/org/graylog2/syslog4j/server/impl/event/printstream/PrintStreamSyslogServerEventHandler.java
similarity index 82%
rename from src/main/java/org/productivity/java/syslog4j/server/impl/event/printstream/PrintStreamSyslogServerEventHandler.java
rename to src/main/java/org/graylog2/syslog4j/server/impl/event/printstream/PrintStreamSyslogServerEventHandler.java
index d161916..e11336d 100644
--- a/src/main/java/org/productivity/java/syslog4j/server/impl/event/printstream/PrintStreamSyslogServerEventHandler.java
+++ b/src/main/java/org/graylog2/syslog4j/server/impl/event/printstream/PrintStreamSyslogServerEventHandler.java
@@ -1,13 +1,13 @@
-package org.productivity.java.syslog4j.server.impl.event.printstream;
+package org.graylog2.syslog4j.server.impl.event.printstream;
 
 import java.io.PrintStream;
 import java.net.SocketAddress;
 import java.util.Date;
 
-import org.productivity.java.syslog4j.server.SyslogServerEventIF;
-import org.productivity.java.syslog4j.server.SyslogServerIF;
-import org.productivity.java.syslog4j.server.SyslogServerSessionEventHandlerIF;
-import org.productivity.java.syslog4j.util.SyslogUtility;
+import org.graylog2.syslog4j.server.SyslogServerEventIF;
+import org.graylog2.syslog4j.server.SyslogServerIF;
+import org.graylog2.syslog4j.server.SyslogServerSessionEventHandlerIF;
+import org.graylog2.syslog4j.util.SyslogUtility;
 
 /**
 * SystemOutSyslogServerEventHandler provides a simple example implementation
diff --git a/src/main/java/org/productivity/java/syslog4j/server/impl/event/printstream/SystemErrSyslogServerEventHandler.java b/src/main/java/org/graylog2/syslog4j/server/impl/event/printstream/SystemErrSyslogServerEventHandler.java
similarity index 68%
rename from src/main/java/org/productivity/java/syslog4j/server/impl/event/printstream/SystemErrSyslogServerEventHandler.java
rename to src/main/java/org/graylog2/syslog4j/server/impl/event/printstream/SystemErrSyslogServerEventHandler.java
index e61052e..744cce6 100644
--- a/src/main/java/org/productivity/java/syslog4j/server/impl/event/printstream/SystemErrSyslogServerEventHandler.java
+++ b/src/main/java/org/graylog2/syslog4j/server/impl/event/printstream/SystemErrSyslogServerEventHandler.java
@@ -1,6 +1,6 @@
-package org.productivity.java.syslog4j.server.impl.event.printstream;
+package org.graylog2.syslog4j.server.impl.event.printstream;
 
-import org.productivity.java.syslog4j.server.SyslogServerSessionEventHandlerIF;
+import org.graylog2.syslog4j.server.SyslogServerSessionEventHandlerIF;
 
 public class SystemErrSyslogServerEventHandler extends PrintStreamSyslogServerEventHandler {
 	private static final long serialVersionUID = -3496862887351690575L;
diff --git a/src/main/java/org/productivity/java/syslog4j/server/impl/event/printstream/SystemOutSyslogServerEventHandler.java b/src/main/java/org/graylog2/syslog4j/server/impl/event/printstream/SystemOutSyslogServerEventHandler.java
similarity index 68%
rename from src/main/java/org/productivity/java/syslog4j/server/impl/event/printstream/SystemOutSyslogServerEventHandler.java
rename to src/main/java/org/graylog2/syslog4j/server/impl/event/printstream/SystemOutSyslogServerEventHandler.java
index bfe38b8..6c8db67 100644
--- a/src/main/java/org/productivity/java/syslog4j/server/impl/event/printstream/SystemOutSyslogServerEventHandler.java
+++ b/src/main/java/org/graylog2/syslog4j/server/impl/event/printstream/SystemOutSyslogServerEventHandler.java
@@ -1,6 +1,6 @@
-package org.productivity.java.syslog4j.server.impl.event.printstream;
+package org.graylog2.syslog4j.server.impl.event.printstream;
 
-import org.productivity.java.syslog4j.server.SyslogServerSessionEventHandlerIF;
+import org.graylog2.syslog4j.server.SyslogServerSessionEventHandlerIF;
 
 public class SystemOutSyslogServerEventHandler extends PrintStreamSyslogServerEventHandler {
 	private static final long serialVersionUID = 1690551409588182601L;
diff --git a/src/main/java/org/productivity/java/syslog4j/server/impl/event/structured/StructuredSyslogServerEvent.java b/src/main/java/org/graylog2/syslog4j/server/impl/event/structured/StructuredSyslogServerEvent.java
similarity index 89%
rename from src/main/java/org/productivity/java/syslog4j/server/impl/event/structured/StructuredSyslogServerEvent.java
rename to src/main/java/org/graylog2/syslog4j/server/impl/event/structured/StructuredSyslogServerEvent.java
index 476f3ab..8f81286 100644
--- a/src/main/java/org/productivity/java/syslog4j/server/impl/event/structured/StructuredSyslogServerEvent.java
+++ b/src/main/java/org/graylog2/syslog4j/server/impl/event/structured/StructuredSyslogServerEvent.java
@@ -1,13 +1,13 @@
-package org.productivity.java.syslog4j.server.impl.event.structured;
+package org.graylog2.syslog4j.server.impl.event.structured;
 
 import java.net.InetAddress;
 
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.ISODateTimeFormat;
-import org.productivity.java.syslog4j.SyslogConstants;
-import org.productivity.java.syslog4j.impl.message.structured.StructuredSyslogMessage;
-import org.productivity.java.syslog4j.server.impl.event.SyslogServerEvent;
+import org.graylog2.syslog4j.SyslogConstants;
+import org.graylog2.syslog4j.impl.message.structured.StructuredSyslogMessage;
+import org.graylog2.syslog4j.server.impl.event.SyslogServerEvent;
 
 /**
  * SyslogServerStructuredEvent provides an implementation of the
diff --git a/src/main/java/org/productivity/java/syslog4j/server/impl/net/AbstractNetSyslogServerConfig.java b/src/main/java/org/graylog2/syslog4j/server/impl/net/AbstractNetSyslogServerConfig.java
similarity index 84%
rename from src/main/java/org/productivity/java/syslog4j/server/impl/net/AbstractNetSyslogServerConfig.java
rename to src/main/java/org/graylog2/syslog4j/server/impl/net/AbstractNetSyslogServerConfig.java
index 31067f4..ce7c943 100644
--- a/src/main/java/org/productivity/java/syslog4j/server/impl/net/AbstractNetSyslogServerConfig.java
+++ b/src/main/java/org/graylog2/syslog4j/server/impl/net/AbstractNetSyslogServerConfig.java
@@ -1,6 +1,6 @@
-package org.productivity.java.syslog4j.server.impl.net;
+package org.graylog2.syslog4j.server.impl.net;
 
-import org.productivity.java.syslog4j.server.impl.AbstractSyslogServerConfig;
+import org.graylog2.syslog4j.server.impl.AbstractSyslogServerConfig;
 
 /**
 * AbstractNetSyslogServerConfig provides a base abstract implementation of the AbstractSyslogServerConfig
diff --git a/src/main/java/org/productivity/java/syslog4j/server/impl/net/tcp/TCPNetSyslogServer.java b/src/main/java/org/graylog2/syslog4j/server/impl/net/tcp/TCPNetSyslogServer.java
similarity index 90%
rename from src/main/java/org/productivity/java/syslog4j/server/impl/net/tcp/TCPNetSyslogServer.java
rename to src/main/java/org/graylog2/syslog4j/server/impl/net/tcp/TCPNetSyslogServer.java
index 9e47937..a7d81c0 100644
--- a/src/main/java/org/productivity/java/syslog4j/server/impl/net/tcp/TCPNetSyslogServer.java
+++ b/src/main/java/org/graylog2/syslog4j/server/impl/net/tcp/TCPNetSyslogServer.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j.server.impl.net.tcp;
+package org.graylog2.syslog4j.server.impl.net.tcp;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -12,12 +12,12 @@ import java.util.Iterator;
 
 import javax.net.ServerSocketFactory;
 
-import org.productivity.java.syslog4j.SyslogConstants;
-import org.productivity.java.syslog4j.SyslogRuntimeException;
-import org.productivity.java.syslog4j.server.SyslogServerEventIF;
-import org.productivity.java.syslog4j.server.SyslogServerIF;
-import org.productivity.java.syslog4j.server.impl.AbstractSyslogServer;
-import org.productivity.java.syslog4j.util.SyslogUtility;
+import org.graylog2.syslog4j.SyslogConstants;
+import org.graylog2.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.server.SyslogServerEventIF;
+import org.graylog2.syslog4j.server.SyslogServerIF;
+import org.graylog2.syslog4j.server.impl.AbstractSyslogServer;
+import org.graylog2.syslog4j.util.SyslogUtility;
 
 /**
 * TCPNetSyslogServer provides a simple threaded TCP/IP server implementation.
diff --git a/src/main/java/org/productivity/java/syslog4j/server/impl/net/tcp/TCPNetSyslogServerConfig.java b/src/main/java/org/graylog2/syslog4j/server/impl/net/tcp/TCPNetSyslogServerConfig.java
similarity index 90%
rename from src/main/java/org/productivity/java/syslog4j/server/impl/net/tcp/TCPNetSyslogServerConfig.java
rename to src/main/java/org/graylog2/syslog4j/server/impl/net/tcp/TCPNetSyslogServerConfig.java
index aabe4d9..5d63b01 100644
--- a/src/main/java/org/productivity/java/syslog4j/server/impl/net/tcp/TCPNetSyslogServerConfig.java
+++ b/src/main/java/org/graylog2/syslog4j/server/impl/net/tcp/TCPNetSyslogServerConfig.java
@@ -1,6 +1,6 @@
-package org.productivity.java.syslog4j.server.impl.net.tcp;
+package org.graylog2.syslog4j.server.impl.net.tcp;
 
-import org.productivity.java.syslog4j.server.impl.net.AbstractNetSyslogServerConfig;
+import org.graylog2.syslog4j.server.impl.net.AbstractNetSyslogServerConfig;
 
 /**
 * TCPNetSyslogServerConfig provides configuration for TCPNetSyslogServer.
diff --git a/src/main/java/org/productivity/java/syslog4j/server/impl/net/tcp/TCPNetSyslogServerConfigIF.java b/src/main/java/org/graylog2/syslog4j/server/impl/net/tcp/TCPNetSyslogServerConfigIF.java
similarity index 86%
rename from src/main/java/org/productivity/java/syslog4j/server/impl/net/tcp/TCPNetSyslogServerConfigIF.java
rename to src/main/java/org/graylog2/syslog4j/server/impl/net/tcp/TCPNetSyslogServerConfigIF.java
index 090d79b..ce6fab2 100644
--- a/src/main/java/org/productivity/java/syslog4j/server/impl/net/tcp/TCPNetSyslogServerConfigIF.java
+++ b/src/main/java/org/graylog2/syslog4j/server/impl/net/tcp/TCPNetSyslogServerConfigIF.java
@@ -1,6 +1,6 @@
-package org.productivity.java.syslog4j.server.impl.net.tcp;
+package org.graylog2.syslog4j.server.impl.net.tcp;
 
-import org.productivity.java.syslog4j.server.SyslogServerConfigIF;
+import org.graylog2.syslog4j.server.SyslogServerConfigIF;
 
 /**
 * TCPNetSyslogServerConfigIF provides configuration for TCPNetSyslogServer.
diff --git a/src/main/java/org/productivity/java/syslog4j/server/impl/net/tcp/ssl/SSLTCPNetSyslogServer.java b/src/main/java/org/graylog2/syslog4j/server/impl/net/tcp/ssl/SSLTCPNetSyslogServer.java
similarity index 87%
rename from src/main/java/org/productivity/java/syslog4j/server/impl/net/tcp/ssl/SSLTCPNetSyslogServer.java
rename to src/main/java/org/graylog2/syslog4j/server/impl/net/tcp/ssl/SSLTCPNetSyslogServer.java
index 7c45993..c2e0704 100644
--- a/src/main/java/org/productivity/java/syslog4j/server/impl/net/tcp/ssl/SSLTCPNetSyslogServer.java
+++ b/src/main/java/org/graylog2/syslog4j/server/impl/net/tcp/ssl/SSLTCPNetSyslogServer.java
@@ -1,12 +1,12 @@
-package org.productivity.java.syslog4j.server.impl.net.tcp.ssl;
+package org.graylog2.syslog4j.server.impl.net.tcp.ssl;
 
 import java.io.IOException;
 
 import javax.net.ServerSocketFactory;
 import javax.net.ssl.SSLServerSocketFactory;
 
-import org.productivity.java.syslog4j.SyslogRuntimeException;
-import org.productivity.java.syslog4j.server.impl.net.tcp.TCPNetSyslogServer;
+import org.graylog2.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.server.impl.net.tcp.TCPNetSyslogServer;
 
 /**
 * SSLTCPNetSyslogServer provides a simple threaded TCP/IP server implementation
diff --git a/src/main/java/org/productivity/java/syslog4j/server/impl/net/tcp/ssl/SSLTCPNetSyslogServerConfig.java b/src/main/java/org/graylog2/syslog4j/server/impl/net/tcp/ssl/SSLTCPNetSyslogServerConfig.java
similarity index 88%
rename from src/main/java/org/productivity/java/syslog4j/server/impl/net/tcp/ssl/SSLTCPNetSyslogServerConfig.java
rename to src/main/java/org/graylog2/syslog4j/server/impl/net/tcp/ssl/SSLTCPNetSyslogServerConfig.java
index e0beb66..21aae76 100644
--- a/src/main/java/org/productivity/java/syslog4j/server/impl/net/tcp/ssl/SSLTCPNetSyslogServerConfig.java
+++ b/src/main/java/org/graylog2/syslog4j/server/impl/net/tcp/ssl/SSLTCPNetSyslogServerConfig.java
@@ -1,6 +1,6 @@
-package org.productivity.java.syslog4j.server.impl.net.tcp.ssl;
+package org.graylog2.syslog4j.server.impl.net.tcp.ssl;
 
-import org.productivity.java.syslog4j.server.impl.net.tcp.TCPNetSyslogServerConfig;
+import org.graylog2.syslog4j.server.impl.net.tcp.TCPNetSyslogServerConfig;
 
 /**
 * SSLTCPNetSyslogServerConfig provides configuration for SSLTCPNetSyslogServer.
diff --git a/src/main/java/org/productivity/java/syslog4j/server/impl/net/tcp/ssl/SSLTCPNetSyslogServerConfigIF.java b/src/main/java/org/graylog2/syslog4j/server/impl/net/tcp/ssl/SSLTCPNetSyslogServerConfigIF.java
similarity index 83%
rename from src/main/java/org/productivity/java/syslog4j/server/impl/net/tcp/ssl/SSLTCPNetSyslogServerConfigIF.java
rename to src/main/java/org/graylog2/syslog4j/server/impl/net/tcp/ssl/SSLTCPNetSyslogServerConfigIF.java
index cab8079..a81f6ef 100644
--- a/src/main/java/org/productivity/java/syslog4j/server/impl/net/tcp/ssl/SSLTCPNetSyslogServerConfigIF.java
+++ b/src/main/java/org/graylog2/syslog4j/server/impl/net/tcp/ssl/SSLTCPNetSyslogServerConfigIF.java
@@ -1,6 +1,6 @@
-package org.productivity.java.syslog4j.server.impl.net.tcp.ssl;
+package org.graylog2.syslog4j.server.impl.net.tcp.ssl;
 
-import org.productivity.java.syslog4j.server.impl.net.tcp.TCPNetSyslogServerConfigIF;
+import org.graylog2.syslog4j.server.impl.net.tcp.TCPNetSyslogServerConfigIF;
 
 /**
 * SSLTCPNetSyslogServerConfigIF provides configuration for SSLTCPNetSyslogServer.
diff --git a/src/main/java/org/productivity/java/syslog4j/server/impl/net/udp/UDPNetSyslogServer.java b/src/main/java/org/graylog2/syslog4j/server/impl/net/udp/UDPNetSyslogServer.java
similarity index 84%
rename from src/main/java/org/productivity/java/syslog4j/server/impl/net/udp/UDPNetSyslogServer.java
rename to src/main/java/org/graylog2/syslog4j/server/impl/net/udp/UDPNetSyslogServer.java
index f5b803d..4390ea5 100644
--- a/src/main/java/org/productivity/java/syslog4j/server/impl/net/udp/UDPNetSyslogServer.java
+++ b/src/main/java/org/graylog2/syslog4j/server/impl/net/udp/UDPNetSyslogServer.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j.server.impl.net.udp;
+package org.graylog2.syslog4j.server.impl.net.udp;
 
 import java.io.IOException;
 import java.net.DatagramPacket;
@@ -7,11 +7,11 @@ import java.net.InetAddress;
 import java.net.SocketException;
 import java.net.UnknownHostException;
 
-import org.productivity.java.syslog4j.SyslogConstants;
-import org.productivity.java.syslog4j.SyslogRuntimeException;
-import org.productivity.java.syslog4j.server.SyslogServerEventIF;
-import org.productivity.java.syslog4j.server.impl.AbstractSyslogServer;
-import org.productivity.java.syslog4j.util.SyslogUtility;
+import org.graylog2.syslog4j.SyslogConstants;
+import org.graylog2.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.server.SyslogServerEventIF;
+import org.graylog2.syslog4j.server.impl.AbstractSyslogServer;
+import org.graylog2.syslog4j.util.SyslogUtility;
 
 /**
 * UDPNetSyslogServer provides a simple non-threaded UDP/IP server implementation.
diff --git a/src/main/java/org/productivity/java/syslog4j/server/impl/net/udp/UDPNetSyslogServerConfig.java b/src/main/java/org/graylog2/syslog4j/server/impl/net/udp/UDPNetSyslogServerConfig.java
similarity index 83%
rename from src/main/java/org/productivity/java/syslog4j/server/impl/net/udp/UDPNetSyslogServerConfig.java
rename to src/main/java/org/graylog2/syslog4j/server/impl/net/udp/UDPNetSyslogServerConfig.java
index bd56c2f..7e1885a 100644
--- a/src/main/java/org/productivity/java/syslog4j/server/impl/net/udp/UDPNetSyslogServerConfig.java
+++ b/src/main/java/org/graylog2/syslog4j/server/impl/net/udp/UDPNetSyslogServerConfig.java
@@ -1,6 +1,6 @@
-package org.productivity.java.syslog4j.server.impl.net.udp;
+package org.graylog2.syslog4j.server.impl.net.udp;
 
-import org.productivity.java.syslog4j.server.impl.net.AbstractNetSyslogServerConfig;
+import org.graylog2.syslog4j.server.impl.net.AbstractNetSyslogServerConfig;
 
 /**
 * UDPNetSyslogServerConfig provides configuration for UDPNetSyslogServer.
diff --git a/src/main/java/org/productivity/java/syslog4j/util/Base64.java b/src/main/java/org/graylog2/syslog4j/util/Base64.java
similarity index 97%
rename from src/main/java/org/productivity/java/syslog4j/util/Base64.java
rename to src/main/java/org/graylog2/syslog4j/util/Base64.java
index cb385e5..89f2a86 100644
--- a/src/main/java/org/productivity/java/syslog4j/util/Base64.java
+++ b/src/main/java/org/graylog2/syslog4j/util/Base64.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j.util;
+package org.graylog2.syslog4j.util;
 
 /**
  * <p>Encodes and decodes to and from Base64 notation.</p>
diff --git a/src/main/java/org/productivity/java/syslog4j/util/OSDetectUtility.java b/src/main/java/org/graylog2/syslog4j/util/OSDetectUtility.java
similarity index 92%
rename from src/main/java/org/productivity/java/syslog4j/util/OSDetectUtility.java
rename to src/main/java/org/graylog2/syslog4j/util/OSDetectUtility.java
index f76145e..9fe1cbc 100644
--- a/src/main/java/org/productivity/java/syslog4j/util/OSDetectUtility.java
+++ b/src/main/java/org/graylog2/syslog4j/util/OSDetectUtility.java
@@ -1,4 +1,4 @@
-package org.productivity.java.syslog4j.util;
+package org.graylog2.syslog4j.util;
 
 /**
 * OSDetectUtility provides operating system detection used to determine
diff --git a/src/main/java/org/productivity/java/syslog4j/util/SyslogUtility.java b/src/main/java/org/graylog2/syslog4j/util/SyslogUtility.java
similarity index 93%
rename from src/main/java/org/productivity/java/syslog4j/util/SyslogUtility.java
rename to src/main/java/org/graylog2/syslog4j/util/SyslogUtility.java
index 0ee5aa7..9794fd0 100644
--- a/src/main/java/org/productivity/java/syslog4j/util/SyslogUtility.java
+++ b/src/main/java/org/graylog2/syslog4j/util/SyslogUtility.java
@@ -1,12 +1,12 @@
-package org.productivity.java.syslog4j.util;
+package org.graylog2.syslog4j.util;
 
 import java.io.UnsupportedEncodingException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
-import org.productivity.java.syslog4j.SyslogCharSetIF;
-import org.productivity.java.syslog4j.SyslogConstants;
-import org.productivity.java.syslog4j.SyslogRuntimeException;
+import org.graylog2.syslog4j.SyslogCharSetIF;
+import org.graylog2.syslog4j.SyslogConstants;
+import org.graylog2.syslog4j.SyslogRuntimeException;
 
 /**
 * SyslogUtility provides several common utility methods used within