diff --git a/package.json b/package.json
index bcaf0e6ff..96395fa57 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "install": "^0.8.2",
     "js-yaml": "^3.7.0",
     "npm": "^4.0.3",
-    "ramda": "^0.22.1",
+    "ramda": "^0.23.0",
     "react": "^15.0.1",
     "react-dom": "^15.0.1",
     "react-hot-loader": "3.0.0-beta.2",
diff --git a/règles/rémunération-travail/cdd/majoration-chomage.refléxion.yaml b/règles/rémunération-travail/cdd/majoration-chomage.refléxion.yaml
index 8dca2c547..9c98a6482 100644
--- a/règles/rémunération-travail/cdd/majoration-chomage.refléxion.yaml
+++ b/règles/rémunération-travail/cdd/majoration-chomage.refléxion.yaml
@@ -11,7 +11,7 @@ logique numérique: # première valeur trouvée, sinon 0
   # - True: 0% # Ce mécanisme ajoute automatiquement cette ligne :)
 
 
-logique numérique:
+logique numérique 2:
   - CDD poursuivi en CDI: 0%
   - aiguillage: # signale que les deux propositions sont exclusives
       sujet: Contrat . type
diff --git a/source/components/Rule.js b/source/components/Rule.js
index 3fd8bb92f..9b934f355 100644
--- a/source/components/Rule.js
+++ b/source/components/Rule.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react'
-import {findRuleByName} from '../model.js'
+import {findRuleByName} from '../engine/rules.js'
 import './Rule.css'
 import JSONTree from 'react-json-tree'
 
diff --git a/source/containers/Home.js b/source/containers/Home.js
index 70a9dc473..9dd57c2b7 100644
--- a/source/containers/Home.js
+++ b/source/containers/Home.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react'
 import './Home.css'
-import {searchRules} from '../model.js'
+import {searchRules} from '../engine/rules.js'
 import {Link} from 'react-router'
 
 export default class Home extends Component {
diff --git a/source/engine/load-rules.js b/source/engine/load-rules.js
index f640c4ebd..bfd540f97 100644
--- a/source/engine/load-rules.js
+++ b/source/engine/load-rules.js
@@ -3,7 +3,7 @@ import R from 'ramda'
 /* Load yaml files */
 
 let context = require.context(
-  '../règles/rémunération-travail', true,
+  '../../règles/rémunération-travail', true,
   /([a-zA-Z]|-|_)+.yaml$/)
 
 
diff --git a/source/possibleVariableTypes.yaml b/source/engine/possibleVariableTypes.yaml
similarity index 100%
rename from source/possibleVariableTypes.yaml
rename to source/engine/possibleVariableTypes.yaml
diff --git a/source/engine/traverse.js b/source/engine/traverse.js
index e057dffc2..10991dd05 100644
--- a/source/engine/traverse.js
+++ b/source/engine/traverse.js
@@ -2,7 +2,7 @@ import R from 'ramda'
 import rules from './load-rules'
 import removeDiacritics from './remove-diacritics'
 import {findRuleByName, extractRuleTypeAndName} from './rules'
-import {recognizeExpression} from './recognizeExpression'
+import {recognizeExpression} from './expressions'
 
 
 // L'objectif de la simulation : quelles règles voulons nous calculer ?
diff --git a/source/reducers.js b/source/reducers.js
index fae471f4e..76e4a72ac 100644
--- a/source/reducers.js
+++ b/source/reducers.js
@@ -2,7 +2,7 @@ import React from 'react'
 import { combineReducers } from 'redux'
 import reduceReducers from 'reduce-reducers'
 import {reducer as formReducer, formValueSelector} from 'redux-form'
-import {analyseSituation, variableType} from './traverse'
+import {analyseSituation, variableType} from './engine/traverse'
 import { euro } from './components/conversation/formValueTypes.js'
 
 import Question from './components/conversation/Question'