diff --git a/commafeed-client/src/pages/admin/MetricsPage.tsx b/commafeed-client/src/pages/admin/MetricsPage.tsx
index 7bcc664b2..61d62ac2a 100644
--- a/commafeed-client/src/pages/admin/MetricsPage.tsx
+++ b/commafeed-client/src/pages/admin/MetricsPage.tsx
@@ -8,7 +8,7 @@ import { useAsync } from "react-async-hook"
 import { TbChartAreaLine, TbClock } from "react-icons/tb"
 
 const shownMeters: { [key: string]: string } = {
-    "com.commafeed.backend.service.FeedRefreshFlowService.refill": "Feed queue refill rate",
+    "com.commafeed.backend.feed.FeedRefreshEngine.refill": "Feed queue refill rate",
     "com.commafeed.backend.feed.FeedRefreshWorker.feedFetched": "Feed fetching rate",
     "com.commafeed.backend.feed.FeedRefreshUpdater.feedUpdated": "Feed update rate",
     "com.commafeed.backend.feed.FeedRefreshUpdater.entryCacheHit": "Entry cache hit rate",
diff --git a/commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java b/commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java
index 01e37d87c..63f5111d0 100644
--- a/commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java
+++ b/commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java
@@ -18,6 +18,7 @@
 import org.hibernate.cfg.AvailableSettings;
 
 import com.codahale.metrics.json.MetricsModule;
+import com.commafeed.backend.feed.FeedRefreshEngine;
 import com.commafeed.backend.model.AbstractModel;
 import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.FeedCategory;
@@ -30,7 +31,6 @@
 import com.commafeed.backend.model.UserRole;
 import com.commafeed.backend.model.UserSettings;
 import com.commafeed.backend.service.DatabaseStartupService;
-import com.commafeed.backend.service.FeedRefreshEngine;
 import com.commafeed.backend.service.UserService;
 import com.commafeed.backend.task.ScheduledTask;
 import com.commafeed.frontend.auth.SecurityCheckFactoryProvider;
diff --git a/commafeed-server/src/main/java/com/commafeed/backend/service/FeedRefreshEngine.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshEngine.java
similarity index 93%
rename from commafeed-server/src/main/java/com/commafeed/backend/service/FeedRefreshEngine.java
rename to commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshEngine.java
index 909a0d256..0a331468b 100644
--- a/commafeed-server/src/main/java/com/commafeed/backend/service/FeedRefreshEngine.java
+++ b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshEngine.java
@@ -1,4 +1,4 @@
-package com.commafeed.backend.service;
+package com.commafeed.backend.feed;
 
 import java.util.Date;
 import java.util.List;
@@ -15,8 +15,6 @@
 import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.dao.FeedDAO;
 import com.commafeed.backend.dao.UnitOfWork;
-import com.commafeed.backend.feed.FeedRefreshUpdater;
-import com.commafeed.backend.feed.FeedRefreshWorker;
 import com.commafeed.backend.model.Feed;
 
 import io.dropwizard.lifecycle.Managed;
diff --git a/commafeed-server/src/main/java/com/commafeed/backend/service/FeedSubscriptionService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/FeedSubscriptionService.java
index 78bc936bd..bb7637e20 100644
--- a/commafeed-server/src/main/java/com/commafeed/backend/service/FeedSubscriptionService.java
+++ b/commafeed-server/src/main/java/com/commafeed/backend/service/FeedSubscriptionService.java
@@ -14,6 +14,7 @@
 import com.commafeed.backend.dao.FeedDAO;
 import com.commafeed.backend.dao.FeedEntryStatusDAO;
 import com.commafeed.backend.dao.FeedSubscriptionDAO;
+import com.commafeed.backend.feed.FeedRefreshEngine;
 import com.commafeed.backend.feed.FeedUtils;
 import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.FeedCategory;
diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java
index ba1eac95d..d9da49aa8 100644
--- a/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java
+++ b/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java
@@ -46,6 +46,7 @@
 import com.commafeed.backend.feed.FeedEntryKeyword;
 import com.commafeed.backend.feed.FeedFetcher;
 import com.commafeed.backend.feed.FeedFetcher.FeedFetcherResult;
+import com.commafeed.backend.feed.FeedRefreshEngine;
 import com.commafeed.backend.feed.FeedUtils;
 import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.FeedCategory;
@@ -61,7 +62,6 @@
 import com.commafeed.backend.service.FeedEntryFilteringService;
 import com.commafeed.backend.service.FeedEntryFilteringService.FeedEntryFilterException;
 import com.commafeed.backend.service.FeedEntryService;
-import com.commafeed.backend.service.FeedRefreshEngine;
 import com.commafeed.backend.service.FeedService;
 import com.commafeed.backend.service.FeedSubscriptionService;
 import com.commafeed.frontend.auth.SecurityCheck;
diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/resource/PubSubHubbubCallbackREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/PubSubHubbubCallbackREST.java
index e40f9e353..2e28dd68d 100644
--- a/commafeed-server/src/main/java/com/commafeed/frontend/resource/PubSubHubbubCallbackREST.java
+++ b/commafeed-server/src/main/java/com/commafeed/frontend/resource/PubSubHubbubCallbackREST.java
@@ -27,8 +27,8 @@
 import com.commafeed.backend.dao.FeedDAO;
 import com.commafeed.backend.feed.FeedParser;
 import com.commafeed.backend.feed.FeedParser.FeedParserResult;
+import com.commafeed.backend.feed.FeedRefreshEngine;
 import com.commafeed.backend.model.Feed;
-import com.commafeed.backend.service.FeedRefreshEngine;
 import com.google.common.base.Preconditions;
 
 import io.dropwizard.hibernate.UnitOfWork;