diff --git a/core/server/controllers/channels/router.js b/core/server/controllers/channels/router.js
index 1256d68df7..4bd3a32e88 100644
--- a/core/server/controllers/channels/router.js
+++ b/core/server/controllers/channels/router.js
@@ -1,12 +1,12 @@
 var express = require('express'),
-    _       = require('lodash'),
-    config  = require('../../config'),
-    errors  = require('../../errors'),
-    i18n    = require('../../i18n'),
-    rss     = require('../../data/xml/rss'),
-    utils   = require('../../utils'),
+    _ = require('lodash'),
+    config = require('../../config'),
+    errors = require('../../errors'),
+    i18n = require('../../i18n'),
+    utils = require('../../utils'),
     channelLoader = require('./loader'),
     channelController = require('../channel'),
+    rssController = require('../rss'),
     rssRouter,
     channelRouter,
     channelsRouter;
@@ -53,8 +53,8 @@ rssRouter = function rssRouter(channelMiddleware) {
         pageRoute = utils.url.urlJoin(baseRoute, ':page(\\d+)/');
 
     // @TODO figure out how to collapse this into a single rule
-    router.get(baseRoute, channelMiddleware, rssConfigMiddleware, rss);
-    router.get(pageRoute, channelMiddleware, rssConfigMiddleware, rss);
+    router.get(baseRoute, channelMiddleware, rssConfigMiddleware, rssController);
+    router.get(pageRoute, channelMiddleware, rssConfigMiddleware, rssController);
     // Extra redirect rule
     router.get('/feed/', function redirectToRSS(req, res) {
         return utils.url.redirect301(res, utils.url.urlJoin(utils.url.getSubdir(), req.baseUrl, baseRoute));
diff --git a/core/server/data/xml/rss/controller.js b/core/server/controllers/rss.js
similarity index 83%
rename from core/server/data/xml/rss/controller.js
rename to core/server/controllers/rss.js
index 5259a4a887..0b92cdb138 100644
--- a/core/server/data/xml/rss/controller.js
+++ b/core/server/controllers/rss.js
@@ -1,16 +1,16 @@
 var _ = require('lodash'),
     url = require('url'),
-    utils = require('../../../utils'),
-    errors = require('../../../errors'),
-    i18n = require('../../../i18n'),
-    safeString = require('../../../utils/index').safeString,
-    settingsCache = require('../../../settings/cache'),
+    utils = require('../utils'),
+    errors = require('../errors'),
+    i18n = require('../i18n'),
+    safeString = require('../utils/index').safeString,
+    settingsCache = require('../settings/cache'),
 
-    // Really ugly temporary hack for location of things
-    fetchData = require('../../../controllers/frontend/fetch-data'),
-    handleError = require('../../../controllers/frontend/error'),
+    // Slightly less ugly temporary hack for location of things
+    fetchData = require('./frontend/fetch-data'),
+    handleError = require('./frontend/error'),
 
-    feedCache = require('./cache'),
+    rssCache = require('../services/rss'),
     generate;
 
 // @TODO: is this the right logic? Where should this live?!
@@ -73,7 +73,7 @@ generate = function generate(req, res, next) {
         data.secure = req.secure;
 
         // @TODO this is effectively a renderer
-        return feedCache.getXML(baseUrl, data).then(function then(feedXml) {
+        return rssCache.getXML(baseUrl, data).then(function then(feedXml) {
             res.set('Content-Type', 'text/xml; charset=UTF-8');
             res.send(feedXml);
         });
diff --git a/core/server/data/xml/rss/index.js b/core/server/data/xml/rss/index.js
deleted file mode 100644
index 2be3d172a7..0000000000
--- a/core/server/data/xml/rss/index.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('./controller');
diff --git a/core/server/data/xml/rss/cache.js b/core/server/services/rss/cache.js
similarity index 100%
rename from core/server/data/xml/rss/cache.js
rename to core/server/services/rss/cache.js
diff --git a/core/server/data/xml/rss/generate-feed.js b/core/server/services/rss/generate-feed.js
similarity index 94%
rename from core/server/data/xml/rss/generate-feed.js
rename to core/server/services/rss/generate-feed.js
index e7a68ff4ab..bda3ba71a8 100644
--- a/core/server/data/xml/rss/generate-feed.js
+++ b/core/server/services/rss/generate-feed.js
@@ -1,8 +1,8 @@
 var downsize = require('downsize'),
     RSS = require('rss'),
-    utils = require('../../../utils'),
-    filters = require('../../../filters'),
-    processUrls = require('../../../utils/make-absolute-urls'),
+    utils = require('../../utils'),
+    filters = require('../../filters'),
+    processUrls = require('../../utils/make-absolute-urls'),
 
     generateFeed,
     generateTags;
diff --git a/core/server/services/rss/index.js b/core/server/services/rss/index.js
new file mode 100644
index 0000000000..b7efec6b26
--- /dev/null
+++ b/core/server/services/rss/index.js
@@ -0,0 +1 @@
+module.exports = require('./cache');
diff --git a/core/test/unit/rss/controller_spec.js b/core/test/unit/controllers/rss_spec.js
similarity index 99%
rename from core/test/unit/rss/controller_spec.js
rename to core/test/unit/controllers/rss_spec.js
index a69f0d4db5..2dd229e793 100644
--- a/core/test/unit/rss/controller_spec.js
+++ b/core/test/unit/controllers/rss_spec.js
@@ -7,8 +7,8 @@ var should = require('should'),
     channelUtils = require('../../utils/channelUtils'),
     api = require('../../../server/api'),
     settingsCache = require('../../../server/settings/cache'),
-    rssController = rewire('../../../server/data/xml/rss/controller'),
-    rssCache = require('../../../server/data/xml/rss/cache'),
+    rssController = rewire('../../../server/controllers/rss'),
+    rssCache = require('../../../server/services/rss'),
     configUtils = require('../../utils/configUtils'),
 
     sandbox = sinon.sandbox.create();
diff --git a/core/test/unit/rss/cache_spec.js b/core/test/unit/services/rss/cache_spec.js
similarity index 93%
rename from core/test/unit/rss/cache_spec.js
rename to core/test/unit/services/rss/cache_spec.js
index 790e52bc13..f310eeef59 100644
--- a/core/test/unit/rss/cache_spec.js
+++ b/core/test/unit/services/rss/cache_spec.js
@@ -1,8 +1,8 @@
 var should = require('should'),
     sinon = require('sinon'),
     rewire = require('rewire'),
-    configUtils = require('../../utils/configUtils'),
-    rssCache = rewire('../../../server/data/xml/rss/cache'),
+    configUtils = require('../../../utils/configUtils'),
+    rssCache = rewire('../../../../server/services/rss/cache'),
 
     sandbox = sinon.sandbox.create();
 
diff --git a/core/test/unit/rss/generate-feed_spec.js b/core/test/unit/services/rss/generate-feed_spec.js
similarity index 98%
rename from core/test/unit/rss/generate-feed_spec.js
rename to core/test/unit/services/rss/generate-feed_spec.js
index b472a6762a..b754c91b7a 100644
--- a/core/test/unit/rss/generate-feed_spec.js
+++ b/core/test/unit/services/rss/generate-feed_spec.js
@@ -1,9 +1,9 @@
 var should = require('should'),
     _ = require('lodash'),
-    testUtils = require('../../utils'),
-    configUtils = require('../../utils/configUtils'),
+    testUtils = require('../../../utils'),
+    configUtils = require('../../../utils/configUtils'),
 
-    generateFeed = require('../../../server/data/xml/rss/generate-feed');
+    generateFeed = require('../../../../server/services/rss/generate-feed');
 
 describe('RSS: Generate Feed', function () {
     var data = {},