diff --git a/core/frontend/services/routing/index.js b/core/frontend/services/routing/index.js
index c7bf68edeb..2a480bc74a 100644
--- a/core/frontend/services/routing/index.js
+++ b/core/frontend/services/routing/index.js
@@ -17,9 +17,5 @@ module.exports = {
 
     get TaxonomyRouter() {
         return require('./TaxonomyRouter');
-    },
-
-    get settings() {
-        return require('./SettingsHandler');
     }
 };
diff --git a/core/frontend/services/routing/SettingsHandler.js b/core/frontend/services/settings/RoutesHandler.js
similarity index 100%
rename from core/frontend/services/routing/SettingsHandler.js
rename to core/frontend/services/settings/RoutesHandler.js
diff --git a/core/frontend/services/settings/index.js b/core/frontend/services/settings/index.js
new file mode 100644
index 0000000000..1c721c2ee9
--- /dev/null
+++ b/core/frontend/services/settings/index.js
@@ -0,0 +1,5 @@
+module.exports = {
+    get routes() {
+        return require('./RoutesHandler');
+    }
+};
diff --git a/core/server/api/v2/settings.js b/core/server/api/v2/settings.js
index 7425a019a7..fe0d4e0609 100644
--- a/core/server/api/v2/settings.js
+++ b/core/server/api/v2/settings.js
@@ -1,7 +1,7 @@
 const Promise = require('bluebird');
 const _ = require('lodash');
 const models = require('../../models');
-const frontendRouting = require('../../../frontend/services/routing');
+const frontendSettings = require('../../../frontend/services/settings');
 const common = require('../../lib/common');
 const settingsCache = require('../../services/settings/cache');
 
@@ -147,7 +147,7 @@ module.exports = {
             method: 'edit'
         },
         query(frame) {
-            return frontendRouting.settings.activate(frame.file.path);
+            return frontendSettings.routes.activate(frame.file.path);
         }
     },
 
@@ -165,7 +165,7 @@ module.exports = {
             method: 'browse'
         },
         query() {
-            return frontendRouting.settings.serve();
+            return frontendSettings.routes.serve();
         }
     }
 };