diff --git a/examples/pom.xml b/examples/pom.xml
new file mode 100644
index 00000000..6a7c2ebb
--- /dev/null
+++ b/examples/pom.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2009 sshj contributors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<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/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>net.schmizz</groupId>
+    <artifactId>sshj</artifactId>
+    <packaging>jar</packaging>
+    <version>0.10.0</version>
+
+    <name>sshj-examples</name>
+    <description>Examples for SSHv2 library for Java</description>
+    <url>http://github.com/hierynomus/sshj</url>
+
+    <inceptionYear>2015</inceptionYear>
+
+    <issueManagement>
+        <system>github</system>
+        <url>http://github.com/hierynomus/sshj/issues</url>
+    </issueManagement>
+
+    <scm>
+        <connection>scm:git:git://github.com/hierynomus/sshj.git</connection>
+        <developerConnection>scm:git:git@github.com:hierynomus/sshj.git</developerConnection>
+        <url>http://github.com/hierynomus/sshj</url>
+    </scm>
+
+    <licenses>
+        <license>
+            <name>Apache 2</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <dependencies>
+        <dependency>
+            <groupId>net.schmizz</groupId>
+            <artifactId>sshj</artifactId>
+            <version>0.10.0</version>
+        </dependency>
+    </dependencies>
+
+
+    <developers>
+        <developer>
+            <id>hierynomus</id>
+            <name>Jeroen van Erp</name>
+            <email>jeroen@hierynomus.com</email>
+        </developer>
+        <developer>
+            <id>shikhar</id>
+            <name>Shikhar Bhushan</name>
+            <email>shikhar@schmizz.net</email>
+            <url>http://schmizz.net</url>
+        </developer>
+        <developer>
+            <id>iterate</id>
+            <name>David Kocher</name>
+            <email>dkocher@iterate.ch</email>
+            <organization>iterate GmbH</organization>
+            <organizationUrl>https://iterate.ch</organizationUrl>
+        </developer>
+    </developers>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/src/main/java/examples/Exec.java b/examples/src/main/java/net/schmizz/sshj/examples/Exec.java
similarity index 98%
rename from src/main/java/examples/Exec.java
rename to examples/src/main/java/net/schmizz/sshj/examples/Exec.java
index f9fdbab2..d02d6600 100644
--- a/src/main/java/examples/Exec.java
+++ b/examples/src/main/java/net/schmizz/sshj/examples/Exec.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package examples;
+package net.schmizz.sshj.examples;
 
 import net.schmizz.sshj.SSHClient;
 import net.schmizz.sshj.common.IOUtils;
diff --git a/src/main/java/examples/LocalPF.java b/examples/src/main/java/net/schmizz/sshj/examples/LocalPF.java
similarity index 98%
rename from src/main/java/examples/LocalPF.java
rename to examples/src/main/java/net/schmizz/sshj/examples/LocalPF.java
index 4b5180f5..fad22230 100644
--- a/src/main/java/examples/LocalPF.java
+++ b/examples/src/main/java/net/schmizz/sshj/examples/LocalPF.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package examples;
+package net.schmizz.sshj.examples;
 
 import net.schmizz.sshj.SSHClient;
 import net.schmizz.sshj.connection.channel.direct.LocalPortForwarder;
diff --git a/src/main/java/examples/RemotePF.java b/examples/src/main/java/net/schmizz/sshj/examples/RemotePF.java
similarity index 98%
rename from src/main/java/examples/RemotePF.java
rename to examples/src/main/java/net/schmizz/sshj/examples/RemotePF.java
index dd673333..d6545207 100644
--- a/src/main/java/examples/RemotePF.java
+++ b/examples/src/main/java/net/schmizz/sshj/examples/RemotePF.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package examples;
+package net.schmizz.sshj.examples;
 
 import net.schmizz.sshj.SSHClient;
 import net.schmizz.sshj.connection.channel.forwarded.RemotePortForwarder.Forward;
diff --git a/src/main/java/examples/RudimentaryPTY.java b/examples/src/main/java/net/schmizz/sshj/examples/RudimentaryPTY.java
similarity index 98%
rename from src/main/java/examples/RudimentaryPTY.java
rename to examples/src/main/java/net/schmizz/sshj/examples/RudimentaryPTY.java
index e6959227..1d1c7ae0 100644
--- a/src/main/java/examples/RudimentaryPTY.java
+++ b/examples/src/main/java/net/schmizz/sshj/examples/RudimentaryPTY.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package examples;
+package net.schmizz.sshj.examples;
 
 import net.schmizz.sshj.SSHClient;
 import net.schmizz.sshj.common.StreamCopier;
diff --git a/src/main/java/examples/SCPDownload.java b/examples/src/main/java/net/schmizz/sshj/examples/SCPDownload.java
similarity index 97%
rename from src/main/java/examples/SCPDownload.java
rename to examples/src/main/java/net/schmizz/sshj/examples/SCPDownload.java
index 453e7b3e..d3b05335 100644
--- a/src/main/java/examples/SCPDownload.java
+++ b/examples/src/main/java/net/schmizz/sshj/examples/SCPDownload.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package examples;
+package net.schmizz.sshj.examples;
 
 import net.schmizz.sshj.SSHClient;
 import net.schmizz.sshj.xfer.FileSystemFile;
diff --git a/src/main/java/examples/SCPUpload.java b/examples/src/main/java/net/schmizz/sshj/examples/SCPUpload.java
similarity index 97%
rename from src/main/java/examples/SCPUpload.java
rename to examples/src/main/java/net/schmizz/sshj/examples/SCPUpload.java
index 207ee51d..b5dfe97b 100644
--- a/src/main/java/examples/SCPUpload.java
+++ b/examples/src/main/java/net/schmizz/sshj/examples/SCPUpload.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package examples;
+package net.schmizz.sshj.examples;
 
 import net.schmizz.sshj.SSHClient;
 import net.schmizz.sshj.xfer.FileSystemFile;
diff --git a/src/main/java/examples/SFTPDownload.java b/examples/src/main/java/net/schmizz/sshj/examples/SFTPDownload.java
similarity index 97%
rename from src/main/java/examples/SFTPDownload.java
rename to examples/src/main/java/net/schmizz/sshj/examples/SFTPDownload.java
index ceb83f6a..27d6bdfb 100644
--- a/src/main/java/examples/SFTPDownload.java
+++ b/examples/src/main/java/net/schmizz/sshj/examples/SFTPDownload.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package examples;
+package net.schmizz.sshj.examples;
 
 import net.schmizz.sshj.SSHClient;
 import net.schmizz.sshj.sftp.SFTPClient;
diff --git a/src/main/java/examples/SFTPUpload.java b/examples/src/main/java/net/schmizz/sshj/examples/SFTPUpload.java
similarity index 97%
rename from src/main/java/examples/SFTPUpload.java
rename to examples/src/main/java/net/schmizz/sshj/examples/SFTPUpload.java
index 33dd617d..2a848f86 100644
--- a/src/main/java/examples/SFTPUpload.java
+++ b/examples/src/main/java/net/schmizz/sshj/examples/SFTPUpload.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package examples;
+package net.schmizz.sshj.examples;
 
 import net.schmizz.sshj.SSHClient;
 import net.schmizz.sshj.sftp.SFTPClient;
diff --git a/src/main/java/examples/X11.java b/examples/src/main/java/net/schmizz/sshj/examples/X11.java
similarity index 98%
rename from src/main/java/examples/X11.java
rename to examples/src/main/java/net/schmizz/sshj/examples/X11.java
index 173f85d7..f79a141f 100644
--- a/src/main/java/examples/X11.java
+++ b/examples/src/main/java/net/schmizz/sshj/examples/X11.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package examples;
+package net.schmizz.sshj.examples;
 
 import net.schmizz.sshj.SSHClient;
 import net.schmizz.sshj.common.StreamCopier;
diff --git a/pom.xml b/pom.xml
index 03874b12..4df260c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,19 +28,19 @@
 
     <name>sshj</name>
     <description>SSHv2 library for Java</description>
-    <url>http://github.com/shikhar/sshj</url>
+    <url>http://github.com/hierynomus/sshj</url>
 
     <inceptionYear>2009</inceptionYear>
 
     <issueManagement>
         <system>github</system>
-        <url>http://github.com/shikhar/sshj/issues</url>
+        <url>http://github.com/hierynomus/sshj/issues</url>
     </issueManagement>
 
     <scm>
-        <connection>scm:git:git://github.com/shikhar/sshj.git</connection>
-        <developerConnection>scm:git:git@github.com:shikhar/sshj.git</developerConnection>
-        <url>http://github.com/shikhar/sshj</url>
+        <connection>scm:git:git://github.com/hierynomus/sshj.git</connection>
+        <developerConnection>scm:git:git@github.com:hierynomus/sshj.git</developerConnection>
+        <url>http://github.com/hierynomus/sshj</url>
     </scm>
 
     <licenses>
@@ -139,6 +139,11 @@
 
 
     <developers>
+        <developer>
+            <id>hierynomus</id>
+            <name>Jeroen van Erp</name>
+            <email>jeroen@hierynomus.com</email>
+        </developer>
         <developer>
             <id>shikhar</id>
             <name>Shikhar Bhushan</name>
@@ -165,9 +170,6 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.1</version>
                 <configuration>
-                    <excludes>
-                        <exclude>examples/*.java</exclude>
-                    </excludes>
                     <source>1.6</source>
                     <target>1.6</target>
                 </configuration>
@@ -249,24 +251,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2.1</version>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/assemble/examples.xml</descriptor>
-                    </descriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
 <!--             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
diff --git a/src/assemble/examples.xml b/src/assemble/examples.xml
deleted file mode 100644
index 14fefe1d..00000000
--- a/src/assemble/examples.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-
-    Copyright 2009 sshj contributors
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-    <id>examples</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <fileSets>
-        <fileSet>
-            <directory>src/main/java/examples</directory>
-            <includes/>
-            <outputDirectory>examples</outputDirectory>
-        </fileSet>
-    </fileSets>
-</assembly>
\ No newline at end of file