diff --git a/src/main/java/com/commafeed/CommaFeedApplication.java b/src/main/java/com/commafeed/CommaFeedApplication.java
index db904e89..c750141d 100644
--- a/src/main/java/com/commafeed/CommaFeedApplication.java
+++ b/src/main/java/com/commafeed/CommaFeedApplication.java
@@ -35,7 +35,6 @@ import com.commafeed.backend.service.UserService;
 import com.commafeed.backend.task.OldStatusesCleanupTask;
 import com.commafeed.backend.task.OrphansCleanupTask;
 import com.commafeed.backend.task.SchedulingService;
-import com.commafeed.frontend.SessionHelperProvider;
 import com.commafeed.frontend.auth.SecurityCheckProvider;
 import com.commafeed.frontend.auth.SecurityCheckProvider.SecurityCheckUserServiceProvider;
 import com.commafeed.frontend.resource.AdminREST;
@@ -49,6 +48,7 @@ import com.commafeed.frontend.servlet.AnalyticsServlet;
 import com.commafeed.frontend.servlet.CustomCssServlet;
 import com.commafeed.frontend.servlet.LogoutServlet;
 import com.commafeed.frontend.servlet.NextUnreadServlet;
+import com.commafeed.frontend.session.SessionHelperProvider;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.wordnik.swagger.config.ConfigFactory;
diff --git a/src/main/java/com/commafeed/CommaFeedConfiguration.java b/src/main/java/com/commafeed/CommaFeedConfiguration.java
index c9566389..5e8fc163 100644
--- a/src/main/java/com/commafeed/CommaFeedConfiguration.java
+++ b/src/main/java/com/commafeed/CommaFeedConfiguration.java
@@ -16,7 +16,7 @@ import org.apache.commons.lang.time.DateUtils;
 import org.hibernate.validator.constraints.NotBlank;
 
 import com.commafeed.backend.cache.RedisPoolFactory;
-import com.commafeed.frontend.SessionManagerFactory;
+import com.commafeed.frontend.session.SessionManagerFactory;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @Getter
diff --git a/src/main/java/com/commafeed/frontend/auth/SecurityCheckProvider.java b/src/main/java/com/commafeed/frontend/auth/SecurityCheckProvider.java
index cb38381c..b0708f75 100644
--- a/src/main/java/com/commafeed/frontend/auth/SecurityCheckProvider.java
+++ b/src/main/java/com/commafeed/frontend/auth/SecurityCheckProvider.java
@@ -15,7 +15,7 @@ import org.eclipse.jetty.util.StringUtil;
 import com.commafeed.backend.model.User;
 import com.commafeed.backend.model.UserRole.Role;
 import com.commafeed.backend.service.UserService;
-import com.commafeed.frontend.SessionHelper;
+import com.commafeed.frontend.session.SessionHelper;
 import com.google.common.base.Optional;
 import com.sun.jersey.api.core.HttpContext;
 import com.sun.jersey.api.model.Parameter;
diff --git a/src/main/java/com/commafeed/frontend/resource/UserREST.java b/src/main/java/com/commafeed/frontend/resource/UserREST.java
index 4865e7de..cbc450e0 100644
--- a/src/main/java/com/commafeed/frontend/resource/UserREST.java
+++ b/src/main/java/com/commafeed/frontend/resource/UserREST.java
@@ -48,7 +48,6 @@ import com.commafeed.backend.model.UserSettings.ViewMode;
 import com.commafeed.backend.service.MailService;
 import com.commafeed.backend.service.PasswordEncryptionService;
 import com.commafeed.backend.service.UserService;
-import com.commafeed.frontend.SessionHelper;
 import com.commafeed.frontend.auth.SecurityCheck;
 import com.commafeed.frontend.model.Settings;
 import com.commafeed.frontend.model.UserModel;
@@ -56,6 +55,7 @@ import com.commafeed.frontend.model.request.LoginRequest;
 import com.commafeed.frontend.model.request.PasswordResetRequest;
 import com.commafeed.frontend.model.request.ProfileModificationRequest;
 import com.commafeed.frontend.model.request.RegistrationRequest;
+import com.commafeed.frontend.session.SessionHelper;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
diff --git a/src/main/java/com/commafeed/frontend/servlet/CustomCssServlet.java b/src/main/java/com/commafeed/frontend/servlet/CustomCssServlet.java
index c9c3e61b..7d487548 100644
--- a/src/main/java/com/commafeed/frontend/servlet/CustomCssServlet.java
+++ b/src/main/java/com/commafeed/frontend/servlet/CustomCssServlet.java
@@ -17,7 +17,7 @@ import com.commafeed.backend.dao.UnitOfWork;
 import com.commafeed.backend.dao.UserSettingsDAO;
 import com.commafeed.backend.model.User;
 import com.commafeed.backend.model.UserSettings;
-import com.commafeed.frontend.SessionHelper;
+import com.commafeed.frontend.session.SessionHelper;
 import com.google.common.base.Optional;
 
 @SuppressWarnings("serial")
diff --git a/src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java b/src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java
index 0e4fed98..fe743b5f 100644
--- a/src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java
+++ b/src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java
@@ -26,8 +26,8 @@ import com.commafeed.backend.model.FeedSubscription;
 import com.commafeed.backend.model.User;
 import com.commafeed.backend.model.UserSettings.ReadingOrder;
 import com.commafeed.backend.service.UserService;
-import com.commafeed.frontend.SessionHelper;
 import com.commafeed.frontend.resource.CategoryREST;
+import com.commafeed.frontend.session.SessionHelper;
 import com.google.common.base.Optional;
 import com.google.common.collect.Iterables;
 
diff --git a/src/main/java/com/commafeed/frontend/SessionHelper.java b/src/main/java/com/commafeed/frontend/session/SessionHelper.java
similarity index 95%
rename from src/main/java/com/commafeed/frontend/SessionHelper.java
rename to src/main/java/com/commafeed/frontend/session/SessionHelper.java
index 021d0e44..7ce71ceb 100644
--- a/src/main/java/com/commafeed/frontend/SessionHelper.java
+++ b/src/main/java/com/commafeed/frontend/session/SessionHelper.java
@@ -1,4 +1,4 @@
-package com.commafeed.frontend;
+package com.commafeed.frontend.session;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
diff --git a/src/main/java/com/commafeed/frontend/SessionHelperProvider.java b/src/main/java/com/commafeed/frontend/session/SessionHelperProvider.java
similarity index 97%
rename from src/main/java/com/commafeed/frontend/SessionHelperProvider.java
rename to src/main/java/com/commafeed/frontend/session/SessionHelperProvider.java
index b77a6d5d..aba77faf 100644
--- a/src/main/java/com/commafeed/frontend/SessionHelperProvider.java
+++ b/src/main/java/com/commafeed/frontend/session/SessionHelperProvider.java
@@ -1,4 +1,4 @@
-package com.commafeed.frontend;
+package com.commafeed.frontend.session;
 
 import java.lang.reflect.Type;
 
diff --git a/src/main/java/com/commafeed/frontend/SessionManagerFactory.java b/src/main/java/com/commafeed/frontend/session/SessionManagerFactory.java
similarity index 94%
rename from src/main/java/com/commafeed/frontend/SessionManagerFactory.java
rename to src/main/java/com/commafeed/frontend/session/SessionManagerFactory.java
index e5d34797..4d52b150 100644
--- a/src/main/java/com/commafeed/frontend/SessionManagerFactory.java
+++ b/src/main/java/com/commafeed/frontend/session/SessionManagerFactory.java
@@ -1,4 +1,4 @@
-package com.commafeed.frontend;
+package com.commafeed.frontend.session;
 
 import io.dropwizard.util.Duration;
 
diff --git a/src/test/java/com/commafeed/frontend/resource/UserRestTest.java b/src/test/java/com/commafeed/frontend/resource/UserRestTest.java
index 3b6a59ba..0811aa1a 100644
--- a/src/test/java/com/commafeed/frontend/resource/UserRestTest.java
+++ b/src/test/java/com/commafeed/frontend/resource/UserRestTest.java
@@ -16,9 +16,9 @@ import org.mockito.Matchers;
 import com.commafeed.backend.model.User;
 import com.commafeed.backend.model.UserRole.Role;
 import com.commafeed.backend.service.UserService;
-import com.commafeed.frontend.SessionHelper;
 import com.commafeed.frontend.model.request.LoginRequest;
 import com.commafeed.frontend.model.request.RegistrationRequest;
+import com.commafeed.frontend.session.SessionHelper;
 import com.google.common.base.Optional;
 
 public class UserRestTest {