Index: graphspell-js/dawg.js
==================================================================
--- graphspell-js/dawg.js
+++ graphspell-js/dawg.js
@@ -12,18 +12,17 @@
 /* jslint esversion:6 */
 /* global require, exports, console, helpers */
 
 "use strict";
 
-if(typeof(process) !== 'undefined') {
+${map}
+
+
+if (typeof(process) !== 'undefined') {
     var str_transform = require("./str_transform.js");
-} else if (typeof(require) !== 'undefined') {
-    var str_transform = require("resource://grammalecte/graphspell/str_transform.js");
 }
 
-${map}
-
 
 class DAWG {
     /*  DIRECT ACYCLIC WORD GRAPH
         This code is inspired from Steve Hanov’s DAWG, 2011. (http://stevehanov.ca/blog/index.php?id=115)
         We store suffix/affix codes and tags within the graph after the “real” word.

Index: graphspell-js/dic_merger.js
==================================================================
--- graphspell-js/dic_merger.js
+++ graphspell-js/dic_merger.js
@@ -4,14 +4,10 @@
 
 if (typeof(process) !== 'undefined') {
     var dawg = require("./dawg.js");
     var ibdawg = require("./ibdawg.js");
 }
-else if (typeof(require) !== 'undefined') {
-    var dawg = require("resource://grammalecte/graphspell/dawg.js");
-    var ibdawg = require("resource://grammalecte/graphspell/ibdawg.js");
-}
 
 
 const dic_merger = {
 
     merge: function (lDict, cStemming, sLangCode, sLangName, sDicName, sDescription, xProgressBar=null) {
@@ -49,7 +45,6 @@
             console.log("Dictionaries merger: unable to generate merged dictionary");
             console.error(e);
             return null;
         }
     }
-
 }

Index: graphspell-js/ibdawg.js
==================================================================
--- graphspell-js/ibdawg.js
+++ graphspell-js/ibdawg.js
@@ -4,25 +4,22 @@
 /* jslint esversion:6 */
 /* global require, exports, console, __dirname */
 
 "use strict";
 
-if(typeof(process) !== 'undefined') {
-    var str_transform = require("./str_transform.js");
-    var helpers = require("./helpers.js");
-    var char_player = require("./char_player.js");
-} else if (typeof(require) !== 'undefined') {
-    var str_transform = require("resource://grammalecte/graphspell/str_transform.js");
-    var helpers = require("resource://grammalecte/graphspell/helpers.js");
-    var char_player = require("resource://grammalecte/graphspell/char_player.js");
-}
-
 // Don’t remove <string>. Necessary in TB.
 ${string}
 ${map}
 ${set}
 
+
+if (typeof(process) !== 'undefined') {
+    var str_transform = require("./str_transform.js");
+    var helpers = require("./helpers.js");
+    var char_player = require("./char_player.js");
+}
+
 
 class SuggResult {
     // Structure for storing, classifying and filtering suggestions
 
     constructor (sWord, nDistLimit=-1) {

Index: graphspell-js/spellchecker.js
==================================================================
--- graphspell-js/spellchecker.js
+++ graphspell-js/spellchecker.js
@@ -10,21 +10,18 @@
 /* jshint esversion:6, -W097 */
 /* jslint esversion:6 */
 /* global require, exports, console, IBDAWG, Tokenizer */
 
 "use strict";
+
+${map}
+
 
 if (typeof(process) !== 'undefined') {
     var ibdawg = require("./ibdawg.js");
     var tokenizer = require("./tokenizer.js");
 }
-else if (typeof(require) !== 'undefined') {
-    var ibdawg = require("resource://grammalecte/graphspell/ibdawg.js");
-    var tokenizer = require("resource://grammalecte/graphspell/tokenizer.js");
-}
-
-${map}
 
 
 const dDefaultDictionaries = new Map([
     ["fr", "fr-allvars.json"],
     ["en", "en.json"]

Index: graphspell-js/str_transform.js
==================================================================
--- graphspell-js/str_transform.js
+++ graphspell-js/str_transform.js
@@ -3,15 +3,14 @@
 /* jshint esversion:6, -W097 */
 /* jslint esversion:6 */
 /* global exports, console */
 
 "use strict";
+
 
 if (typeof(process) !== 'undefined') {
     var char_player = require("./char_player.js");
-} else if (typeof(require) !== 'undefined') {
-    var char_player = require("resource://grammalecte/graphspell/char_player.js");
 }
 
 
 // Note: 48 is the ASCII code for "0"