diff --git a/src/api/hooks.js b/src/api/hooks.js
index 1b245af..04d6ce3 100644
--- a/src/api/hooks.js
+++ b/src/api/hooks.js
@@ -9,7 +9,7 @@ import {
     useCallback, useEffect, useReducer, useState,
 } from "react";
 
-import { ForisURLs } from "../forisUrls";
+import { ForisURLs } from "../utils/forisUrls";
 import {
     API_ACTIONS, API_METHODS, API_STATE, getErrorPayload, HEADERS, TIMEOUT,
 } from "./utils";
diff --git a/src/common/RebootButton.js b/src/common/RebootButton.js
index d06a76b..1a6182b 100644
--- a/src/common/RebootButton.js
+++ b/src/common/RebootButton.js
@@ -10,7 +10,7 @@ import PropTypes from "prop-types";
 
 import { useAPIPost } from "../api/hooks";
 import { API_STATE } from "../api/utils";
-import { ForisURLs } from "../forisUrls";
+import { ForisURLs } from "../utils/forisUrls";
 
 import { Button } from "../bootstrap/Button";
 import {
diff --git a/src/common/WiFiSettings/WiFiQRCode.js b/src/common/WiFiSettings/WiFiQRCode.js
index ded70f7..9b30f12 100644
--- a/src/common/WiFiSettings/WiFiQRCode.js
+++ b/src/common/WiFiSettings/WiFiQRCode.js
@@ -9,7 +9,7 @@ import React, { useState } from "react";
 import QRCode from "qrcode.react";
 import PropTypes from "prop-types";
 
-import { ForisURLs } from "../../forisUrls";
+import { ForisURLs } from "../../utils/forisUrls";
 import { Button } from "../../bootstrap/Button";
 import {
     Modal, ModalBody, ModalFooter, ModalHeader,
diff --git a/src/form/__tests__/validation.test.js b/src/form/__tests__/validation.test.js
index 4a4d3f3..163d1b9 100644
--- a/src/form/__tests__/validation.test.js
+++ b/src/form/__tests__/validation.test.js
@@ -12,7 +12,7 @@ import {
     validateIPv6Address,
     validateIPv6Prefix,
     validateMAC,
-} from "validations";
+} from "utils/validations";
 
 describe("Validation functions", () => {
     it("validateIPv4Address valid", () => {
diff --git a/src/index.js b/src/index.js
index 727cfda..f0b29ca 100644
--- a/src/index.js
+++ b/src/index.js
@@ -67,7 +67,7 @@ export { useClickOutside } from "./utils/hooks";
 export { toLocaleDateString } from "./utils/datetime";
 
 // Foris URL
-export { ForisURLs, REFORIS_URL_PREFIX } from "./forisUrls";
+export { ForisURLs, REFORIS_URL_PREFIX } from "./utils/forisUrls";
 
 // Validation
 export {
@@ -78,7 +78,7 @@ export {
     validateDUID,
     validateMAC,
     validateMultipleEmails,
-} from "./validations";
+} from "./utils/validations";
 
 // Alert context
 export { AlertContextProvider, useAlert } from "./alertContext/AlertContext";
diff --git a/src/forisUrls.js b/src/utils/forisUrls.js
similarity index 100%
rename from src/forisUrls.js
rename to src/utils/forisUrls.js
diff --git a/src/validations.js b/src/utils/validations.js
similarity index 100%
rename from src/validations.js
rename to src/utils/validations.js
diff --git a/src/webSockets/WebSockets.js b/src/webSockets/WebSockets.js
index b7c3dfb..ec33a49 100644
--- a/src/webSockets/WebSockets.js
+++ b/src/webSockets/WebSockets.js
@@ -7,7 +7,7 @@
 
 /* eslint no-console: "off" */
 
-import { ForisURLs } from "../forisUrls";
+import { ForisURLs } from "../utils/forisUrls";
 
 const PROTOCOL = window.location.protocol === "http:" ? "ws" : "wss";