diff --git a/ui/src/contexts/WaterPumpStatusProvider.js b/ui/src/components/WaterPumpStatusProvider.js
similarity index 92%
rename from ui/src/contexts/WaterPumpStatusProvider.js
rename to ui/src/components/WaterPumpStatusProvider.js
index 915caa5..3cadb5b 100644
--- a/ui/src/contexts/WaterPumpStatusProvider.js
+++ b/ui/src/components/WaterPumpStatusProvider.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import { updateSystemStatus } from '../store/slices/SystemStatus';
-import { useWaterPumpAPI } from './WaterPumpAPIContext';
-import { useNotificationsSystem } from './NotificationsContext';
+import { useWaterPumpAPI } from '../contexts/WaterPumpAPIContext';
+import { useNotificationsSystem } from '../contexts/NotificationsContext';
 
 const FETCH_INTERVAL = 5000;
 const CHECK_INTERVAL = Math.round(FETCH_INTERVAL / 10);
diff --git a/ui/src/contexts/WaterPumpAPIContext.js b/ui/src/contexts/WaterPumpAPIContext.js
index aff1fac..9f5ae25 100644
--- a/ui/src/contexts/WaterPumpAPIContext.js
+++ b/ui/src/contexts/WaterPumpAPIContext.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
 import { CWaterPumpAPI } from '../api/CWaterPumpAPI.js';
-import WaterPumpStatusProvider from './WaterPumpStatusProvider.js';
+import WaterPumpStatusProvider from '../components/WaterPumpStatusProvider.js';
 
 const WaterPumpAPIContext = React.createContext();