diff --git a/package-lock.json b/package-lock.json
index 2ce3282c..ac25e816 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,6 +17,7 @@
         "crypto-js": "^4.0.0",
         "lodash": "^4.17.19",
         "pbkdf2": "^3.1.1",
+        "setimmediate": "^1.0.5",
         "winston": "^3.2.1"
       },
       "devDependencies": {
@@ -8149,8 +8150,7 @@
     "node_modules/setimmediate": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
-      "dev": true
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
     },
     "node_modules/setprototypeof": {
       "version": "1.1.1",
@@ -17441,8 +17441,7 @@
     "setimmediate": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
-      "dev": true
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
     },
     "setprototypeof": {
       "version": "1.1.1",
diff --git a/package.json b/package.json
index 56aece36..21491af0 100644
--- a/package.json
+++ b/package.json
@@ -45,10 +45,10 @@
     "crypto-js": "^4.0.0",
     "lodash": "^4.17.19",
     "pbkdf2": "^3.1.1",
+    "setimmediate": "^1.0.5",
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "node-inspect-extracted": "1.0.7",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "dotenv-safe": "^8.2.0",
@@ -64,6 +64,7 @@
     "karma-webpack": "^4.0.2",
     "localforage": "^1.7.3",
     "mocha": "^7.2.0",
+    "node-inspect-extracted": "1.0.7",
     "nyc": "^15.0.0",
     "sinon": "^9.0.3",
     "webpack": "^4.43.0",
diff --git a/src/index.js b/src/index.js
index 784e1cab..2fa9d8a9 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,3 +1,7 @@
+// Default winston transport requires setImmediate to work, so
+// polyfill included here. Making it work with webpack is rather tricky, so it is used as per
+// documentation: https://github.com/YuzuJS/setImmediate#usage
+require('setimmediate');
 const Wallet = require('./types/Wallet/Wallet');
 const Account = require('./types/Account/Account');
 const Identities = require('./types/Identities/Identities');
diff --git a/src/logger.js b/src/logger/index.js
similarity index 100%
rename from src/logger.js
rename to src/logger/index.js