diff --git a/Makefile b/Makefile
index 28ec6b6baba5eca0eca67bc5c5a564bb1677dcb4..253475c26f91e8c9a28e319169f09cbe740eb3fb 100644
--- a/Makefile
+++ b/Makefile
@@ -33,8 +33,12 @@ bin/%.html: bin/tmp
 	git checkout -- src/gui/mainMenu/AlphaDisclaimer.tw
 	mv $< $@
 
-bin/tmp: bin/ src/gui/mainMenu/AlphaDisclaimer.tw
-	$(TWEEGO) src/ --head devTools/head.html > $@
+bin/fc.js: bin/
+	devTools/concatFiles.sh js/ '*.js' $@
+
+bin/tmp: bin/fc.js src/gui/mainMenu/AlphaDisclaimer.tw
+	$(TWEEGO) --module=bin/fc.js --head devTools/head.html src/ > $@
+	rm -f bin/fc.js
 
 src/gui/mainMenu/AlphaDisclaimer.tw:
 	sed -Ei "s/build .releaseID/\0 commit $(COMMIT)/" $@
diff --git a/compile.bat b/compile.bat
index ad3570dfc45fe2b8291d3652546ccab784faa625..2a06b08270c083d45c949ee958095a248b32b52d 100644
--- a/compile.bat
+++ b/compile.bat
@@ -4,12 +4,14 @@
 :: Set working directory
 pushd %~dp0
 if not exist "bin\resources" mkdir bin\resources
+CALL devTools/concatFiles.bat js/ "*.js" bin/fc.js
 :: Run the appropriate compiler for the user's CPU architecture.
 if %PROCESSOR_ARCHITECTURE% == AMD64 (
-	CALL "%~dp0devTools\tweeGo\tweego_win64.exe" -o "%~dp0bin/FC_pregmod.html" --head devTools/head.html "%~dp0src"
+	CALL "%~dp0devTools\tweeGo\tweego_win64.exe" -o "%~dp0bin/FC_pregmod.html" --module=bin/fc.js --head devTools/head.html "%~dp0src"
 ) else (
-	CALL "%~dp0devTools\tweeGo\tweego_win86.exe" -o "%~dp0bin/FC_pregmod.html" --head devTools/head.html "%~dp0src"
+	CALL "%~dp0devTools\tweeGo\tweego_win86.exe" -o "%~dp0bin/FC_pregmod.html" --module=bin/fc.js --head devTools/head.html "%~dp0src"
 )
+DEL bin\fc.js
 
 popd
 ECHO Done
diff --git a/compile.sh b/compile.sh
index dc9140f965b049e6f595d1f0bca62b50d32f8a47..4946c57147f9a1f1c62c56e6a750cb23a282e207 100755
--- a/compile.sh
+++ b/compile.sh
@@ -76,7 +76,9 @@ function compile {
 		file="bin/FC_pregmod.html"
 	fi
 
-	$TWEEGO_EXE -o $file src/ --head devTools/head.html || build_failed="true"
+	devTools/concatFiles.sh js/ '*.js' bin/fc.js
+	$TWEEGO_EXE -o $file --module=bin/fc.js --head devTools/head.html src/ || build_failed="true"
+	rm -f bin/fc.js
 	if [ "$build_failed" = "true" ]
 	then
 		echoError "Build failed."
diff --git a/devTools/concatFiles.bat b/devTools/concatFiles.bat
new file mode 100644
index 0000000000000000000000000000000000000000..2a07ad8205c7be5850aa7f5df1135d95751e4183
--- /dev/null
+++ b/devTools/concatFiles.bat
@@ -0,0 +1,22 @@
+@echo off
+
+:: See if we can find a git installation
+setlocal enabledelayedexpansion
+
+for %%k in (HKCU HKLM) do (
+	for %%w in (\ \Wow6432Node\) do (
+		for /f "skip=2 delims=: tokens=1*" %%a in ('reg query "%%k\SOFTWARE%%wMicrosoft\Windows\CurrentVersion\Uninstall\Git_is1" /v InstallLocation 2^> nul') do (
+			for /f "tokens=3" %%z in ("%%a") do (
+				set GIT=%%z:%%b
+				set GITFOUND=yes
+				goto FOUND
+			)
+		)
+	)
+)
+
+:FOUND
+if %GITFOUND% == yes (
+	set "PATH=%GIT%bin;%PATH%"
+	bash devTools/concatFiles.sh "%1" "%2" "%3"
+)
diff --git a/devTools/concatFiles.sh b/devTools/concatFiles.sh
new file mode 100755
index 0000000000000000000000000000000000000000..a1a8fd8586627b885320acffe2b3cea3647f5d19
--- /dev/null
+++ b/devTools/concatFiles.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# $1: source dir
+# $2: name wildcard
+# #3: destination file
+
+rm -f "$3"
+files=$(find "$1" -name "$2" -print)
+files=$(echo "$files" | sort)
+for f in $files; do
+	echo -e "\n/* ${f#$1} */\n" >> "$3"
+	cat "$f" >> "$3"
+done
diff --git a/src/002-config/fc-js-init.js b/js/002-config/fc-js-init.js
similarity index 69%
rename from src/002-config/fc-js-init.js
rename to js/002-config/fc-js-init.js
index 3c923124687bca8b341a43c66007c69029106124..f01b00419cd4402a38ff4f7dbbbb7442d47e858e 100644
--- a/src/002-config/fc-js-init.js
+++ b/js/002-config/fc-js-init.js
@@ -1,13 +1,8 @@
 /* eslint-disable no-var */
-/*
-* SugarCube executes scripts via eval() inside a closure. Thus to make App global,
-* we declare it as a property of the window object. I don't know why 'App = {}'
-* does not work.
-*/
 // @ts-ignore
-window.App = { };
-// the same declaration for code parsers that don't like the line above
-var App = window.App || {}; /* eslint-disable-line no-var*/
+"use strict";
+
+var App = { };
 
 App.Art = {};
 App.Data = {};
diff --git a/src/js/utils.js b/js/utils.js
similarity index 88%
rename from src/js/utils.js
rename to js/utils.js
index eca740c543cbcfbf5729fa9fbd766671d7152e05..cf39ddc1d09fa1ff3447db4e4f225850370d1e47 100644
--- a/src/js/utils.js
+++ b/js/utils.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-vars */
 /* This file contains only JS functions without dependencies on FC specific variables/conventions and do not rely on
  * custom functions outside this file
  */
@@ -7,17 +8,17 @@
  * @param {any} x
  * @returns {boolean}
  */
-window.jsDef = function(x) {
+function jsDef(x) {
 	return (typeof x !== "undefined" && x !== null && x !== undefined);
-};
+}
 
 /**
  * @param {number} n
  * @returns {boolean}
  */
-window.isFloat = function(n) {
+function isFloat(n) {
 	return Number.isFinite(n) && Math.floor(n) !== n;
-};
+}
 
 /**
  * Determines if a is between low and high
@@ -26,17 +27,17 @@ window.isFloat = function(n) {
  * @param {number} high
  * @returns {boolean}
  */
-window.between = function(a, low, high) {
+function between(a, low, high) {
 	if (low === null) { low = -Infinity; }
 	if (high === null) { high = Infinity; }
 	return (a > low && a < high);
-};
+}
 
 /**
  * @param {number[]} obj
  * @returns {number}
  */
-window.hashChoice = function hashChoice(obj) {
+function hashChoice(obj) {
 	let randint = Math.floor(Math.random() * hashSum(obj));
 	let ret;
 	Object.keys(obj).some((key) => {
@@ -49,37 +50,37 @@ window.hashChoice = function hashChoice(obj) {
 		}
 	});
 	return ret;
-};
+}
 
 /**
  * @param {number[]} obj
  * @returns {number}
  */
-window.hashSum = function hashSum(obj) {
+function hashSum(obj) {
 	let sum = 0;
 	Object.keys(obj).forEach((key) => {
 		sum += obj[key];
 	});
 	return sum;
-};
+}
 
 /**
  * @param {Array} arr
  * @returns {Object}
  */
-window.arr2obj = function arr2obj(arr) {
+function arr2obj(arr) {
 	const obj = {};
 	arr.forEach((item) => {
 		obj[item] = 1;
 	});
 	return obj;
-};
+}
 
 /**
  * @param {{}} object
  * @param rest
  */
-window.hashPush = function hashPush(object, ...rest) {
+function hashPush(object, ...rest) {
 	rest.forEach((item) => {
 		if (object[item] === undefined) {
 			object[item] = 1;
@@ -87,13 +88,13 @@ window.hashPush = function hashPush(object, ...rest) {
 			object[item] += 1;
 		}
 	});
-};
+}
 
 /**
  * @param {[]} array
  * @return {{}}
  */
-window.weightedArray2HashMap = function weightedArray2HashMap(array) {
+function weightedArray2HashMap(array) {
 	const obj = {};
 	array.forEach((item) => {
 		if (obj[item] === undefined) {
@@ -103,14 +104,14 @@ window.weightedArray2HashMap = function weightedArray2HashMap(array) {
 		}
 	});
 	return obj;
-};
+}
 
 /**
  * generate a random, almost unique ID that is compliant (possibly) with RFC 4122
  *
  * @return {string}
  */
-window.generateNewID = function generateNewID() {
+function generateNewID() {
 	let date = Date.now(); // high-precision timer
 	let uuid = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
 		let r = (date + Math.random() * 16) % 16 | 0;
@@ -118,44 +119,44 @@ window.generateNewID = function generateNewID() {
 		return (c === "x" ? r : (r & 0x3 | 0x8)).toString(16);
 	});
 	return uuid;
-};
+}
 
 /**
  * @param {Array} array
  * @param {number} indexA
  * @param {number} indexB
  */
-window.arraySwap = function arraySwap(array, indexA, indexB) {
+function arraySwap(array, indexA, indexB) {
 	const tmp = array[indexA];
 	array[indexA] = array[indexB];
 	array[indexB] = tmp;
-};
+}
 
 /**
  * @param {string} string
  * @returns {string}
  */
-window.capFirstChar = function capFirstChar(string) {
+function capFirstChar(string) {
 	return string.charAt(0).toUpperCase() + string.substr(1);
-};
+}
 
 /**
  * @param {string} word
  * @returns {string}
  */
-window.addA = function(word) {
+function addA(word) {
 	let vocal = ['a', 'e', 'i', 'o', 'u', 'A', 'E', 'I', 'O', 'U'];
 	if (vocal.includes(word.charAt(0))) {
 		return `an ${word}`;
 	}
 	return `a ${word}`;
-};
+}
 
 /**
  * @param {number} i
  * @returns {string}
  */
-window.ordinalSuffix = function ordinalSuffix(i) {
+function ordinalSuffix(i) {
 	let j = i % 10;
 	let k = i % 100;
 	if (j === 1 && k !== 11) {
@@ -168,27 +169,27 @@ window.ordinalSuffix = function ordinalSuffix(i) {
 		return `${i}rd`;
 	}
 	return `${i}th`;
-};
+}
 
 /**
  * @param {number} i
  * @returns {string}
  */
-window.ordinalSuffixWords = function(i) {
+function ordinalSuffixWords(i) {
 	const text = ["zeroth", "first", "second", "third", "fourth", "fifth", "sixth", "seventh", "eighth", "ninth", "tenth", "eleventh", "twelfth", "thirteenth", "fourteenth", "fifteenth", "sixteenth", "seventeenth", "eighteenth", "nineteenth"];
 	if (i < text.length) {
 		return text[i];
 	}
 	return ordinalSuffix(i);
-};
+}
 
 /**
  * @param {Iterable<any>} array
  * @returns {any[]}
  */
-window.removeDuplicates = function removeDuplicates(array) {
+function removeDuplicates(array) {
 	return [...new Set(array)];
-};
+}
 
 /**
  * Maps an index from one list onto a matching index on the other.
@@ -230,13 +231,13 @@ App.Utils.escapeHtml = function(text) {
  * @param {Iterable} list
  * @return {{}}
  */
-window.mapIdList = function(list) {
+function mapIdList(list) {
 	let mappedList = {};
 	for (const item of list) {
 		mappedList[item.id] = item;
 	}
 	return mappedList;
-};
+}
 
 /**
  * Topological sorting algorithm