diff --git a/.gitignore b/.gitignore
index d35bbf7..eb2db86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 node_modules/
-.idea/
\ No newline at end of file
+.idea/
+util/
+out/
\ No newline at end of file
diff --git a/package.json b/package.json
index 9a78ee0..c99f199 100644
--- a/package.json
+++ b/package.json
@@ -11,12 +11,13 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "clean": "rm -rf out && rm util/*",
-    "build": "npm run clean && tsc -p ./util_src --outDir ./util",
+    "build": "tsc -p ./util_src --outDir ./util",
     "start": "npm run build && electron .",
     "dev": "npm run build && electron . --debug",
     "package": "npm-run-all package:*",
     "package:mac": "electron-packager . --overwrite --platform=darwin --arch=x64 --out=out --icon=assets/app-icon/mac/app.icns --osx-sign.identity='Developer ID Application: GitHub' --extend-info=assets/mac/info.plist",
-    "package:win": "electron-packager . --overwrite --platform=win32 --arch=ia32 --out=out --icon=assets/app-icon/win/app.ico",
+    "package:win32": "electron-packager . --overwrite --platform=win32 --arch=ia32 --out=out --icon=assets/app-icon/win/app.ico",
+    "package:win64": "electron-packager . --overwrite --platform=win32 --arch=x64 --out=out --icon=assets/app-icon/win/app.ico",
     "package:linux": "electron-packager . --overwrite --platform=linux --arch=x64 --out=out",
     "package:installer": "node ./script/installer.js",
     "release": "node ./script/release.js",
@@ -27,12 +28,8 @@
   "author": "David Tookey",
   "license": "Closed Source",
   "dependencies": {
-    "devtron": "^1.4.0",
-    "electron": "^7.2.4",
     "electron-log": "^2.2.14",
-    "electron-settings": "^3.0.7",
-    "electron-shortcut-normalizer": "^1.0.0",
-    "electron-packager": "^15.1.0",
+
     "glob": "^7.1.0",
     "highlight.js": "^9.3.0",
     "update-electron-app": "^1.1.1",
@@ -40,5 +37,12 @@
     "mustache": "^4.0.1",
     "typescript": "^4.0.3",
     "tslint": "^6.1.3"
+  },
+  "devDependencies": {
+    "devtron": "^1.4.0",
+    "electron": "^7.2.4",
+    "electron-settings": "^3.0.7",
+    "electron-shortcut-normalizer": "^1.0.0",
+    "electron-packager": "^15.1.0"
   }
 }
diff --git a/util/fileutils.js b/util/fileutils.js
deleted file mode 100644
index b431b22..0000000
--- a/util/fileutils.js
+++ /dev/null
@@ -1,47 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FileUtils = exports.Configurator = void 0;
-let path = require('path');
-let fs = require('fs');
-let fileExtensionToImage;
-class Configurator {
-    constructor() {
-        this.fileutils = new FileUtils();
-    }
-    getFileExtensionToImageMap() {
-        if (!fileExtensionToImage) {
-            fileExtensionToImage = this.loadConfigMap("file-extensions.json");
-        }
-        return fileExtensionToImage;
-    }
-    ;
-    loadConfigMap(fileName) {
-        let filePath = this.fileutils.getPathToConfig(fileName);
-        let fileBuffer = fs.readFileSync(filePath);
-        let content = fileBuffer.toString('utf8');
-        return JSON.parse(content);
-    }
-}
-exports.Configurator = Configurator;
-class FileUtils {
-    getPathToView(templateName) {
-        return path.join(this.getPathToAssets(), "views", templateName + ".html");
-    }
-    getPathToImage(imageName) {
-        return path.join(this.getPathToAssets(), "images", imageName);
-    }
-    getPathToDocument(documentName) {
-        return path.join(this.getPathToAssets(), "documents", documentName);
-    }
-    getPathToConfig(documentName) {
-        return path.join(this.getPathToAssets(), "conf", documentName);
-    }
-    getPathToAssets() {
-        return path.join(__dirname, "..", "assets");
-    }
-    getFileExtension(fileName) {
-        return fileName.substr(fileName.lastIndexOf(".") + 1);
-    }
-}
-exports.FileUtils = FileUtils;
-//# sourceMappingURL=fileutils.js.map
\ No newline at end of file
diff --git a/util/fileutils.js.map b/util/fileutils.js.map
deleted file mode 100644
index 2fc41b2..0000000
--- a/util/fileutils.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"fileutils.js","sourceRoot":"","sources":["../util_src/fileutils.ts"],"names":[],"mappings":";;;AAAA,IAAI,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAE1B,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAEvB,IAAI,oBAA4B,CAAC;AAEjC,MAAa,YAAY;IAAzB;QAEI,cAAS,GAAc,IAAI,SAAS,EAAE,CAAC;IAiB3C,CAAC;IAfG,0BAA0B;QACtB,IAAI,CAAC,oBAAoB,EAAE;YACvB,oBAAoB,GAAG,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC;SACrE;QACD,OAAO,oBAAoB,CAAC;IAChC,CAAC;IAAA,CAAC;IAEF,aAAa,CAAC,QAAgB;QAC1B,IAAI,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QACxD,IAAI,UAAU,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC3C,IAAI,OAAO,GAAG,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QACzC,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAC9B,CAAC;CAGJ;AAnBD,oCAmBC;AAED,MAAa,SAAS;IAClB,aAAa,CAAC,YAAoB;QAC9B,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,CAAA;IAC7E,CAAC;IAED,cAAc,CAAC,SAAiB;QAC5B,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAA;IACjE,CAAC;IAED,iBAAiB,CAAC,YAAoB;QAClC,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,WAAW,EAAE,YAAY,CAAC,CAAA;IACvE,CAAC;IAED,eAAe,CAAC,YAAoB;QAChC,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,MAAM,EAAE,YAAY,CAAC,CAAA;IAClE,CAAC;IAED,eAAe;QACX,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IAChD,CAAC;IAED,gBAAgB,CAAC,QAAgB;QAC7B,OAAO,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,GAAC,CAAC,CAAC,CAAA;IACvD,CAAC;CACJ;AAxBD,8BAwBC"}
\ No newline at end of file
diff --git a/util/preload.js b/util/preload.js
deleted file mode 100644
index f7c68b9..0000000
--- a/util/preload.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// @ts-ignore
-global.appDir = __dirname.replace("_src", "");
-// @ts-ignore
-window.appDir = __dirname.replace("_src", "");
-console.log(__dirname.replace("_src", ""));
-//# sourceMappingURL=preload.js.map
\ No newline at end of file
diff --git a/util/preload.js.map b/util/preload.js.map
deleted file mode 100644
index 16176a1..0000000
--- a/util/preload.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"preload.js","sourceRoot":"","sources":["../util_src/preload.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,MAAM,CAAC,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AAC7C,aAAa;AACb,MAAM,CAAC,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AAC7C,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAA"}
\ No newline at end of file
diff --git a/util/templates.js b/util/templates.js
deleted file mode 100644
index 7773f96..0000000
--- a/util/templates.js
+++ /dev/null
@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-let fs = require('fs');
-let Mustache = require('mustache');
-const fileutils_1 = require("./fileutils");
-function loadTemplate(filename, objs, cb) {
-    let fu = new fileutils_1.FileUtils();
-    let path = fu.getPathToView(filename);
-    fs.readFile(path, 'utf8', (err, contents) => {
-        if (err)
-            throw err;
-        let results = [];
-        for (let i = 0, l = objs.length; i < l; i++) {
-            let obj = objs[i];
-            let rendered = Mustache.render(contents, obj);
-            results.push(rendered);
-        }
-        cb(results);
-    });
-}
-module.exports = { loadTemplate };
-//# sourceMappingURL=templates.js.map
\ No newline at end of file
diff --git a/util/templates.js.map b/util/templates.js.map
deleted file mode 100644
index e111ce3..0000000
--- a/util/templates.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"templates.js","sourceRoot":"","sources":["../util_src/templates.ts"],"names":[],"mappings":";;AAAA,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;AACtB,IAAI,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;AAClC,2CAAqC;AAMrC,SAAS,YAAY,CAAC,QAAgB,EAAE,IAAc,EAAE,EAAwB;IAC5E,IAAI,EAAE,GAAG,IAAI,qBAAS,EAAE,CAAC;IACzB,IAAI,IAAI,GAAG,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IACtC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;QACxC,IAAI,GAAG;YAAE,MAAM,GAAG,CAAC;QACnB,IAAI,OAAO,GAAa,EAAE,CAAA;QAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YACzC,IAAI,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;YACjB,IAAI,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;YAC7C,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;SACzB;QACD,EAAE,CAAC,OAAO,CAAC,CAAA;IACf,CAAC,CAAC,CAAA;AAEN,CAAC;AAED,MAAM,CAAC,OAAO,GAAG,EAAC,YAAY,EAAC,CAAA"}
\ No newline at end of file