diff --git a/README.md b/README.md
index e29b8f2..9940b8a 100644
--- a/README.md
+++ b/README.md
@@ -24,15 +24,15 @@ This is exactly what Easy Rules does, it provides the `Rule` abstraction to crea
 |:---------------------|:-------------------------------------------------------------------------------------|
 |Project Home          | [http://www.easyrules.org](http://www.easyrules.org)                                 |
 |Presentation          | [https://speakerdeck.com/benas/easy-rules](https://speakerdeck.com/benas/easy-rules) |
-|Continuous integration| [Build job @ Travis CI](https://travis-ci.org/benas/easy-rules)                      |
-|Agile Board           | [Backlog items @ waffle.io](https://waffle.io/benas/easy-rules)                      |
-|Code coverage         | [![Coverage](https://coveralls.io/repos/benas/easy-rules/badge.svg?style=flat&branch=master&service=github)](https://coveralls.io/github/benas/easy-rules?branch=master) |
+|Continuous integration| [Build job @ Travis CI](https://travis-ci.org/EasyRules/easyrules)                   |
+|Agile Board           | [Backlog items @ waffle.io](https://waffle.io/EasyRules/easyrules)                   |
+|Code coverage         | [![Coverage](https://coveralls.io/repos/EasyRules/easyrules/badge.svg?style=flat&branch=master&service=github)](https://coveralls.io/github/EasyRules/easyrules?branch=master) |
 |Dependencies          | [![Dependency Status](https://www.versioneye.com/user/projects/554db6eb8a8e5655d6000081/badge.svg?style=flat)](https://www.versioneye.com/user/projects/554db6eb8a8e5655d6000081) |
 
 ## Current version
 
 * The current stable version is `2.1.0` : [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.easyrules/easyrules-core/badge.svg?style=flat)](http://search.maven.org/#artifactdetails|org.easyrules|easyrules-core|2.1.0|) 
-* The current development version is `2.2.0-SNAPSHOT` : [![Build Status](https://travis-ci.org/benas/easy-rules.svg?branch=master)](https://travis-ci.org/benas/easy-rules)
+* The current development version is `2.2.0-SNAPSHOT` : [![Build Status](https://travis-ci.org/EasyRules/easyrules.svg?branch=master)](https://travis-ci.org/EasyRules/easyrules)
 
 In order to use snapshot versions, you need to add the following maven repository in your `pom.xml`:
 
@@ -47,9 +47,9 @@ In order to use snapshot versions, you need to add the following maven repositor
 
 You are welcome to contribute to the project with pull requests on GitHub.
 
-If you found a bug or want to request a feature, please use the [issue tracker](https://github.com/benas/easy-rules/issues).
+If you found a bug or want to request a feature, please use the [issue tracker](https://github.com/EasyRules/easyrules/issues).
 
-For any further question, you can use the [Gitter](https://gitter.im/benas/easy-rules) channel of the project.
+For any further question, you can use the [Gitter](https://gitter.im/EasyRules/easyrules) channel of the project.
 
 ## Awesome contributors
 
diff --git a/easyrules-archetype/pom.xml b/easyrules-archetype/pom.xml
index 5e66983..165a346 100755
--- a/easyrules-archetype/pom.xml
+++ b/easyrules-archetype/pom.xml
@@ -24,20 +24,20 @@
     </developers>
 
     <scm>
-        <url>git@github.com:benas/easy-rules.git</url>
-        <connection>scm:git:git@github.com:benas/easy-rules.git</connection>
-        <developerConnection>scm:git:git@github.com:benas/easy-rules.git</developerConnection>
+        <url>git@github.com:EasyRules/easyrules.git</url>
+        <connection>scm:git:git@github.com:EasyRules/easyrules.git</connection>
+        <developerConnection>scm:git:git@github.com:EasyRules/easyrules.git</developerConnection>
         <tag>HEAD</tag>
     </scm>
 
     <issueManagement>
         <system>GitHub</system>
-        <url>https://github.com/benas/easy-rules/issues</url>
+        <url>https://github.com/EasyRules/easyrules/issues</url>
     </issueManagement>
 
     <ciManagement>
         <system>Travis CI</system>
-        <url>https://travis-ci.org/benas/easy-rules</url>
+        <url>https://travis-ci.org/EasyRules/easyrules</url>
     </ciManagement>
 
     <licenses>
diff --git a/easyrules-core/pom.xml b/easyrules-core/pom.xml
index f641f74..e2cef0a 100644
--- a/easyrules-core/pom.xml
+++ b/easyrules-core/pom.xml
@@ -14,20 +14,20 @@
     <description>Public API and core implementation of Easy Rules</description>
 
     <scm>
-        <url>git@github.com:benas/easy-rules.git</url>
-        <connection>scm:git:git@github.com:benas/easy-rules.git</connection>
-        <developerConnection>scm:git:git@github.com:benas/easy-rules.git</developerConnection>
+        <url>git@github.com:EasyRules/easyrules.git</url>
+        <connection>scm:git:git@github.com:EasyRules/easyrules.git</connection>
+        <developerConnection>scm:git:git@github.com:EasyRules/easyrules.git</developerConnection>
         <tag>HEAD</tag>
     </scm>
 
     <issueManagement>
         <system>GitHub</system>
-        <url>https://github.com/benas/easy-rules/issues</url>
+        <url>https://github.com/EasyRules/easyrules/issues</url>
     </issueManagement>
 
     <ciManagement>
         <system>Travis CI</system>
-        <url>https://travis-ci.org/benas/easy-rules</url>
+        <url>https://travis-ci.org/EasyRules/easyrules</url>
     </ciManagement>
 
     <developers>
diff --git a/easyrules-jmx/pom.xml b/easyrules-jmx/pom.xml
index 4e84ba2..bf3c69d 100644
--- a/easyrules-jmx/pom.xml
+++ b/easyrules-jmx/pom.xml
@@ -14,20 +14,20 @@
     <description>Module for rule monitoring and management through JMX</description>
 
     <scm>
-        <url>git@github.com:benas/easy-rules.git</url>
-        <connection>scm:git:git@github.com:benas/easy-rules.git</connection>
-        <developerConnection>scm:git:git@github.com:benas/easy-rules.git</developerConnection>
+        <url>git@github.com:EasyRules/easyrules.git</url>
+        <connection>scm:git:git@github.com:EasyRules/easyrules.git</connection>
+        <developerConnection>scm:git:git@github.com:EasyRules/easyrules.git</developerConnection>
         <tag>HEAD</tag>
     </scm>
 
     <issueManagement>
         <system>GitHub</system>
-        <url>https://github.com/benas/easy-rules/issues</url>
+        <url>https://github.com/EasyRules/easyrules/issues</url>
     </issueManagement>
 
     <ciManagement>
         <system>Travis CI</system>
-        <url>https://travis-ci.org/benas/easy-rules</url>
+        <url>https://travis-ci.org/EasyRules/easyrules</url>
     </ciManagement>
 
     <developers>
diff --git a/easyrules-quartz/pom.xml b/easyrules-quartz/pom.xml
index e546fee..834eb8a 100644
--- a/easyrules-quartz/pom.xml
+++ b/easyrules-quartz/pom.xml
@@ -14,20 +14,20 @@
     <description>Module providing support for engine scheduling using Quartz</description>
 
     <scm>
-        <url>git@github.com:benas/easy-rules.git</url>
-        <connection>scm:git:git@github.com:benas/easy-rules.git</connection>
-        <developerConnection>scm:git:git@github.com:benas/easy-rules.git</developerConnection>
+        <url>git@github.com:EasyRules/easyrules.git</url>
+        <connection>scm:git:git@github.com:EasyRules/easyrules.git</connection>
+        <developerConnection>scm:git:git@github.com:EasyRules/easyrules.git</developerConnection>
         <tag>HEAD</tag>
     </scm>
 
     <issueManagement>
         <system>GitHub</system>
-        <url>https://github.com/benas/easy-rules/issues</url>
+        <url>https://github.com/EasyRules/easyrules/issues</url>
     </issueManagement>
 
     <ciManagement>
         <system>Travis CI</system>
-        <url>https://travis-ci.org/benas/easy-rules</url>
+        <url>https://travis-ci.org/EasyRules/easyrules</url>
     </ciManagement>
 
     <developers>
diff --git a/easyrules-spring/pom.xml b/easyrules-spring/pom.xml
index 4f30415..088a9c9 100755
--- a/easyrules-spring/pom.xml
+++ b/easyrules-spring/pom.xml
@@ -14,20 +14,20 @@
     <description>Module providing support for engine configuration using Spring</description>
 
     <scm>
-        <url>git@github.com:benas/easy-rules.git</url>
-        <connection>scm:git:git@github.com:benas/easy-rules.git</connection>
-        <developerConnection>scm:git:git@github.com:benas/easy-rules.git</developerConnection>
+        <url>git@github.com:EasyRules/easyrules.git</url>
+        <connection>scm:git:git@github.com:EasyRules/easyrules.git</connection>
+        <developerConnection>scm:git:git@github.com:EasyRules/easyrules.git</developerConnection>
         <tag>HEAD</tag>
     </scm>
 
     <issueManagement>
         <system>GitHub</system>
-        <url>https://github.com/benas/easy-rules/issues</url>
+        <url>https://github.com/EasyRules/easyrules/issues</url>
     </issueManagement>
 
     <ciManagement>
         <system>Travis CI</system>
-        <url>https://travis-ci.org/benas/easy-rules</url>
+        <url>https://travis-ci.org/EasyRules/easyrules</url>
     </ciManagement>
 
     <developers>
diff --git a/pom.xml b/pom.xml
index 9789490..1dbc5ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,6 @@
     <modules>
         <module>easyrules-archetype</module>
         <module>easyrules-core</module>
-        <module>easyrules-samples</module>
         <module>easyrules-jmx</module>
         <module>easyrules-quartz</module>
         <module>easyrules-spring</module>
@@ -35,33 +34,29 @@
         <mockito.version>1.10.19</mockito.version>
         <quartz.version>2.2.2</quartz.version>
         <spring.version>4.2.3.RELEASE</spring.version>
-        <servlet.version>3.1.0</servlet.version>
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
-        <maven-tomcat7-plugin.version>2.2</maven-tomcat7-plugin.version>
         <maven-cobertura-plugin.version>2.7</maven-cobertura-plugin.version>
         <maven-coveralls-plugin.version>4.1.0</maven-coveralls-plugin.version>
         <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
         <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
         <maven-surefire-plugin.version>2.19</maven-surefire-plugin.version>
         <maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
-        <maven-exec-plugin.version>1.4.0</maven-exec-plugin.version>
     </properties>
 
     <scm>
-        <url>git@github.com:benas/easy-rules.git</url>
-        <connection>scm:git:git@github.com:benas/easy-rules.git</connection>
-        <developerConnection>scm:git:git@github.com:benas/easy-rules.git</developerConnection>
+        <url>git@github.com:EasyRules/easyrules.git</url>
+        <connection>scm:git:git@github.com:EasyRules/easyrules.git</connection>
+        <developerConnection>scm:git:git@github.com:EasyRules/easyrules.git</developerConnection>
         <tag>HEAD</tag>
     </scm>
 
     <issueManagement>
         <system>GitHub</system>
-        <url>https://github.com/benas/easy-rules/issues</url>
+        <url>https://github.com/EasyRules/easyrules/issues</url>
     </issueManagement>
 
     <ciManagement>
         <system>Travis CI</system>
-        <url>https://travis-ci.org/benas/easy-rules</url>
+        <url>https://travis-ci.org/EasyRules/easyrules</url>
     </ciManagement>
 
     <developers>