diff --git a/source/engine/mecanismViews/Somme.js b/source/engine/mecanismViews/Somme.js
index 7c973e39a..7e2c99830 100644
--- a/source/engine/mecanismViews/Somme.js
+++ b/source/engine/mecanismViews/Somme.js
@@ -1,7 +1,7 @@
 import React, { Component } from "react"
 import {makeJsx} from '../evaluation'
 import {path} from 'ramda'
-import {Node, NodeValue} from '../traverse-common-jsx'
+import {Node, NodeValue} from './common'
 
 
 export default class Somme extends Component {
diff --git a/source/engine/traverse-common-jsx.js b/source/engine/mecanismViews/common.js
similarity index 94%
rename from source/engine/traverse-common-jsx.js
rename to source/engine/mecanismViews/common.js
index 5dc809c5e..943ada784 100644
--- a/source/engine/traverse-common-jsx.js
+++ b/source/engine/mecanismViews/common.js
@@ -2,8 +2,8 @@ import React from 'react'
 import R from 'ramda'
 import classNames from 'classnames'
 import {Link} from 'react-router-dom'
-import {encodeRuleName} from './rules'
-import {capitalise0} from '../utils'
+import {encodeRuleName} from '../rules'
+import {capitalise0} from '../../utils'
 
 let treatValue = data =>
 	data == null
diff --git a/source/engine/mecanisms.js b/source/engine/mecanisms.js
index b3001e797..d89292c33 100644
--- a/source/engine/mecanisms.js
+++ b/source/engine/mecanisms.js
@@ -1,7 +1,7 @@
 import R from 'ramda'
 import React from 'react'
 import {anyNull, val} from './traverse-common-functions'
-import {Node, NodeValue} from './traverse-common-jsx'
+import {Node} from './mecanismViews/common'
 import {makeJsx, evaluateNode, rewriteNode, evaluateArray, evaluateArrayWithFilter, evaluateObject, parseObject, collectNodeMissing} from './evaluation'
 import {findRuleByName} from './rules'
 
diff --git a/source/engine/traverse.js b/source/engine/traverse.js
index 1515087e5..9f7075ff0 100644
--- a/source/engine/traverse.js
+++ b/source/engine/traverse.js
@@ -5,7 +5,7 @@ import R from 'ramda'
 import knownMecanisms from './known-mecanisms.yaml'
 import { Parser } from 'nearley'
 import Grammar from './grammar.ne'
-import {Node, Leaf} from './traverse-common-jsx'
+import {Node, Leaf} from './mecanismViews/common'
 import {
 	mecanismOneOf,mecanismAllOf,mecanismNumericalSwitch,mecanismSum,mecanismProduct,
 	mecanismScale,mecanismMax,mecanismMin, mecanismError, mecanismComplement,