diff --git a/core/frontend/services/themes/engines/create.js b/core/frontend/services/theme-engine/engines/create.js
similarity index 100%
rename from core/frontend/services/themes/engines/create.js
rename to core/frontend/services/theme-engine/engines/create.js
diff --git a/core/frontend/services/themes/engines/index.js b/core/frontend/services/theme-engine/engines/index.js
similarity index 100%
rename from core/frontend/services/themes/engines/index.js
rename to core/frontend/services/theme-engine/engines/index.js
diff --git a/core/frontend/services/themes/active.js b/core/frontend/services/themes/active.js
index 3aabcc6821..f0c258ab36 100644
--- a/core/frontend/services/themes/active.js
+++ b/core/frontend/services/themes/active.js
@@ -15,7 +15,7 @@ const join = require('path').join;
 
 const _ = require('lodash');
 const themeConfig = require('../theme-engine/config');
-const themeEngines = require('./engines');
+const themeEngines = require('../theme-engine/engines');
 const config = require('../../../shared/config');
 const engine = require('../theme-engine/engine');
 
diff --git a/test/unit/services/themes/engines/create_spec.js b/test/unit/services/theme-engine/engines/create_spec.js
similarity index 99%
rename from test/unit/services/themes/engines/create_spec.js
rename to test/unit/services/theme-engine/engines/create_spec.js
index cba461a07f..95c5d1712e 100644
--- a/test/unit/services/themes/engines/create_spec.js
+++ b/test/unit/services/theme-engine/engines/create_spec.js
@@ -1,6 +1,6 @@
 const should = require('should');
 const sinon = require('sinon');
-const themeEngines = require('../../../../../core/frontend/services/themes/engines');
+const themeEngines = require('../../../../../core/frontend/services/theme-engine/engines');
 
 /**
  * @NOTE