diff --git a/core/frontend/services/routing/index.js b/core/frontend/services/routing/index.js
index 2a480bc74a..6382b36a8a 100644
--- a/core/frontend/services/routing/index.js
+++ b/core/frontend/services/routing/index.js
@@ -7,6 +7,10 @@ module.exports = {
         return require('./registry');
     },
 
+    get settings() {
+        return require('./settings');
+    },
+
     get helpers() {
         return require('./helpers');
     },
diff --git a/core/frontend/services/settings/dynamic-routing.js b/core/frontend/services/routing/settings.js
similarity index 100%
rename from core/frontend/services/settings/dynamic-routing.js
rename to core/frontend/services/routing/settings.js
diff --git a/core/frontend/services/settings/index.js b/core/frontend/services/settings/index.js
deleted file mode 100644
index ccf6c497aa..0000000000
--- a/core/frontend/services/settings/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = {
-    get dynamicRouting() {
-        return require('./dynamic-routing');
-    }
-};
diff --git a/core/server/api/v0.1/settings.js b/core/server/api/v0.1/settings.js
index 4a67e14484..0b5987653a 100644
--- a/core/server/api/v0.1/settings.js
+++ b/core/server/api/v0.1/settings.js
@@ -5,7 +5,7 @@ const Promise = require('bluebird'),
     models = require('../../models'),
     canThis = require('../../services/permissions').canThis,
     localUtils = require('./utils'),
-    frontendSettings = require('../../../frontend/services/settings'),
+    routing = require('../../../frontend/services/routing'),
     common = require('../../lib/common'),
     settingsCache = require('../../services/settings/cache'),
     docName = 'settings';
@@ -254,14 +254,14 @@ settings = {
     upload(options) {
         return localUtils.handlePermissions('settings', 'edit')(options)
             .then(() => {
-                return frontendSettings.dynamicRouting.setFromFilePath(options.path);
+                return routing.settings.setFromFilePath(options.path);
             });
     },
 
     download(options) {
         return localUtils.handlePermissions('settings', 'browse')(options)
             .then(() => {
-                return frontendSettings.dynamicRouting.get();
+                return routing.settings.get();
             });
     }
 };
diff --git a/core/server/api/v2/settings.js b/core/server/api/v2/settings.js
index beeea40639..7927a7461e 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 frontendSettings = require('../../../frontend/services/settings');
+const routing = require('../../../frontend/services/routing');
 const common = require('../../lib/common');
 const settingsCache = require('../../services/settings/cache');
 
@@ -147,7 +147,7 @@ module.exports = {
             method: 'edit'
         },
         query(frame) {
-            return frontendSettings.dynamicRouting.setFromFilePath(frame.file.path);
+            return routing.settings.setFromFilePath(frame.file.path);
         }
     },
 
@@ -165,7 +165,7 @@ module.exports = {
             method: 'browse'
         },
         query() {
-            return frontendSettings.dynamicRouting.get();
+            return routing.settings.get();
         }
     }
 };