diff --git a/src/components/host/HostBadge.js b/src/components/host/HostBadge.js
index 8820f13dc70fb0e66cc7c77b0724c99b514f7653..95efc6453900bc6ec3115af839421775b116f41b 100644
--- a/src/components/host/HostBadge.js
+++ b/src/components/host/HostBadge.js
@@ -1,5 +1,5 @@
 import { IconBadge } from "@ess-ics/ce-ui-common";
-import { HostStatusIcon } from "./HostStatusIcon";
+import { HostStatusIcon } from "./HostStatus/HostStatusIcon";
 
 export function HostBadge({ host, status, ...rest }) {
   return (
diff --git a/src/components/host/HostStatus.js b/src/components/host/HostStatus/HostStatus.js
similarity index 94%
rename from src/components/host/HostStatus.js
rename to src/components/host/HostStatus/HostStatus.js
index 3d4424bb921443e49b0f143e0488745c38bd8fa7..7948cadd65bc5c10bc1c1be49a01ac01694ed472 100644
--- a/src/components/host/HostStatus.js
+++ b/src/components/host/HostStatus/HostStatus.js
@@ -1,6 +1,6 @@
 import { useContext, useMemo } from "react";
 import { Grid, Skeleton } from "@mui/material";
-import { apiContext } from "../../api/DeployApi";
+import { apiContext } from "../../../api/DeployApi";
 import { useAPIMethod } from "@ess-ics/ce-ui-common";
 import { HostStatusIcon } from "./HostStatusIcon";
 
diff --git a/src/components/host/HostStatusData.js b/src/components/host/HostStatus/HostStatusData.js
similarity index 91%
rename from src/components/host/HostStatusData.js
rename to src/components/host/HostStatus/HostStatusData.js
index 4f00b182d047d3245210bd865a346a9634be265d..8333cf54020d474e0be3e8ebb82210af9475429e 100644
--- a/src/components/host/HostStatusData.js
+++ b/src/components/host/HostStatus/HostStatusData.js
@@ -1,11 +1,11 @@
-import { SEVERITY, STATUS } from "../common/Status";
+import { SEVERITY, STATUS } from "../../common/Status";
 
 export const HOST_STATUS = {
   available: "available",
   unreachable: "unreachable"
 };
 
-export const getHostStatusInfo = (hostStatusInfo) => {
+export const getHostStatus = (hostStatusInfo) => {
   let { status } = hostStatusInfo;
   const alertSeverity = hostStatusInfo?.alertSeverity?.toLowerCase();
   status = status.toLowerCase();
diff --git a/src/components/host/HostStatusIcon.js b/src/components/host/HostStatus/HostStatusIcon.js
similarity index 95%
rename from src/components/host/HostStatusIcon.js
rename to src/components/host/HostStatus/HostStatusIcon.js
index e469a2696a8eb709d52dbad4b85ab5ec39cb160a..6cd41fd9f35674069aa7de10133f9be0c523c876 100644
--- a/src/components/host/HostStatusIcon.js
+++ b/src/components/host/HostStatus/HostStatusIcon.js
@@ -1,12 +1,12 @@
 import { useTheme } from "@mui/material";
-import Popover from "../common/Popover";
+import Popover from "../../common/Popover";
 import {
   StatusBadge,
   StatusIcon,
   STATUS,
   StatusPopoverContent,
   statusConfig
-} from "../common/Status";
+} from "../../common/Status";
 import { getHostStatusInfo } from "./HostStatusData";
 
 export function HostStatusIcon({ hostStatus, hideAlerts = false }) {
diff --git a/src/components/host/HostStatus/index.js b/src/components/host/HostStatus/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..6499e5a5108a2738d4987aab0d164aa5e7851004
--- /dev/null
+++ b/src/components/host/HostStatus/index.js
@@ -0,0 +1,5 @@
+import { HostStatus } from "./HostStatus";
+import { getHostStatus } from "./HostStatusData";
+
+export { HostStatus, getHostStatus };
+export default HostStatus;
diff --git a/src/components/host/index.js b/src/components/host/index.js
index 775a21868e616dfd574d6fffa8e792f76c2fc381..40b9013ecaefa76ab4e8a403b9fccc17f9889054 100644
--- a/src/components/host/index.js
+++ b/src/components/host/index.js
@@ -1,5 +1,5 @@
 import { HostBadge } from "./HostBadge";
-import { HostStatusIcon } from "./HostStatusIcon";
+import { HostStatusIcon } from "./HostStatus/HostStatusIcon";
 import { HostTable, rowDescription, createRow } from "./HostTable";
 
 export { HostBadge, HostStatusIcon, HostTable, rowDescription, createRow };