diff --git a/src/org/april/hebdobot/model/Hebdobot.java b/src/org/april/hebdobot/model/Hebdobot.java
index 25cf4b0..a7d3330 100644
--- a/src/org/april/hebdobot/model/Hebdobot.java
+++ b/src/org/april/hebdobot/model/Hebdobot.java
@@ -31,14 +31,14 @@ import org.april.hebdobot.HebdobotException;
import org.april.hebdobot.cron.CronManager;
import org.april.hebdobot.cron.CronSettings;
import org.april.hebdobot.identica.IdenticaSettings;
+import org.april.hebdobot.model.review.CollectiveTopic;
+import org.april.hebdobot.model.review.IndividualTopic;
+import org.april.hebdobot.model.review.Message;
+import org.april.hebdobot.model.review.Review;
+import org.april.hebdobot.model.review.Topic;
import org.april.hebdobot.pastebin.PastebinClient;
import org.april.hebdobot.pastebin.PastebinSettings;
import org.april.hebdobot.pastebin.Private;
-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.april.hebdobot.twitter.TwitterClient;
import org.april.hebdobot.twitter.TwitterSettings;
import org.april.hebdobot.util.BuildInformation;
diff --git a/src/org/april/hebdobot/review/CollectiveTopic.java b/src/org/april/hebdobot/model/review/CollectiveTopic.java
similarity index 98%
rename from src/org/april/hebdobot/review/CollectiveTopic.java
rename to src/org/april/hebdobot/model/review/CollectiveTopic.java
index 3448a1a..425e830 100644
--- a/src/org/april/hebdobot/review/CollectiveTopic.java
+++ b/src/org/april/hebdobot/model/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
*/
-package org.april.hebdobot.review;
+package org.april.hebdobot.model.review;
import java.util.HashSet;
import java.util.List;
diff --git a/src/org/april/hebdobot/review/IndividualTopic.java b/src/org/april/hebdobot/model/review/IndividualTopic.java
similarity index 98%
rename from src/org/april/hebdobot/review/IndividualTopic.java
rename to src/org/april/hebdobot/model/review/IndividualTopic.java
index c329b4b..95b773b 100644
--- a/src/org/april/hebdobot/review/IndividualTopic.java
+++ b/src/org/april/hebdobot/model/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
*/
-package org.april.hebdobot.review;
+package org.april.hebdobot.model.review;
import java.util.HashMap;
import java.util.Map;
diff --git a/src/org/april/hebdobot/review/Message.java b/src/org/april/hebdobot/model/review/Message.java
similarity index 97%
rename from src/org/april/hebdobot/review/Message.java
rename to src/org/april/hebdobot/model/review/Message.java
index fe9a14a..6c92fda 100644
--- a/src/org/april/hebdobot/review/Message.java
+++ b/src/org/april/hebdobot/model/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
*/
-package org.april.hebdobot.review;
+package org.april.hebdobot.model.review;
import org.joda.time.DateTime;
diff --git a/src/org/april/hebdobot/review/MessageList.java b/src/org/april/hebdobot/model/review/MessageList.java
similarity index 96%
rename from src/org/april/hebdobot/review/MessageList.java
rename to src/org/april/hebdobot/model/review/MessageList.java
index 43a9fd3..6097e33 100644
--- a/src/org/april/hebdobot/review/MessageList.java
+++ b/src/org/april/hebdobot/model/review/MessageList.java
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with Hebdobot. If not, see
*/
-package org.april.hebdobot.review;
+package org.april.hebdobot.model.review;
import java.util.ArrayList;
diff --git a/src/org/april/hebdobot/review/Messages.java b/src/org/april/hebdobot/model/review/Messages.java
similarity index 96%
rename from src/org/april/hebdobot/review/Messages.java
rename to src/org/april/hebdobot/model/review/Messages.java
index 30abde9..5a21b97 100644
--- a/src/org/april/hebdobot/review/Messages.java
+++ b/src/org/april/hebdobot/model/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
*/
-package org.april.hebdobot.review;
+package org.april.hebdobot.model.review;
import java.util.LinkedList;
diff --git a/src/org/april/hebdobot/review/Review.java b/src/org/april/hebdobot/model/review/Review.java
similarity index 99%
rename from src/org/april/hebdobot/review/Review.java
rename to src/org/april/hebdobot/model/review/Review.java
index 8783ff9..c0b1871 100644
--- a/src/org/april/hebdobot/review/Review.java
+++ b/src/org/april/hebdobot/model/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
*/
-package org.april.hebdobot.review;
+package org.april.hebdobot.model.review;
import java.util.Collection;
import java.util.HashSet;
diff --git a/src/org/april/hebdobot/review/Topic.java b/src/org/april/hebdobot/model/review/Topic.java
similarity index 97%
rename from src/org/april/hebdobot/review/Topic.java
rename to src/org/april/hebdobot/model/review/Topic.java
index 09caea9..eeadcd0 100644
--- a/src/org/april/hebdobot/review/Topic.java
+++ b/src/org/april/hebdobot/model/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
*/
-package org.april.hebdobot.review;
+package org.april.hebdobot.model.review;
import java.util.Set;