diff --git a/.settings/org.sonar.ide.eclipse.core.prefs b/.settings/org.sonar.ide.eclipse.core.prefs
index 67b7d79..bf68575 100644
--- a/.settings/org.sonar.ide.eclipse.core.prefs
+++ b/.settings/org.sonar.ide.eclipse.core.prefs
@@ -1,6 +1,6 @@
 analyseLocally=false
 eclipse.preferences.version=1
 extraProperties=
-projectKey=fr.imirhil.april\:hebdobot
+projectKey=org.april\:hebdobot
 serverUrl=http\://localhost\:9000
 version=2
diff --git a/conf.sample.xml b/conf.sample.xml
index b6edb20..2741832 100644
--- a/conf.sample.xml
+++ b/conf.sample.xml
@@ -3,7 +3,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
-	<context:component-scan base-package="fr.imirhil.april.hebdobot" />
+	<context:component-scan base-package="org.april.hebdobot" />
 
 	<bean id="properties"
 		class="org.springframework.beans.factory.config.PropertiesFactoryBean">
@@ -14,21 +14,21 @@
 		</property>
 	</bean>
 
-	<bean id="userAliases" class="fr.imirhil.april.hebdobot.xml.UserAlias">
+	<bean id="userAliases" class="org.april.hebdobot.xml.UserAlias">
 		<constructor-arg name="source" value="file:users.xml" />
 	</bean>
-	<bean id="bot" class="fr.imirhil.april.hebdobot.irc.Bot"
+	<bean id="bot" class="org.april.hebdobot.irc.Bot"
 		init-method="init" destroy-method="close">
 		<constructor-arg name="host" value="irc.freenode.org" />
 		<constructor-arg name="port" value="6667" />
 		<constructor-arg name="name" value="Hebdobot" />
 		<constructor-arg name="channel" value="#april" />
 	</bean>
-	<bean id="pastebin" class="fr.imirhil.april.hebdobot.pastebin.PastebinClient">
+	<bean id="pastebin" class="org.april.hebdobot.pastebin.PastebinClient">
 		<constructor-arg name="apiKey"
 			value="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" />
 	</bean>
-	<bean id="identi.ca" class="fr.imirhil.april.hebdobot.statusnet.IdentiCaClient">
+	<bean id="identi.ca" class="org.april.hebdobot.statusnet.IdentiCaClient">
 		<constructor-arg name="apiKey"
 			value="ef8ad74a5ab4a92138ff397763776a14" />
 		<constructor-arg name="apiSecret"
@@ -39,7 +39,7 @@
 			value="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" />
 	</bean>
 
-	<bean id="job" class="fr.imirhil.april.hebdobot.Job">
+	<bean id="job" class="org.april.hebdobot.Job">
 		<property name="statusNetMessage"
 			value="Revue hebdomadaire !april dans %dmin sur irc://irc.freenode.org/april ou http://webchat.freenode.net/?channels=april" />
 		<property name="ircMessage" value="Revue hebdomadaire dans %dmin" />
diff --git a/exe/daemon.sh b/exe/daemon.sh
index 3d17ef3..ccf20ca 100644
--- a/exe/daemon.sh
+++ b/exe/daemon.sh
@@ -4,7 +4,7 @@ NAME=hebdobot
 BASE_DIR=$HOME/$NAME
 PID_FILE=$BASE_DIR/$NAME.pid
 DAEMON=java
-DAEMON_ARGS="-cp *:lib/* fr.imirhil.april.hebdobot.Application"
+DAEMON_ARGS="-cp *:lib/* org.april.hebdobot.Application"
 
 CMD="/sbin/start-stop-daemon --chdir $BASE_DIR --quiet --make-pidfile --pidfile $PID_FILE --exec $DAEMON"
 case "$1" in
diff --git a/exe/hebdobot.sh b/exe/hebdobot.sh
index 45ca0d0..5dd19ce 100755
--- a/exe/hebdobot.sh
+++ b/exe/hebdobot.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -cp '*:lib/*' fr.imirhil.april.hebdobot.Application
+java -cp '*:lib/*' org.april.hebdobot.Application
diff --git a/launch4j.xml b/launch4j.xml
index 91520b6..12a921c 100644
--- a/launch4j.xml
+++ b/launch4j.xml
@@ -10,11 +10,11 @@
   <stayAlive>false</stayAlive>
   <icon>hebdobot.ico</icon>
   <classPath>
-    <mainClass>fr.imirhil..april.hebdobot.Bot</mainClass>
+    <mainClass>org.april.hebdobot.Bot</mainClass>
     <cp>lib/*</cp>
   </classPath>
   <jre>
-    <minVersion>1.6.0</minVersion>
+    <minVersion>1.7.0</minVersion>
     <jdkPreference>preferJre</jdkPreference>
   </jre>
 </launch4jConfig>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 78cc4fc..c95165f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <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>
-	<groupId>fr.imirhil.april</groupId>
+	<groupId>org.april</groupId>
 	<artifactId>hebdobot</artifactId>
 	<version>1.2.3-SNAPSHOT</version>
 	<scm>
@@ -28,8 +28,8 @@
 					</execution>
 				</executions>
 				<configuration>
-					<schemaDirectory>${basedir}/src/main/resources/fr/imirhil/april/hebdobot</schemaDirectory>
-					<bindingDirectory>${basedir}/src/main/resources/fr/imirhil/april/hebdobot</bindingDirectory>
+					<schemaDirectory>${basedir}/src/main/resources/org/april/hebdobot</schemaDirectory>
+					<bindingDirectory>${basedir}/src/main/resources/org/april/hebdobot</bindingDirectory>
 				</configuration>
 			</plugin>
 			<plugin>
diff --git a/src/main/java/fr/imirhil/april/hebdobot/Application.java b/src/main/java/org/april/hebdobot/Application.java
similarity index 89%
rename from src/main/java/fr/imirhil/april/hebdobot/Application.java
rename to src/main/java/org/april/hebdobot/Application.java
index 49e7ed6..ed4d194 100644
--- a/src/main/java/fr/imirhil/april/hebdobot/Application.java
+++ b/src/main/java/org/april/hebdobot/Application.java
@@ -17,24 +17,23 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Hebdobot.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.imirhil.april.hebdobot;
+package org.april.hebdobot;
 
 import java.io.File;
 import java.util.Properties;
 
 import org.apache.commons.io.FileUtils;
+import org.april.hebdobot.irc.Hebdobot;
+import org.april.hebdobot.irc.ReviewListener;
+import org.april.hebdobot.pastebin.PastebinClient;
+import org.april.hebdobot.pastebin.Private;
+import org.april.hebdobot.review.Review;
 import org.joda.time.DateTime;
 import org.joda.time.format.ISODateTimeFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.support.FileSystemXmlApplicationContext;
 
-import fr.imirhil.april.hebdobot.irc.Hebdobot;
-import fr.imirhil.april.hebdobot.irc.ReviewListener;
-import fr.imirhil.april.hebdobot.pastebin.PastebinClient;
-import fr.imirhil.april.hebdobot.pastebin.Private;
-import fr.imirhil.april.hebdobot.review.Review;
-
 /**
  * The Class Application.
  */
@@ -63,7 +62,7 @@ public class Application implements ReviewListener
     }
 
     /* (non-Javadoc)
-     * @see fr.imirhil.april.hebdobot.irc.ReviewListener#onEnd(fr.imirhil.april.hebdobot.review.Review)
+     * @see org.april.hebdobot.irc.ReviewListener#onEnd(org.april.hebdobot.review.Review)
      */
     @Override
     public void onEnd(final Review review)
diff --git a/src/main/java/fr/imirhil/april/hebdobot/Context.java b/src/main/java/org/april/hebdobot/Context.java
similarity index 98%
rename from src/main/java/fr/imirhil/april/hebdobot/Context.java
rename to src/main/java/org/april/hebdobot/Context.java
index d86ea47..c2fcdaf 100644
--- a/src/main/java/fr/imirhil/april/hebdobot/Context.java
+++ b/src/main/java/org/april/hebdobot/Context.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Hebdobot.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.imirhil.april.hebdobot;
+package org.april.hebdobot;
 
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
diff --git a/src/main/java/fr/imirhil/april/hebdobot/Job.java b/src/main/java/org/april/hebdobot/Job.java
similarity index 96%
rename from src/main/java/fr/imirhil/april/hebdobot/Job.java
rename to src/main/java/org/april/hebdobot/Job.java
index 8f53de8..f2398ff 100644
--- a/src/main/java/fr/imirhil/april/hebdobot/Job.java
+++ b/src/main/java/org/april/hebdobot/Job.java
@@ -17,14 +17,13 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Hebdobot.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.imirhil.april.hebdobot;
+package org.april.hebdobot;
 
 import javax.annotation.Resource;
 
+import org.april.hebdobot.irc.Hebdobot;
 import org.springframework.social.twitter.api.impl.TwitterTemplate;
 
-import fr.imirhil.april.hebdobot.irc.Hebdobot;
-
 /**
  * The Class Job.
  */
diff --git a/src/main/java/fr/imirhil/april/hebdobot/OAuthRegistration.java b/src/main/java/org/april/hebdobot/OAuthRegistration.java
similarity index 98%
rename from src/main/java/fr/imirhil/april/hebdobot/OAuthRegistration.java
rename to src/main/java/org/april/hebdobot/OAuthRegistration.java
index 07cfbdc..775f447 100644
--- a/src/main/java/fr/imirhil/april/hebdobot/OAuthRegistration.java
+++ b/src/main/java/org/april/hebdobot/OAuthRegistration.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Hebdobot.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.imirhil.april.hebdobot;
+package org.april.hebdobot;
 
 import java.util.Scanner;
 
diff --git a/src/main/java/fr/imirhil/april/hebdobot/irc/Handler.java b/src/main/java/org/april/hebdobot/irc/Handler.java
similarity index 96%
rename from src/main/java/fr/imirhil/april/hebdobot/irc/Handler.java
rename to src/main/java/org/april/hebdobot/irc/Handler.java
index 4ce413b..f1161bc 100644
--- a/src/main/java/fr/imirhil/april/hebdobot/irc/Handler.java
+++ b/src/main/java/org/april/hebdobot/irc/Handler.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Hebdobot.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.imirhil.april.hebdobot.irc;
+package org.april.hebdobot.irc;
 
 /**
  * The Class Handler.
diff --git a/src/main/java/fr/imirhil/april/hebdobot/irc/Hebdobot.java b/src/main/java/org/april/hebdobot/irc/Hebdobot.java
similarity index 90%
rename from src/main/java/fr/imirhil/april/hebdobot/irc/Hebdobot.java
rename to src/main/java/org/april/hebdobot/irc/Hebdobot.java
index 2dd3008..f3ce6fe 100644
--- a/src/main/java/fr/imirhil/april/hebdobot/irc/Hebdobot.java
+++ b/src/main/java/org/april/hebdobot/irc/Hebdobot.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Hebdobot.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.imirhil.april.hebdobot.irc;
+package org.april.hebdobot.irc;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -26,17 +26,16 @@ import java.util.List;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
+import org.april.hebdobot.Context;
+import org.april.hebdobot.review.CollectiveTopic;
+import org.april.hebdobot.review.IndividualTopic;
+import org.april.hebdobot.review.Message;
+import org.april.hebdobot.review.Review;
+import org.april.hebdobot.review.Topic;
 import org.jibble.pircbot.PircBot;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import fr.imirhil.april.hebdobot.Context;
-import fr.imirhil.april.hebdobot.review.CollectiveTopic;
-import fr.imirhil.april.hebdobot.review.IndividualTopic;
-import fr.imirhil.april.hebdobot.review.Message;
-import fr.imirhil.april.hebdobot.review.Review;
-import fr.imirhil.april.hebdobot.review.Topic;
-
 /**
  * The Class Bot.
  */
@@ -149,7 +148,7 @@ public class Hebdobot extends PircBot
         this.handlers.add(new Handler()
         {
             /* (non-Javadoc)
-             * @see fr.imirhil.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
+             * @see org.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
              */
             @Override
             public boolean handle(final String sender, final String message)
@@ -159,7 +158,8 @@ public class Hebdobot extends PircBot
                 if (StringUtils.equalsIgnoreCase(message, "!help"))
                 {
                     Hebdobot.this.sendMessage(sender, "Bienvenue " + sender);
-                    Hebdobot.this.sendMessage(sender, "Je suis " + Hebdobot.this.getName() + ", le robot de gestion des revues hebdomadaires de l'APRIL");
+                    Hebdobot.this.sendMessage(sender,
+                            "Je suis " + Hebdobot.this.getName() + ", le robot de gestion des revues hebdomadaires de l'APRIL");
                     Hebdobot.this.sendMessage(sender, "Voici les commandes que je comprend :");
                     Hebdobot.this.sendMessage(sender, " ");
                     Hebdobot.this.sendMessage(sender, "— !debut : commencer une nouvelle revue");
@@ -185,7 +185,7 @@ public class Hebdobot extends PircBot
         this.handlers.add(new Handler()
         {
             /* (non-Javadoc)
-             * @see fr.imirhil.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
+             * @see org.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
              */
             @Override
             public boolean handle(final String sender, final String message)
@@ -216,7 +216,7 @@ public class Hebdobot extends PircBot
         this.handlers.add(new Handler()
         {
             /* (non-Javadoc)
-             * @see fr.imirhil.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
+             * @see org.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
              */
             @Override
             public boolean handle(final String sender, final String message)
@@ -247,7 +247,7 @@ public class Hebdobot extends PircBot
         this.handlers.add(new Handler()
         {
             /* (non-Javadoc)
-             * @see fr.imirhil.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
+             * @see org.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
              */
             @Override
             public boolean handle(final String sender, final String message)
@@ -292,7 +292,7 @@ public class Hebdobot extends PircBot
         this.handlers.add(new Handler()
         {
             /* (non-Javadoc)
-             * @see fr.imirhil.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
+             * @see org.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
              */
             @Override
             public boolean handle(final String sender, final String message)
@@ -336,7 +336,7 @@ public class Hebdobot extends PircBot
         this.handlers.add(new Handler()
         {
             /* (non-Javadoc)
-             * @see fr.imirhil.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
+             * @see org.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
              */
             @Override
             public boolean handle(final String sender, final String message)
@@ -373,7 +373,7 @@ public class Hebdobot extends PircBot
         this.handlers.add(new Handler()
         {
             /* (non-Javadoc)
-             * @see fr.imirhil.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
+             * @see org.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
              */
             @Override
             public boolean handle(final String sender, final String message)
@@ -405,7 +405,8 @@ public class Hebdobot extends PircBot
                         }
                         else
                         {
-                            Hebdobot.this.sendMessage(String.format("Les participants suivants sont manquants : %1s", StringUtils.join(missing, ", ")));
+                            Hebdobot.this
+                                    .sendMessage(String.format("Les participants suivants sont manquants : %1s", StringUtils.join(missing, ", ")));
                             result = true;
                         }
                     }
@@ -420,7 +421,7 @@ public class Hebdobot extends PircBot
         this.handlers.add(new Handler()
         {
             /* (non-Javadoc)
-             * @see fr.imirhil.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
+             * @see org.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
              */
             @Override
             public boolean handle(final String sender, final String message)
@@ -459,7 +460,7 @@ public class Hebdobot extends PircBot
         this.handlers.add(new Handler()
         {
             /* (non-Javadoc)
-             * @see fr.imirhil.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
+             * @see org.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
              */
             @Override
             public boolean handle(final String sender, final String message)
@@ -485,7 +486,7 @@ public class Hebdobot extends PircBot
         this.handlers.add(new Handler()
         {
             /* (non-Javadoc)
-             * @see fr.imirhil.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
+             * @see org.april.hebdobot.irc.Bot.Handler#handle(java.lang.String, java.lang.String)
              */
             @Override
             public boolean handle(final String sender, final String message)
diff --git a/src/main/java/fr/imirhil/april/hebdobot/irc/ReviewListener.java b/src/main/java/org/april/hebdobot/irc/ReviewListener.java
similarity index 94%
rename from src/main/java/fr/imirhil/april/hebdobot/irc/ReviewListener.java
rename to src/main/java/org/april/hebdobot/irc/ReviewListener.java
index a30b7f9..b688319 100644
--- a/src/main/java/fr/imirhil/april/hebdobot/irc/ReviewListener.java
+++ b/src/main/java/org/april/hebdobot/irc/ReviewListener.java
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Hebdobot.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.imirhil.april.hebdobot.irc;
+package org.april.hebdobot.irc;
 
-import fr.imirhil.april.hebdobot.review.Review;
+import org.april.hebdobot.review.Review;
 
 /**
  * The listener interface for receiving review events. The class that is
diff --git a/src/main/java/fr/imirhil/april/hebdobot/pastebin/APIException.java b/src/main/java/org/april/hebdobot/pastebin/APIException.java
similarity index 97%
rename from src/main/java/fr/imirhil/april/hebdobot/pastebin/APIException.java
rename to src/main/java/org/april/hebdobot/pastebin/APIException.java
index f9cf442..e4ba850 100644
--- a/src/main/java/fr/imirhil/april/hebdobot/pastebin/APIException.java
+++ b/src/main/java/org/april/hebdobot/pastebin/APIException.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Hebdobot.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.imirhil.april.hebdobot.pastebin;
+package org.april.hebdobot.pastebin;
 
 public class APIException extends Exception
 {
diff --git a/src/main/java/fr/imirhil/april/hebdobot/pastebin/Expiration.java b/src/main/java/org/april/hebdobot/pastebin/Expiration.java
similarity index 96%
rename from src/main/java/fr/imirhil/april/hebdobot/pastebin/Expiration.java
rename to src/main/java/org/april/hebdobot/pastebin/Expiration.java
index d0ec39f..2e32510 100644
--- a/src/main/java/fr/imirhil/april/hebdobot/pastebin/Expiration.java
+++ b/src/main/java/org/april/hebdobot/pastebin/Expiration.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Hebdobot.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.imirhil.april.hebdobot.pastebin;
+package org.april.hebdobot.pastebin;
 
 /**
  * The Enum Expiration.
diff --git a/src/main/java/fr/imirhil/april/hebdobot/pastebin/Format.java b/src/main/java/org/april/hebdobot/pastebin/Format.java
similarity index 96%
rename from src/main/java/fr/imirhil/april/hebdobot/pastebin/Format.java
rename to src/main/java/org/april/hebdobot/pastebin/Format.java
index 610b9cc..ddc3ede 100644
--- a/src/main/java/fr/imirhil/april/hebdobot/pastebin/Format.java
+++ b/src/main/java/org/april/hebdobot/pastebin/Format.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Hebdobot.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.imirhil.april.hebdobot.pastebin;
+package org.april.hebdobot.pastebin;
 
 /**
  * The Enum Format.
diff --git a/src/main/java/fr/imirhil/april/hebdobot/pastebin/Option.java b/src/main/java/org/april/hebdobot/pastebin/Option.java
similarity index 96%
rename from src/main/java/fr/imirhil/april/hebdobot/pastebin/Option.java
rename to src/main/java/org/april/hebdobot/pastebin/Option.java
index b9b9212..2eeaa1e 100644
--- a/src/main/java/fr/imirhil/april/hebdobot/pastebin/Option.java
+++ b/src/main/java/org/april/hebdobot/pastebin/Option.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Hebdobot.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.imirhil.april.hebdobot.pastebin;
+package org.april.hebdobot.pastebin;
 
 /**
  * The Enum Option.
diff --git a/src/main/java/fr/imirhil/april/hebdobot/pastebin/PastebinClient.java b/src/main/java/org/april/hebdobot/pastebin/PastebinClient.java
similarity index 99%
rename from src/main/java/fr/imirhil/april/hebdobot/pastebin/PastebinClient.java
rename to src/main/java/org/april/hebdobot/pastebin/PastebinClient.java
index 93d822f..9cd2c19 100644
--- a/src/main/java/fr/imirhil/april/hebdobot/pastebin/PastebinClient.java
+++ b/src/main/java/org/april/hebdobot/pastebin/PastebinClient.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Hebdobot.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.imirhil.april.hebdobot.pastebin;
+package org.april.hebdobot.pastebin;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/src/main/java/fr/imirhil/april/hebdobot/pastebin/Private.java b/src/main/java/org/april/hebdobot/pastebin/Private.java
similarity index 96%
rename from src/main/java/fr/imirhil/april/hebdobot/pastebin/Private.java
rename to src/main/java/org/april/hebdobot/pastebin/Private.java
index a995fb5..b770d40 100644
--- a/src/main/java/fr/imirhil/april/hebdobot/pastebin/Private.java
+++ b/src/main/java/org/april/hebdobot/pastebin/Private.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Hebdobot.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.imirhil.april.hebdobot.pastebin;
+package org.april.hebdobot.pastebin;
 
 /**
  * The Enum Private.
diff --git a/src/main/java/fr/imirhil/april/hebdobot/review/CollectiveTopic.java b/src/main/java/org/april/hebdobot/review/CollectiveTopic.java
similarity index 90%
rename from src/main/java/fr/imirhil/april/hebdobot/review/CollectiveTopic.java
rename to src/main/java/org/april/hebdobot/review/CollectiveTopic.java
index 20bbf79..3448a1a 100644
--- a/src/main/java/fr/imirhil/april/hebdobot/review/CollectiveTopic.java
+++ b/src/main/java/org/april/hebdobot/review/CollectiveTopic.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Hebdobot.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.imirhil.april.hebdobot.review;
+package org.april.hebdobot.review;
 
 import java.util.HashSet;
 import java.util.List;
@@ -44,7 +44,7 @@ public class CollectiveTopic extends Topic
     }
 
     /* (non-Javadoc)
-     * @see fr.imirhil.april.hebdobot.review.Topic#add(fr.imirhil.april.hebdobot.review.Message)
+     * @see org.april.hebdobot.review.Topic#add(org.april.hebdobot.review.Message)
      */
     @Override
     public void add(final Message message)
@@ -63,7 +63,7 @@ public class CollectiveTopic extends Topic
     }
 
     /* (non-Javadoc)
-     * @see fr.imirhil.april.hebdobot.review.Topic#getParticipants()
+     * @see org.april.hebdobot.review.Topic#getParticipants()
      */
     @Override
     public Set<String> getParticipants()
diff --git a/src/main/java/fr/imirhil/april/hebdobot/review/IndividualTopic.java b/src/main/java/org/april/hebdobot/review/IndividualTopic.java
similarity index 91%
rename from src/main/java/fr/imirhil/april/hebdobot/review/IndividualTopic.java
rename to src/main/java/org/april/hebdobot/review/IndividualTopic.java
index a17dfa0..6f9d615 100644
--- a/src/main/java/fr/imirhil/april/hebdobot/review/IndividualTopic.java
+++ b/src/main/java/org/april/hebdobot/review/IndividualTopic.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Hebdobot.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.imirhil.april.hebdobot.review;
+package org.april.hebdobot.review;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -44,7 +44,7 @@ public class IndividualTopic extends Topic
     }
 
     /* (non-Javadoc)
-     * @see fr.imirhil.april.hebdobot.review.Topic#add(fr.imirhil.april.hebdobot.review.Message)
+     * @see org.april.hebdobot.review.Topic#add(org.april.hebdobot.review.Message)
      */
     @Override
     public void add(final Message message)
@@ -70,7 +70,7 @@ public class IndividualTopic extends Topic
     }
 
     /* (non-Javadoc)
-     * @see fr.imirhil.april.hebdobot.review.Topic#getParticipants()
+     * @see org.april.hebdobot.review.Topic#getParticipants()
      */
     @Override
     public Set<String> getParticipants()
diff --git a/src/main/java/fr/imirhil/april/hebdobot/review/Message.java b/src/main/java/org/april/hebdobot/review/Message.java
similarity index 97%
rename from src/main/java/fr/imirhil/april/hebdobot/review/Message.java
rename to src/main/java/org/april/hebdobot/review/Message.java
index ab19ee5..fe9a14a 100644
--- a/src/main/java/fr/imirhil/april/hebdobot/review/Message.java
+++ b/src/main/java/org/april/hebdobot/review/Message.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Hebdobot.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.imirhil.april.hebdobot.review;
+package org.april.hebdobot.review;
 
 import org.joda.time.DateTime;
 
diff --git a/src/main/java/fr/imirhil/april/hebdobot/review/Messages.java b/src/main/java/org/april/hebdobot/review/Messages.java
similarity index 96%
rename from src/main/java/fr/imirhil/april/hebdobot/review/Messages.java
rename to src/main/java/org/april/hebdobot/review/Messages.java
index 90ed7d5..30abde9 100644
--- a/src/main/java/fr/imirhil/april/hebdobot/review/Messages.java
+++ b/src/main/java/org/april/hebdobot/review/Messages.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Hebdobot.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.imirhil.april.hebdobot.review;
+package org.april.hebdobot.review;
 
 import java.util.LinkedList;
 
diff --git a/src/main/java/fr/imirhil/april/hebdobot/review/Review.java b/src/main/java/org/april/hebdobot/review/Review.java
similarity index 98%
rename from src/main/java/fr/imirhil/april/hebdobot/review/Review.java
rename to src/main/java/org/april/hebdobot/review/Review.java
index c6033f9..6963633 100644
--- a/src/main/java/fr/imirhil/april/hebdobot/review/Review.java
+++ b/src/main/java/org/april/hebdobot/review/Review.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Hebdobot.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.imirhil.april.hebdobot.review;
+package org.april.hebdobot.review;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -26,12 +26,11 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
+import org.april.hebdobot.Context;
+import org.april.hebdobot.xml.UserAlias;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 
-import fr.imirhil.april.hebdobot.Context;
-import fr.imirhil.april.hebdobot.xml.UserAlias;
-
 /**
  * The Class Review.
  */
diff --git a/src/main/java/fr/imirhil/april/hebdobot/review/Topic.java b/src/main/java/org/april/hebdobot/review/Topic.java
similarity index 97%
rename from src/main/java/fr/imirhil/april/hebdobot/review/Topic.java
rename to src/main/java/org/april/hebdobot/review/Topic.java
index 4091338..09caea9 100644
--- a/src/main/java/fr/imirhil/april/hebdobot/review/Topic.java
+++ b/src/main/java/org/april/hebdobot/review/Topic.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Hebdobot.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.imirhil.april.hebdobot.review;
+package org.april.hebdobot.review;
 
 import java.util.Set;
 
diff --git a/src/main/java/fr/imirhil/april/hebdobot/xml/UserAlias.java b/src/main/java/org/april/hebdobot/xml/UserAlias.java
similarity index 95%
rename from src/main/java/fr/imirhil/april/hebdobot/xml/UserAlias.java
rename to src/main/java/org/april/hebdobot/xml/UserAlias.java
index b890f8d..9bcc449 100644
--- a/src/main/java/fr/imirhil/april/hebdobot/xml/UserAlias.java
+++ b/src/main/java/org/april/hebdobot/xml/UserAlias.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Hebdobot.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.imirhil.april.hebdobot.xml;
+package org.april.hebdobot.xml;
 
 import java.io.InputStream;
 import java.util.HashMap;
@@ -53,7 +53,7 @@ public class UserAlias
         {
             final Unmarshaller unmarshaller = JAXBContext.newInstance(Users.class).createUnmarshaller();
             unmarshaller.setSchema(SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI)
-                    .newSchema(UserAlias.class.getResource("/fr/imirhil/april/hebdobot/users.xsd")));
+                    .newSchema(UserAlias.class.getResource("/org/april/hebdobot/users.xsd")));
 
             for (final User user : unmarshaller.unmarshal(new StreamSource(source), Users.class).getValue().getUser())
             {
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
index 2f5926c..1dae77d 100644
--- a/src/main/resources/log4j.properties
+++ b/src/main/resources/log4j.properties
@@ -1,6 +1,6 @@
 log4j.rootLogger = warn, stdout
 
-log4j.logger.fr.imirhil.april.hebdobot = info
+log4j.logger.org.april.hebdobot = info
 
 log4j.appender.stdout = org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout = org.apache.log4j.PatternLayout
diff --git a/src/main/resources/fr/imirhil/april/hebdobot/users.xjb b/src/main/resources/org/april/hebdobot/users.xjb
similarity index 82%
rename from src/main/resources/fr/imirhil/april/hebdobot/users.xjb
rename to src/main/resources/org/april/hebdobot/users.xjb
index 690db61..56d3759 100644
--- a/src/main/resources/fr/imirhil/april/hebdobot/users.xjb
+++ b/src/main/resources/org/april/hebdobot/users.xjb
@@ -3,7 +3,7 @@
 	xmlns:xsi="http://www.w3.org/2000/10/XMLSchema-instance" version="2.1">
 	<bindings schemaLocation="users.xsd">
 		<schemaBindings>
-			<package name="fr.imirhil.april.hebdobot.xml" />
+			<package name="org.april.hebdobot.xml" />
 		</schemaBindings>
 	</bindings>
 </bindings>
\ No newline at end of file
diff --git a/src/main/resources/fr/imirhil/april/hebdobot/users.xsd b/src/main/resources/org/april/hebdobot/users.xsd
similarity index 100%
rename from src/main/resources/fr/imirhil/april/hebdobot/users.xsd
rename to src/main/resources/org/april/hebdobot/users.xsd
diff --git a/src/test/java/fr/imirhil/april/hebdobot/irc/BotTest.java b/src/test/java/org/april/hebdobot/irc/BotTest.java
similarity index 89%
rename from src/test/java/fr/imirhil/april/hebdobot/irc/BotTest.java
rename to src/test/java/org/april/hebdobot/irc/BotTest.java
index 1e6db6b..c6dae72 100644
--- a/src/test/java/fr/imirhil/april/hebdobot/irc/BotTest.java
+++ b/src/test/java/org/april/hebdobot/irc/BotTest.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Hebdobot.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.imirhil.april.hebdobot.irc;
+package org.april.hebdobot.irc;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -29,6 +29,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.commons.io.FileUtils;
+import org.april.hebdobot.review.Review;
 import org.joda.time.DateTime;
 import org.joda.time.format.ISODateTimeFormat;
 import org.junit.Test;
@@ -36,13 +37,11 @@ import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import fr.imirhil.april.hebdobot.review.Review;
-
 /**
  * The Class BotTest.
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = "/fr/imirhil/april/hebdobot/conf.xml")
+@ContextConfiguration(locations = "/org/april/hebdobot/conf.xml")
 public class BotTest implements ReviewListener
 {
     /**
@@ -62,7 +61,7 @@ public class BotTest implements ReviewListener
         }
 
         /* (non-Javadoc)
-         * @see fr.imirhil.april.hebdobot.irc.Bot#onMessage(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+         * @see org.april.hebdobot.irc.Bot#onMessage(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
          */
         @Override
         public void onMessage(final String channel, final String sender, final String login, final String hostname, final String message)
@@ -72,7 +71,7 @@ public class BotTest implements ReviewListener
     }
 
     /* (non-Javadoc)
-     * @see fr.imirhil.april.hebdobot.irc.ReviewListener#onEnd(fr.imirhil.april.hebdobot.review.Review)
+     * @see org.april.hebdobot.irc.ReviewListener#onEnd(org.april.hebdobot.review.Review)
      */
     @Override
     public void onEnd(final Review review)
@@ -102,7 +101,7 @@ public class BotTest implements ReviewListener
         final Hebdobot bot = new BotMock();
         bot.add(this);
 
-        final InputStream is = BotTest.class.getResourceAsStream("/fr/imirhil/april/hebdobot/review.log");
+        final InputStream is = BotTest.class.getResourceAsStream("/org/april/hebdobot/review.log");
         if (is == null)
         {
             return;
diff --git a/src/test/java/fr/imirhil/april/hebdobot/pastebin/PastebinClientTest.java b/src/test/java/org/april/hebdobot/pastebin/PastebinClientTest.java
similarity index 90%
rename from src/test/java/fr/imirhil/april/hebdobot/pastebin/PastebinClientTest.java
rename to src/test/java/org/april/hebdobot/pastebin/PastebinClientTest.java
index 7bb90a5..db0b9b3 100644
--- a/src/test/java/fr/imirhil/april/hebdobot/pastebin/PastebinClientTest.java
+++ b/src/test/java/org/april/hebdobot/pastebin/PastebinClientTest.java
@@ -17,8 +17,10 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Hebdobot.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.imirhil.april.hebdobot.pastebin;
+package org.april.hebdobot.pastebin;
 
+import org.april.hebdobot.pastebin.Expiration;
+import org.april.hebdobot.pastebin.PastebinClient;
 import org.junit.Test;
 
 /**
diff --git a/src/test/resources/fr/imirhil/april/hebdobot/conf.xml b/src/test/resources/org/april/hebdobot/conf.xml
similarity index 69%
rename from src/test/resources/fr/imirhil/april/hebdobot/conf.xml
rename to src/test/resources/org/april/hebdobot/conf.xml
index 25611ac..5e297c0 100644
--- a/src/test/resources/fr/imirhil/april/hebdobot/conf.xml
+++ b/src/test/resources/org/april/hebdobot/conf.xml
@@ -3,7 +3,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
-	<context:component-scan base-package="fr.imirhil.april.hebdobot" />
+	<context:component-scan base-package="org.april.hebdobot" />
 
 	<bean id="properties"
 		class="org.springframework.beans.factory.config.PropertiesFactoryBean">
@@ -14,9 +14,9 @@
 		</property>
 	</bean>
 
-	<bean id="userAliases" class="fr.imirhil.april.hebdobot.xml.UserAlias">
-		<constructor-arg name="source" value="classpath:/fr/imirhil/april/hebdobot/users.xml" />
+	<bean id="userAliases" class="org.april.hebdobot.xml.UserAlias">
+		<constructor-arg name="source" value="classpath:/org/april/hebdobot/users.xml" />
 	</bean>
 
-	<bean id="bot" class="fr.imirhil.april.hebdobot.irc.BotTest.BotMock" />
+	<bean id="bot" class="org.april.hebdobot.irc.BotTest.BotMock" />
 </beans>
diff --git a/src/test/resources/fr/imirhil/april/hebdobot/users.xml b/src/test/resources/org/april/hebdobot/users.xml
similarity index 100%
rename from src/test/resources/fr/imirhil/april/hebdobot/users.xml
rename to src/test/resources/org/april/hebdobot/users.xml