diff --git a/src/main/java/com/commafeed/backend/StartupBean.java b/src/main/java/com/commafeed/backend/StartupBean.java
index ec80b7a9..f501e7cb 100644
--- a/src/main/java/com/commafeed/backend/StartupBean.java
+++ b/src/main/java/com/commafeed/backend/StartupBean.java
@@ -12,11 +12,11 @@ import com.commafeed.backend.dao.FeedCategoryService;
 import com.commafeed.backend.dao.FeedService;
 import com.commafeed.backend.dao.FeedSubscriptionService;
 import com.commafeed.backend.dao.UserService;
+import com.commafeed.backend.model.Feed;
+import com.commafeed.backend.model.FeedCategory;
+import com.commafeed.backend.model.FeedSubscription;
+import com.commafeed.backend.model.User;
 import com.commafeed.backend.security.PasswordEncryptionService;
-import com.commafeed.model.Feed;
-import com.commafeed.model.FeedCategory;
-import com.commafeed.model.FeedSubscription;
-import com.commafeed.model.User;
 
 @Startup
 @Singleton
diff --git a/src/main/java/com/commafeed/backend/dao/FeedCategoryService.java b/src/main/java/com/commafeed/backend/dao/FeedCategoryService.java
index 671b6217..91d56adc 100644
--- a/src/main/java/com/commafeed/backend/dao/FeedCategoryService.java
+++ b/src/main/java/com/commafeed/backend/dao/FeedCategoryService.java
@@ -4,9 +4,9 @@ import java.util.List;
 
 import javax.ejb.Stateless;
 
+import com.commafeed.backend.model.FeedCategory;
+import com.commafeed.backend.model.User;
 import com.commafeed.frontend.utils.ModelFactory.MF;
-import com.commafeed.model.FeedCategory;
-import com.commafeed.model.User;
 
 @Stateless
 public class FeedCategoryService extends GenericDAO<FeedCategory, Long> {
diff --git a/src/main/java/com/commafeed/backend/dao/FeedEntryService.java b/src/main/java/com/commafeed/backend/dao/FeedEntryService.java
index 6ca45b95..d4c30708 100644
--- a/src/main/java/com/commafeed/backend/dao/FeedEntryService.java
+++ b/src/main/java/com/commafeed/backend/dao/FeedEntryService.java
@@ -8,10 +8,10 @@ import javax.ejb.Stateless;
 import javax.inject.Inject;
 import javax.persistence.TypedQuery;
 
+import com.commafeed.backend.model.Feed;
+import com.commafeed.backend.model.FeedEntry;
+import com.commafeed.backend.model.User;
 import com.commafeed.frontend.utils.ModelFactory.MF;
-import com.commafeed.model.Feed;
-import com.commafeed.model.FeedEntry;
-import com.commafeed.model.User;
 import com.google.common.collect.Iterables;
 
 @Stateless
diff --git a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusService.java b/src/main/java/com/commafeed/backend/dao/FeedEntryStatusService.java
index 18fd4c90..a5019377 100644
--- a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusService.java
+++ b/src/main/java/com/commafeed/backend/dao/FeedEntryStatusService.java
@@ -2,7 +2,7 @@ package com.commafeed.backend.dao;
 
 import javax.ejb.Stateless;
 
-import com.commafeed.model.FeedEntryStatus;
+import com.commafeed.backend.model.FeedEntryStatus;
 
 @Stateless
 public class FeedEntryStatusService extends GenericDAO<FeedEntryStatus, Long> {
diff --git a/src/main/java/com/commafeed/backend/dao/FeedService.java b/src/main/java/com/commafeed/backend/dao/FeedService.java
index b53b7391..aea8d5bb 100644
--- a/src/main/java/com/commafeed/backend/dao/FeedService.java
+++ b/src/main/java/com/commafeed/backend/dao/FeedService.java
@@ -2,7 +2,7 @@ package com.commafeed.backend.dao;
 
 import javax.ejb.Stateless;
 
-import com.commafeed.model.Feed;
+import com.commafeed.backend.model.Feed;
 
 @Stateless
 public class FeedService extends GenericDAO<Feed, Long> {
diff --git a/src/main/java/com/commafeed/backend/dao/FeedSubscriptionService.java b/src/main/java/com/commafeed/backend/dao/FeedSubscriptionService.java
index e4eb7baf..402e9eea 100644
--- a/src/main/java/com/commafeed/backend/dao/FeedSubscriptionService.java
+++ b/src/main/java/com/commafeed/backend/dao/FeedSubscriptionService.java
@@ -8,10 +8,10 @@ import javax.persistence.TypedQuery;
 
 import org.apache.commons.lang.ObjectUtils;
 
+import com.commafeed.backend.model.FeedCategory;
+import com.commafeed.backend.model.FeedSubscription;
+import com.commafeed.backend.model.User;
 import com.commafeed.frontend.utils.ModelFactory.MF;
-import com.commafeed.model.FeedCategory;
-import com.commafeed.model.FeedSubscription;
-import com.commafeed.model.User;
 import com.google.common.collect.Lists;
 import com.uaihebert.factory.EasyCriteriaFactory;
 import com.uaihebert.model.EasyCriteria;
diff --git a/src/main/java/com/commafeed/backend/dao/UserService.java b/src/main/java/com/commafeed/backend/dao/UserService.java
index eca4986b..12630e2e 100644
--- a/src/main/java/com/commafeed/backend/dao/UserService.java
+++ b/src/main/java/com/commafeed/backend/dao/UserService.java
@@ -5,9 +5,9 @@ import java.util.List;
 import javax.ejb.Stateless;
 import javax.inject.Inject;
 
+import com.commafeed.backend.model.User;
 import com.commafeed.backend.security.PasswordEncryptionService;
 import com.commafeed.frontend.utils.ModelFactory.MF;
-import com.commafeed.model.User;
 import com.google.common.collect.Iterables;
 
 @Stateless
diff --git a/src/main/java/com/commafeed/backend/feeds/FeedFetcher.java b/src/main/java/com/commafeed/backend/feeds/FeedFetcher.java
index 47f658f0..5ab4d7ab 100644
--- a/src/main/java/com/commafeed/backend/feeds/FeedFetcher.java
+++ b/src/main/java/com/commafeed/backend/feeds/FeedFetcher.java
@@ -21,7 +21,7 @@ import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.commafeed.model.Feed;
+import com.commafeed.backend.model.Feed;
 
 @Singleton
 public class FeedFetcher {
diff --git a/src/main/java/com/commafeed/backend/feeds/FeedParser.java b/src/main/java/com/commafeed/backend/feeds/FeedParser.java
index 478a68a7..d9377026 100644
--- a/src/main/java/com/commafeed/backend/feeds/FeedParser.java
+++ b/src/main/java/com/commafeed/backend/feeds/FeedParser.java
@@ -11,8 +11,8 @@ import org.apache.commons.lang.SystemUtils;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 
-import com.commafeed.model.Feed;
-import com.commafeed.model.FeedEntry;
+import com.commafeed.backend.model.Feed;
+import com.commafeed.backend.model.FeedEntry;
 import com.google.common.base.Function;
 import com.google.common.collect.Collections2;
 import com.sun.syndication.feed.synd.SyndContent;
diff --git a/src/main/java/com/commafeed/backend/feeds/FeedTimer.java b/src/main/java/com/commafeed/backend/feeds/FeedTimer.java
index 222b7049..c6d30e9a 100644
--- a/src/main/java/com/commafeed/backend/feeds/FeedTimer.java
+++ b/src/main/java/com/commafeed/backend/feeds/FeedTimer.java
@@ -9,7 +9,7 @@ import javax.inject.Inject;
 
 import com.commafeed.backend.dao.FeedEntryService;
 import com.commafeed.backend.dao.FeedService;
-import com.commafeed.model.Feed;
+import com.commafeed.backend.model.Feed;
 import com.google.common.collect.Lists;
 
 @Singleton
diff --git a/src/main/java/com/commafeed/model/AbstractModel.java b/src/main/java/com/commafeed/backend/model/AbstractModel.java
similarity index 87%
rename from src/main/java/com/commafeed/model/AbstractModel.java
rename to src/main/java/com/commafeed/backend/model/AbstractModel.java
index 940056e1..235cd292 100644
--- a/src/main/java/com/commafeed/model/AbstractModel.java
+++ b/src/main/java/com/commafeed/backend/model/AbstractModel.java
@@ -1,4 +1,4 @@
-package com.commafeed.model;
+package com.commafeed.backend.model;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/com/commafeed/model/Feed.java b/src/main/java/com/commafeed/backend/model/Feed.java
similarity index 91%
rename from src/main/java/com/commafeed/model/Feed.java
rename to src/main/java/com/commafeed/backend/model/Feed.java
index f41c3b33..a348b5f8 100644
--- a/src/main/java/com/commafeed/model/Feed.java
+++ b/src/main/java/com/commafeed/backend/model/Feed.java
@@ -1,4 +1,4 @@
-package com.commafeed.model;
+package com.commafeed.backend.model;
 
 import java.util.Date;
 import java.util.Set;
diff --git a/src/main/java/com/commafeed/model/FeedCategory.java b/src/main/java/com/commafeed/backend/model/FeedCategory.java
similarity index 92%
rename from src/main/java/com/commafeed/model/FeedCategory.java
rename to src/main/java/com/commafeed/backend/model/FeedCategory.java
index d56b709b..474c961a 100644
--- a/src/main/java/com/commafeed/model/FeedCategory.java
+++ b/src/main/java/com/commafeed/backend/model/FeedCategory.java
@@ -1,4 +1,4 @@
-package com.commafeed.model;
+package com.commafeed.backend.model;
 
 import java.util.Set;
 
diff --git a/src/main/java/com/commafeed/model/FeedEntry.java b/src/main/java/com/commafeed/backend/model/FeedEntry.java
similarity index 91%
rename from src/main/java/com/commafeed/model/FeedEntry.java
rename to src/main/java/com/commafeed/backend/model/FeedEntry.java
index 3ee102ba..e5246945 100644
--- a/src/main/java/com/commafeed/model/FeedEntry.java
+++ b/src/main/java/com/commafeed/backend/model/FeedEntry.java
@@ -1,4 +1,4 @@
-package com.commafeed.model;
+package com.commafeed.backend.model;
 
 import java.util.Date;
 
diff --git a/src/main/java/com/commafeed/model/FeedEntryStatus.java b/src/main/java/com/commafeed/backend/model/FeedEntryStatus.java
similarity index 90%
rename from src/main/java/com/commafeed/model/FeedEntryStatus.java
rename to src/main/java/com/commafeed/backend/model/FeedEntryStatus.java
index e1d8337d..acd1434d 100644
--- a/src/main/java/com/commafeed/model/FeedEntryStatus.java
+++ b/src/main/java/com/commafeed/backend/model/FeedEntryStatus.java
@@ -1,4 +1,4 @@
-package com.commafeed.model;
+package com.commafeed.backend.model;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/src/main/java/com/commafeed/model/FeedSubscription.java b/src/main/java/com/commafeed/backend/model/FeedSubscription.java
similarity index 90%
rename from src/main/java/com/commafeed/model/FeedSubscription.java
rename to src/main/java/com/commafeed/backend/model/FeedSubscription.java
index 59ca5fd7..e62ca49f 100644
--- a/src/main/java/com/commafeed/model/FeedSubscription.java
+++ b/src/main/java/com/commafeed/backend/model/FeedSubscription.java
@@ -1,4 +1,4 @@
-package com.commafeed.model;
+package com.commafeed.backend.model;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/src/main/java/com/commafeed/model/User.java b/src/main/java/com/commafeed/backend/model/User.java
similarity index 89%
rename from src/main/java/com/commafeed/model/User.java
rename to src/main/java/com/commafeed/backend/model/User.java
index 2f31b03d..712f4e9a 100644
--- a/src/main/java/com/commafeed/model/User.java
+++ b/src/main/java/com/commafeed/backend/model/User.java
@@ -1,4 +1,4 @@
-package com.commafeed.model;
+package com.commafeed.backend.model;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/src/main/java/com/commafeed/model/UserSettings.java b/src/main/java/com/commafeed/backend/model/UserSettings.java
similarity index 90%
rename from src/main/java/com/commafeed/model/UserSettings.java
rename to src/main/java/com/commafeed/backend/model/UserSettings.java
index da4b9a68..5c435fa6 100644
--- a/src/main/java/com/commafeed/model/UserSettings.java
+++ b/src/main/java/com/commafeed/backend/model/UserSettings.java
@@ -1,4 +1,4 @@
-package com.commafeed.model;
+package com.commafeed.backend.model;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/src/main/java/com/commafeed/frontend/CommaFeedApplication.java b/src/main/java/com/commafeed/frontend/CommaFeedApplication.java
index eb54580c..3ad74c85 100644
--- a/src/main/java/com/commafeed/frontend/CommaFeedApplication.java
+++ b/src/main/java/com/commafeed/frontend/CommaFeedApplication.java
@@ -26,9 +26,9 @@ import org.apache.wicket.request.cycle.RequestCycle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.commafeed.frontend.components.auth.LoginPage;
-import com.commafeed.frontend.components.auth.LogoutPage;
-import com.commafeed.frontend.pages.home.HomePage;
+import com.commafeed.frontend.pages.HomePage;
+import com.commafeed.frontend.pages.LoginPage;
+import com.commafeed.frontend.pages.LogoutPage;
 import com.commafeed.frontend.utils.exception.DisplayExceptionPage;
 
 public class CommaFeedApplication extends AuthenticatedWebApplication {
diff --git a/src/main/java/com/commafeed/frontend/CommaFeedSession.java b/src/main/java/com/commafeed/frontend/CommaFeedSession.java
index 1c55acc7..16cd6f83 100644
--- a/src/main/java/com/commafeed/frontend/CommaFeedSession.java
+++ b/src/main/java/com/commafeed/frontend/CommaFeedSession.java
@@ -8,8 +8,8 @@ import org.apache.wicket.authroles.authorization.strategies.role.Roles;
 import org.apache.wicket.request.Request;
 
 import com.commafeed.backend.dao.UserService;
-import com.commafeed.frontend.components.auth.Role;
-import com.commafeed.model.User;
+import com.commafeed.backend.model.User;
+import com.commafeed.frontend.pages.auth.Role;
 
 @SuppressWarnings("serial")
 public class CommaFeedSession extends AuthenticatedWebSession {
diff --git a/src/main/java/com/commafeed/frontend/rest/model/Category.java b/src/main/java/com/commafeed/frontend/model/Category.java
similarity index 89%
rename from src/main/java/com/commafeed/frontend/rest/model/Category.java
rename to src/main/java/com/commafeed/frontend/model/Category.java
index 338c6ddb..f4ccacb4 100644
--- a/src/main/java/com/commafeed/frontend/rest/model/Category.java
+++ b/src/main/java/com/commafeed/frontend/model/Category.java
@@ -1,4 +1,4 @@
-package com.commafeed.frontend.rest.model;
+package com.commafeed.frontend.model;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/src/main/java/com/commafeed/frontend/rest/model/Entries.java b/src/main/java/com/commafeed/frontend/model/Entries.java
similarity index 86%
rename from src/main/java/com/commafeed/frontend/rest/model/Entries.java
rename to src/main/java/com/commafeed/frontend/model/Entries.java
index 429a3e80..a3bf23ad 100644
--- a/src/main/java/com/commafeed/frontend/rest/model/Entries.java
+++ b/src/main/java/com/commafeed/frontend/model/Entries.java
@@ -1,4 +1,4 @@
-package com.commafeed.frontend.rest.model;
+package com.commafeed.frontend.model;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/src/main/java/com/commafeed/frontend/rest/model/Entry.java b/src/main/java/com/commafeed/frontend/model/Entry.java
similarity index 90%
rename from src/main/java/com/commafeed/frontend/rest/model/Entry.java
rename to src/main/java/com/commafeed/frontend/model/Entry.java
index ce6f5205..dc14a973 100644
--- a/src/main/java/com/commafeed/frontend/rest/model/Entry.java
+++ b/src/main/java/com/commafeed/frontend/model/Entry.java
@@ -1,4 +1,4 @@
-package com.commafeed.frontend.rest.model;
+package com.commafeed.frontend.model;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/src/main/java/com/commafeed/frontend/rest/model/Subscription.java b/src/main/java/com/commafeed/frontend/model/Subscription.java
similarity index 85%
rename from src/main/java/com/commafeed/frontend/rest/model/Subscription.java
rename to src/main/java/com/commafeed/frontend/model/Subscription.java
index 46727aba..036138d3 100644
--- a/src/main/java/com/commafeed/frontend/rest/model/Subscription.java
+++ b/src/main/java/com/commafeed/frontend/model/Subscription.java
@@ -1,4 +1,4 @@
-package com.commafeed.frontend.rest.model;
+package com.commafeed.frontend.model;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/com/commafeed/frontend/pages/home/HomePage.html b/src/main/java/com/commafeed/frontend/pages/HomePage.html
similarity index 100%
rename from src/main/java/com/commafeed/frontend/pages/home/HomePage.html
rename to src/main/java/com/commafeed/frontend/pages/HomePage.html
diff --git a/src/main/java/com/commafeed/frontend/pages/home/HomePage.java b/src/main/java/com/commafeed/frontend/pages/HomePage.java
similarity index 70%
rename from src/main/java/com/commafeed/frontend/pages/home/HomePage.java
rename to src/main/java/com/commafeed/frontend/pages/HomePage.java
index 5b7e42d0..a7c5383b 100644
--- a/src/main/java/com/commafeed/frontend/pages/home/HomePage.java
+++ b/src/main/java/com/commafeed/frontend/pages/HomePage.java
@@ -1,9 +1,9 @@
-package com.commafeed.frontend.pages.home;
+package com.commafeed.frontend.pages;
 
 import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
 import org.apache.wicket.markup.html.WebPage;
 
-import com.commafeed.frontend.components.auth.Role;
+import com.commafeed.frontend.pages.auth.Role;
 
 @SuppressWarnings("serial")
 @AuthorizeInstantiation(Role.USER)
diff --git a/src/main/java/com/commafeed/frontend/components/auth/LoginPage.html b/src/main/java/com/commafeed/frontend/pages/LoginPage.html
similarity index 100%
rename from src/main/java/com/commafeed/frontend/components/auth/LoginPage.html
rename to src/main/java/com/commafeed/frontend/pages/LoginPage.html
diff --git a/src/main/java/com/commafeed/frontend/components/auth/LoginPage.java b/src/main/java/com/commafeed/frontend/pages/LoginPage.java
similarity index 62%
rename from src/main/java/com/commafeed/frontend/components/auth/LoginPage.java
rename to src/main/java/com/commafeed/frontend/pages/LoginPage.java
index 23489aed..115a78ba 100644
--- a/src/main/java/com/commafeed/frontend/components/auth/LoginPage.java
+++ b/src/main/java/com/commafeed/frontend/pages/LoginPage.java
@@ -1,7 +1,9 @@
-package com.commafeed.frontend.components.auth;
+package com.commafeed.frontend.pages;
 
 import org.apache.wicket.markup.html.WebPage;
 
+import com.commafeed.frontend.pages.auth.LoginPanel;
+
 @SuppressWarnings("serial")
 public class LoginPage extends WebPage {
 
diff --git a/src/main/java/com/commafeed/frontend/components/auth/LogoutPage.java b/src/main/java/com/commafeed/frontend/pages/LogoutPage.java
similarity index 79%
rename from src/main/java/com/commafeed/frontend/components/auth/LogoutPage.java
rename to src/main/java/com/commafeed/frontend/pages/LogoutPage.java
index bab41534..a7b98336 100644
--- a/src/main/java/com/commafeed/frontend/components/auth/LogoutPage.java
+++ b/src/main/java/com/commafeed/frontend/pages/LogoutPage.java
@@ -1,4 +1,4 @@
-package com.commafeed.frontend.components.auth;
+package com.commafeed.frontend.pages;
 
 import org.apache.wicket.markup.html.WebPage;
 
diff --git a/src/main/java/com/commafeed/frontend/components/auth/LoginPanel.html b/src/main/java/com/commafeed/frontend/pages/auth/LoginPanel.html
similarity index 100%
rename from src/main/java/com/commafeed/frontend/components/auth/LoginPanel.html
rename to src/main/java/com/commafeed/frontend/pages/auth/LoginPanel.html
diff --git a/src/main/java/com/commafeed/frontend/components/auth/LoginPanel.java b/src/main/java/com/commafeed/frontend/pages/auth/LoginPanel.java
similarity index 76%
rename from src/main/java/com/commafeed/frontend/components/auth/LoginPanel.java
rename to src/main/java/com/commafeed/frontend/pages/auth/LoginPanel.java
index f01c2abb..b165e541 100644
--- a/src/main/java/com/commafeed/frontend/components/auth/LoginPanel.java
+++ b/src/main/java/com/commafeed/frontend/pages/auth/LoginPanel.java
@@ -1,4 +1,4 @@
-package com.commafeed.frontend.components.auth;
+package com.commafeed.frontend.pages.auth;
 
 import org.apache.wicket.authroles.authentication.panel.SignInPanel;
 
diff --git a/src/main/java/com/commafeed/frontend/components/auth/Role.java b/src/main/java/com/commafeed/frontend/pages/auth/Role.java
similarity index 67%
rename from src/main/java/com/commafeed/frontend/components/auth/Role.java
rename to src/main/java/com/commafeed/frontend/pages/auth/Role.java
index cda8d20b..9cc5d84c 100644
--- a/src/main/java/com/commafeed/frontend/components/auth/Role.java
+++ b/src/main/java/com/commafeed/frontend/pages/auth/Role.java
@@ -1,4 +1,4 @@
-package com.commafeed.frontend.components.auth;
+package com.commafeed.frontend.pages.auth;
 
 public class Role {
 	public static final String USER = "user";
diff --git a/src/main/java/com/commafeed/frontend/rest/RESTApplication.java b/src/main/java/com/commafeed/frontend/rest/RESTApplication.java
index bc85f46a..60eed26d 100644
--- a/src/main/java/com/commafeed/frontend/rest/RESTApplication.java
+++ b/src/main/java/com/commafeed/frontend/rest/RESTApplication.java
@@ -5,6 +5,8 @@ import java.util.Set;
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
+import com.commafeed.frontend.rest.resources.EntriesREST;
+import com.commafeed.frontend.rest.resources.SubscriptionsREST;
 import com.google.common.collect.Sets;
 
 @ApplicationPath("/rest")
diff --git a/src/main/java/com/commafeed/frontend/rest/AbstractREST.java b/src/main/java/com/commafeed/frontend/rest/resources/AbstractREST.java
similarity index 91%
rename from src/main/java/com/commafeed/frontend/rest/AbstractREST.java
rename to src/main/java/com/commafeed/frontend/rest/resources/AbstractREST.java
index febcdf62..ae98b2b4 100644
--- a/src/main/java/com/commafeed/frontend/rest/AbstractREST.java
+++ b/src/main/java/com/commafeed/frontend/rest/resources/AbstractREST.java
@@ -1,4 +1,4 @@
-package com.commafeed.frontend.rest;
+package com.commafeed.frontend.rest.resources;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -18,8 +18,8 @@ import com.commafeed.backend.dao.FeedCategoryService;
 import com.commafeed.backend.dao.FeedEntryService;
 import com.commafeed.backend.dao.FeedEntryStatusService;
 import com.commafeed.backend.dao.FeedSubscriptionService;
+import com.commafeed.backend.model.User;
 import com.commafeed.frontend.CommaFeedSession;
-import com.commafeed.model.User;
 
 @Produces(MediaType.APPLICATION_JSON)
 public abstract class AbstractREST {
diff --git a/src/main/java/com/commafeed/frontend/rest/EntriesREST.java b/src/main/java/com/commafeed/frontend/rest/resources/EntriesREST.java
similarity index 86%
rename from src/main/java/com/commafeed/frontend/rest/EntriesREST.java
rename to src/main/java/com/commafeed/frontend/rest/resources/EntriesREST.java
index 1bedb42c..46c6fcfe 100644
--- a/src/main/java/com/commafeed/frontend/rest/EntriesREST.java
+++ b/src/main/java/com/commafeed/frontend/rest/resources/EntriesREST.java
@@ -1,4 +1,4 @@
-package com.commafeed.frontend.rest;
+package com.commafeed.frontend.rest.resources;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -11,13 +11,13 @@ import javax.ws.rs.PathParam;
 
 import org.apache.commons.lang.ObjectUtils;
 
-import com.commafeed.frontend.rest.model.Entries;
-import com.commafeed.frontend.rest.model.Entry;
+import com.commafeed.backend.model.FeedCategory;
+import com.commafeed.backend.model.FeedEntry;
+import com.commafeed.backend.model.FeedEntryStatus;
+import com.commafeed.backend.model.FeedSubscription;
+import com.commafeed.frontend.model.Entries;
+import com.commafeed.frontend.model.Entry;
 import com.commafeed.frontend.utils.ModelFactory.MF;
-import com.commafeed.model.FeedCategory;
-import com.commafeed.model.FeedEntry;
-import com.commafeed.model.FeedEntryStatus;
-import com.commafeed.model.FeedSubscription;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
diff --git a/src/main/java/com/commafeed/frontend/rest/SubscriptionsREST.java b/src/main/java/com/commafeed/frontend/rest/resources/SubscriptionsREST.java
similarity index 84%
rename from src/main/java/com/commafeed/frontend/rest/SubscriptionsREST.java
rename to src/main/java/com/commafeed/frontend/rest/resources/SubscriptionsREST.java
index b7f3298e..f1aa4100 100644
--- a/src/main/java/com/commafeed/frontend/rest/SubscriptionsREST.java
+++ b/src/main/java/com/commafeed/frontend/rest/resources/SubscriptionsREST.java
@@ -1,4 +1,4 @@
-package com.commafeed.frontend.rest;
+package com.commafeed.frontend.rest.resources;
 
 import java.util.List;
 
@@ -7,10 +7,10 @@ import javax.ws.rs.Path;
 
 import org.apache.commons.lang.ObjectUtils;
 
-import com.commafeed.frontend.rest.model.Category;
-import com.commafeed.frontend.rest.model.Subscription;
-import com.commafeed.model.FeedCategory;
-import com.commafeed.model.FeedSubscription;
+import com.commafeed.backend.model.FeedCategory;
+import com.commafeed.backend.model.FeedSubscription;
+import com.commafeed.frontend.model.Category;
+import com.commafeed.frontend.model.Subscription;
 
 @Path("subscriptions")
 public class SubscriptionsREST extends AbstractREST {