diff --git a/pages/api/file/deleteawaitingsubmissionfromblob.js b/pages/api/file/deleteawaitingsubmissionfromblob.js
index 64ca4d30..dd459590 100644
--- a/pages/api/file/deleteawaitingsubmissionfromblob.js
+++ b/pages/api/file/deleteawaitingsubmissionfromblob.js
@@ -1,4 +1,4 @@
-import { hashAPIPath } from "../../../actions";
+import { hashAPIPath } from "../../../actions/core/hash";
 import { deleteBlob } from "../../../actions/azurestorage";
 
 import nextConnect from "next-connect";
@@ -38,8 +38,8 @@ ApiProxy.get(async (req, res) => {
 
 export const config = {
     api: {
-        bodyParser: false,
-    },
+        bodyParser: false
+    }
 };
 
 export default ApiProxy;
diff --git a/pages/api/file/deleteblob.js b/pages/api/file/deleteblob.js
index 465dc167..2a57c3b6 100644
--- a/pages/api/file/deleteblob.js
+++ b/pages/api/file/deleteblob.js
@@ -1,4 +1,4 @@
-import { hashAPIPath } from "../../../actions";
+import { hashAPIPath } from "../../../actions/core/hash";
 import { deleteBlob } from "../../../actions/azurestorage";
 
 import nextConnect from "next-connect";
@@ -35,8 +35,8 @@ ApiProxy.get(async (req, res) => {
 
 export const config = {
     api: {
-        bodyParser: false,
-    },
+        bodyParser: false
+    }
 };
 
 export default ApiProxy;
diff --git a/pages/api/file/deleteblobcase.js b/pages/api/file/deleteblobcase.js
index 2bfd453d..c849ef80 100644
--- a/pages/api/file/deleteblobcase.js
+++ b/pages/api/file/deleteblobcase.js
@@ -1,4 +1,4 @@
-import { hashAPIPath } from "../../../actions";
+import { hashAPIPath } from "../../../actions/core/hash";
 import { deleteBlobCase } from "../../../actions/azurestorage";
 
 import nextConnect from "next-connect";
@@ -33,8 +33,8 @@ ApiProxy.get(async (req, res) => {
 
 export const config = {
     api: {
-        bodyParser: false,
-    },
+        bodyParser: false
+    }
 };
 
 export default ApiProxy;
diff --git a/pages/api/file/deleteblobrep.js b/pages/api/file/deleteblobrep.js
index 50f77135..2c3e55c2 100644
--- a/pages/api/file/deleteblobrep.js
+++ b/pages/api/file/deleteblobrep.js
@@ -1,4 +1,4 @@
-import { hashAPIPath } from "../../../actions";
+import { hashAPIPath } from "../../../actions/core/hash";
 import { deleteBlobCase, deleteBlobRep } from "../../../actions/azurestorage";
 
 import nextConnect from "next-connect";
@@ -38,8 +38,8 @@ ApiProxy.get(async (req, res) => {
 
 export const config = {
     api: {
-        bodyParser: false,
-    },
+        bodyParser: false
+    }
 };
 
 export default ApiProxy;
diff --git a/pages/api/file/downloadblob.js b/pages/api/file/downloadblob.js
index 4b8d6cb0..fe2ab520 100644
--- a/pages/api/file/downloadblob.js
+++ b/pages/api/file/downloadblob.js
@@ -1,7 +1,7 @@
 import { downloadFile } from "../../../actions/azurestorage";
 
 import nextConnect from "next-connect";
-import { hashAPIPath } from "../../../actions";
+import { hashAPIPath } from "../../../actions/core/hash";
 import middleware from "../middleware/middleware";
 
 const WORDKEY = process.env.HASHKEY;
@@ -58,8 +58,8 @@ async function streamToBuffer(readableStream) {
 
 export const config = {
     api: {
-        bodyParser: false,
-    },
+        bodyParser: false
+    }
 };
 
 export default ApiProxy;
diff --git a/pages/api/file/getawaitingsubmissionfromblob.js b/pages/api/file/getawaitingsubmissionfromblob.js
index ce3efa45..86f0a0f0 100644
--- a/pages/api/file/getawaitingsubmissionfromblob.js
+++ b/pages/api/file/getawaitingsubmissionfromblob.js
@@ -5,7 +5,7 @@ import {
 import _ from "lodash";
 import nextConnect from "next-connect";
 import middleware from "../middleware/middleware";
-import { hashAPIPath } from "../../../actions";
+import { hashAPIPath } from "../../../actions/core/hash";
 
 const ApiProxy = nextConnect();
 ApiProxy.use(middleware);
diff --git a/pages/api/file/getbloblist.js b/pages/api/file/getbloblist.js
index ae972fc5..0154b8fa 100644
--- a/pages/api/file/getbloblist.js
+++ b/pages/api/file/getbloblist.js
@@ -29,7 +29,7 @@
  *         description: Success
  */
 
-import { hashAPIPath } from "../../../actions";
+import { hashAPIPath } from "../../../actions/core/hash";
 import { getBlobs, getRepsFilesBlobs } from "../../../actions/azurestorage";
 
 import nextConnect from "next-connect";
@@ -75,8 +75,8 @@ ApiProxy.get(async (req, res) => {
 
 export const config = {
     api: {
-        bodyParser: false,
-    },
+        bodyParser: false
+    }
 };
 
 export default ApiProxy;
diff --git a/pages/api/file/getprogressobjblob.js b/pages/api/file/getprogressobjblob.js
index 07b7e39f..aac8bfd5 100644
--- a/pages/api/file/getprogressobjblob.js
+++ b/pages/api/file/getprogressobjblob.js
@@ -1,11 +1,11 @@
 import {
     downloadProgressFile,
-    getProgressBlobs,
+    getProgressBlobs
 } from "../../../actions/azurestorage";
 import _ from "lodash";
 import nextConnect from "next-connect";
 import middleware from "../middleware/middleware";
-import { hashAPIPath } from "../../../actions";
+import { hashAPIPath } from "../../../actions/core/hash";
 
 const ApiProxy = nextConnect();
 ApiProxy.use(middleware);
@@ -48,8 +48,8 @@ ApiProxy.get(async (req, res) => {
 
 export const config = {
     api: {
-        bodyParser: false,
-    },
+        bodyParser: false
+    }
 };
 
 export default ApiProxy;
diff --git a/pages/api/file/getrepsblob.js b/pages/api/file/getrepsblob.js
index 9cad4147..51bf1df3 100644
--- a/pages/api/file/getrepsblob.js
+++ b/pages/api/file/getrepsblob.js
@@ -31,12 +31,13 @@
 
 import {
     downloadAllRepsFiles,
-    getRepsBlobs,
+    getRepsBlobs
 } from "../../../actions/azurestorage";
 import _ from "lodash";
 import nextConnect from "next-connect";
 import middleware from "../middleware/middleware";
-import { consoleLogger, hashAPIPath } from "../../../actions";
+import { hashAPIPath } from "../../../actions/core/hash";
+import { consoleLogger } from "../../../actions/core/logger";
 
 const ApiProxy = nextConnect();
 ApiProxy.use(middleware);
diff --git a/pages/api/file/setupcontainer.js b/pages/api/file/setupcontainer.js
index 4225185a..86aa9bf0 100644
--- a/pages/api/file/setupcontainer.js
+++ b/pages/api/file/setupcontainer.js
@@ -3,9 +3,10 @@ import {
     createContainerSas,
     getContainers,
     getBlobs,
-    uploadFile,
+    uploadFile
 } from "../../../actions/azurestorage";
-import { hashAPIPath, consoleLogger } from "../../../actions";
+import { hashAPIPath } from "../../../actions/core/hash";
+import { consoleLogger } from "../../../actions/core/logger";
 
 import middleware from "../middleware/middleware";
 import nextConnect from "next-connect";
@@ -34,7 +35,7 @@ ApiProxy.get(async (req, res) => {
         consoleLogger({
             name: "setupcontainer",
             code: "bad hash",
-            query: JSON.stringify(req.query),
+            query: JSON.stringify(req.query)
         });
         return res.status(400).json();
     }
@@ -42,8 +43,8 @@ ApiProxy.get(async (req, res) => {
 
 export const config = {
     api: {
-        bodyParser: false,
-    },
+        bodyParser: false
+    }
 };
 
 export default ApiProxy;
diff --git a/pages/api/file/uploadsinglefile.js b/pages/api/file/uploadsinglefile.js
index 67d7e4d1..cd8e45ff 100644
--- a/pages/api/file/uploadsinglefile.js
+++ b/pages/api/file/uploadsinglefile.js
@@ -6,7 +6,7 @@ import {
 
 import nextConnect from "next-connect";
 import middleware from "../middleware/middleware";
-import { consoleLogger } from "../../../actions";
+import { consoleLogger } from "../../../actions/core/logger";
 import { fileTypeFromBuffer } from "file-type";
 import fs from "fs";
 import path from "path";