diff --git a/src/components/formFields.tsx b/src/common/components/formFields.tsx
similarity index 100%
rename from src/components/formFields.tsx
rename to src/common/components/formFields.tsx
diff --git a/src/components/onOffSwitch/onOffSwitch.css b/src/common/components/onOffSwitch.css
similarity index 100%
rename from src/components/onOffSwitch/onOffSwitch.css
rename to src/common/components/onOffSwitch.css
diff --git a/src/components/onOffSwitch/onOffSwitch.tsx b/src/common/components/onOffSwitch.tsx
similarity index 100%
rename from src/components/onOffSwitch/onOffSwitch.tsx
rename to src/common/components/onOffSwitch.tsx
diff --git a/src/components/pageContext.tsx b/src/common/components/pageContext.tsx
similarity index 100%
rename from src/components/pageContext.tsx
rename to src/common/components/pageContext.tsx
diff --git a/src/components/react-types.ts b/src/common/components/react-types.ts
similarity index 100%
rename from src/components/react-types.ts
rename to src/common/components/react-types.ts
diff --git a/src/components/toastAlert/toastAlert.css b/src/common/components/toastAlert.css
similarity index 100%
rename from src/components/toastAlert/toastAlert.css
rename to src/common/components/toastAlert.css
diff --git a/src/components/toastAlert/toastAlert.tsx b/src/common/components/toastAlert.tsx
similarity index 100%
rename from src/components/toastAlert/toastAlert.tsx
rename to src/common/components/toastAlert.tsx
diff --git a/src/dashboard/components/dashboardTheme.tsx b/src/dashboard/components/dashboardTheme.tsx
index 8d78a4d4..8a401116 100644
--- a/src/dashboard/components/dashboardTheme.tsx
+++ b/src/dashboard/components/dashboardTheme.tsx
@@ -1,4 +1,4 @@
-import { Theme, ViewConfigContext } from 'components/react-types';
+import { Theme, ViewConfigContext } from 'common/components/react-types';
 import React, { useContext } from 'react';
 import darkTheme from '../themes/dark/dark';
 import lightTheme from '../themes/light/light';
diff --git a/src/dashboard/components/pipelines/build.tsx b/src/dashboard/components/pipelines/build.tsx
index d78c9925..e8f39700 100644
--- a/src/dashboard/components/pipelines/build.tsx
+++ b/src/dashboard/components/pipelines/build.tsx
@@ -1,7 +1,7 @@
+import { ViewConfigContext } from 'common/components/react-types';
 import { CIBuild } from 'common/types';
 import React, { useContext, useEffect, useState } from 'react';
 import { Badge, OverlayTrigger, Tooltip } from 'react-bootstrap';
-import { ViewConfigContext } from '../../../components/react-types';
 import './build.css';
 
 const Changes = ({ build }: { build: CIBuild }) => {
diff --git a/src/dashboard/components/pipelines/pipelines.tsx b/src/dashboard/components/pipelines/pipelines.tsx
index b869d06a..af6bff5b 100644
--- a/src/dashboard/components/pipelines/pipelines.tsx
+++ b/src/dashboard/components/pipelines/pipelines.tsx
@@ -1,5 +1,5 @@
 import { CIBuild, ServiceStateItem } from 'common/types';
-import { ServiceStateContext, ViewConfigContext } from 'components/react-types';
+import { ServiceStateContext, ViewConfigContext } from 'common/components/react-types';
 import React, { useContext } from 'react';
 import Build from './build';
 import './pipelines.css';
diff --git a/src/dashboard/dashboard.tsx b/src/dashboard/dashboard.tsx
index 3265449f..037ff465 100644
--- a/src/dashboard/dashboard.tsx
+++ b/src/dashboard/dashboard.tsx
@@ -1,7 +1,7 @@
 import 'bootstrap/dist/css/bootstrap.css';
 import core from 'common/core';
 import logger from 'common/logger';
-import PageContext from 'components/pageContext';
+import PageContext from 'common/components/pageContext';
 import 'font-awesome/scss/font-awesome.scss';
 import * as React from 'react';
 import { createRoot } from 'react-dom/client';
diff --git a/src/dashboard/popup.tsx b/src/dashboard/popup.tsx
index 7e7d58d8..4c26adda 100644
--- a/src/dashboard/popup.tsx
+++ b/src/dashboard/popup.tsx
@@ -1,7 +1,7 @@
 import 'bootstrap/dist/css/bootstrap.css';
 import core from 'common/core';
 import logger from 'common/logger';
-import PageContext from 'components/pageContext';
+import PageContext from 'common/components/pageContext';
 import 'font-awesome/scss/font-awesome.scss';
 import * as React from 'react';
 import { createRoot } from 'react-dom/client';
diff --git a/src/dashboard/themes/dark/dark.tsx b/src/dashboard/themes/dark/dark.tsx
index 0f68459c..15e39ed4 100644
--- a/src/dashboard/themes/dark/dark.tsx
+++ b/src/dashboard/themes/dark/dark.tsx
@@ -1,6 +1,6 @@
 import Pipelines from 'dashboard/components/pipelines/pipelines';
 import Navbar from 'dashboard/components/popupNavbar';
-import { ThemeProps } from 'components/react-types';
+import { ThemeProps } from 'common/components/react-types';
 import React from 'react';
 import './dark.css';
 
diff --git a/src/dashboard/themes/light/light.tsx b/src/dashboard/themes/light/light.tsx
index 2b042b3d..46070207 100644
--- a/src/dashboard/themes/light/light.tsx
+++ b/src/dashboard/themes/light/light.tsx
@@ -1,6 +1,6 @@
 import Pipelines from 'dashboard/components/pipelines/pipelines';
 import Navbar from 'dashboard/components/popupNavbar';
-import { ThemeProps } from 'components/react-types';
+import { ThemeProps } from 'common/components/react-types';
 import React from 'react';
 import './light.css';
 
diff --git a/src/options/components/optionsNavbar/optionsNavBar.tsx b/src/options/components/optionsNavbar/optionsNavBar.tsx
index 7edef669..12fc45e6 100644
--- a/src/options/components/optionsNavbar/optionsNavBar.tsx
+++ b/src/options/components/optionsNavbar/optionsNavBar.tsx
@@ -1,6 +1,6 @@
 import core from 'common/core';
 import { CIServiceSettings } from 'common/types';
-import OnOffSwitch from 'components/onOffSwitch/onOffSwitch';
+import OnOffSwitch from 'common/components/onOffSwitch';
 import React, { useState } from 'react';
 import { Col, Nav, Navbar, NavDropdown } from 'react-bootstrap';
 import './optionsNavbar.css';
diff --git a/src/options/components/sidebar.tsx b/src/options/components/sidebar.tsx
index db34ae53..95d569ff 100644
--- a/src/options/components/sidebar.tsx
+++ b/src/options/components/sidebar.tsx
@@ -1,5 +1,5 @@
 import { CIServiceSettings } from 'common/types';
-import { ServiceTypesContext, SettingsContext } from 'components/react-types';
+import { ServiceTypesContext, SettingsContext } from 'common/components/react-types';
 import React, { useContext } from 'react';
 import { Nav } from 'react-bootstrap';
 import { NavLink } from 'react-router-dom';
diff --git a/src/options/layout.tsx b/src/options/layout.tsx
index 5e0b47b1..b2f50ccf 100644
--- a/src/options/layout.tsx
+++ b/src/options/layout.tsx
@@ -3,7 +3,7 @@ import {
     ServiceContext,
     ServiceTypesContext,
     SettingsContext,
-} from 'components/react-types';
+} from 'common/components/react-types';
 import 'font-awesome/scss/font-awesome.scss';
 import OptionsNavBar from 'options/components/optionsNavbar/optionsNavBar';
 import React, { useContext } from 'react';
diff --git a/src/options/options.tsx b/src/options/options.tsx
index 1b144081..e70fe61e 100644
--- a/src/options/options.tsx
+++ b/src/options/options.tsx
@@ -1,6 +1,6 @@
 import core from 'common/core';
 import logger from 'common/logger';
-import PageContext from 'components/pageContext';
+import PageContext from 'common/components/pageContext';
 import * as React from 'react';
 import { createRoot } from 'react-dom/client';
 import { HashRouter, Route, Routes } from 'react-router-dom';
diff --git a/src/options/pages/add/components/serviceThumbnails.tsx b/src/options/pages/add/components/serviceThumbnails.tsx
index d229bc45..9fbcbc5e 100644
--- a/src/options/pages/add/components/serviceThumbnails.tsx
+++ b/src/options/pages/add/components/serviceThumbnails.tsx
@@ -1,4 +1,4 @@
-import { ServiceTypesContext } from 'components/react-types';
+import { ServiceTypesContext } from 'common/components/react-types';
 import React, { useContext, useState } from 'react';
 import './serviceThumbnails.css';
 
diff --git a/src/options/pages/configuration/components/jsonEditor.tsx b/src/options/pages/configuration/components/jsonEditor.tsx
index eeb577ac..dcd6ee1f 100644
--- a/src/options/pages/configuration/components/jsonEditor.tsx
+++ b/src/options/pages/configuration/components/jsonEditor.tsx
@@ -1,4 +1,4 @@
-import { FormButtonField } from 'components/formFields';
+import { FormButtonField } from 'common/components/formFields';
 import React, { useState } from 'react';
 import { Col, Form, Row } from 'react-bootstrap';
 import './jsonEditor.css';
diff --git a/src/options/pages/configuration/configurationPage.tsx b/src/options/pages/configuration/configurationPage.tsx
index 536c48b6..0082ce6d 100644
--- a/src/options/pages/configuration/configurationPage.tsx
+++ b/src/options/pages/configuration/configurationPage.tsx
@@ -1,7 +1,11 @@
 import core from 'common/core';
-import { FormBooleanField, FormButtonField, FormInputField } from 'components/formFields';
-import { SettingsContext } from 'components/react-types';
-import ToastAlert from 'components/toastAlert/toastAlert';
+import {
+    FormBooleanField,
+    FormButtonField,
+    FormInputField,
+} from 'common/components/formFields';
+import { SettingsContext } from 'common/components/react-types';
+import ToastAlert from 'common/components/toastAlert';
 import React, { useContext, useState } from 'react';
 import { Alert, Col, Container, Form, Row } from 'react-bootstrap';
 import JsonEditor from './components/jsonEditor';
diff --git a/src/options/pages/notificationsPage.tsx b/src/options/pages/notificationsPage.tsx
index a4afa797..33e8b0f6 100644
--- a/src/options/pages/notificationsPage.tsx
+++ b/src/options/pages/notificationsPage.tsx
@@ -1,6 +1,6 @@
 import core from 'common/core';
-import { FormBooleanField } from 'components/formFields';
-import { ViewConfigContext } from 'components/react-types';
+import { FormBooleanField } from 'common/components/formFields';
+import { ViewConfigContext } from 'common/components/react-types';
 import React, { useContext } from 'react';
 import { Col, Container, Form } from 'react-bootstrap';
 
diff --git a/src/options/pages/service/components/dynamicForm.tsx b/src/options/pages/service/components/dynamicForm.tsx
index aefc5db0..6b4a222c 100644
--- a/src/options/pages/service/components/dynamicForm.tsx
+++ b/src/options/pages/service/components/dynamicForm.tsx
@@ -5,8 +5,8 @@ import {
     CIServiceSettings,
     WorkerError,
 } from 'common/types';
-import { FormInputField } from 'components/formFields';
-import { ServiceTypesContext } from 'components/react-types';
+import { FormInputField } from 'common/components/formFields';
+import { ServiceTypesContext } from 'common/components/react-types';
 import React, { useContext, useState } from 'react';
 import { Alert, Form } from 'react-bootstrap';
 import './dynamicForm.css';
diff --git a/src/options/pages/service/servicePage.tsx b/src/options/pages/service/servicePage.tsx
index 4c531211..f0fa807e 100644
--- a/src/options/pages/service/servicePage.tsx
+++ b/src/options/pages/service/servicePage.tsx
@@ -1,7 +1,7 @@
 import core from 'common/core';
 import { CIPipelineList, CIServiceSettings } from 'common/types';
-import { ServiceContext } from 'components/react-types';
-import ToastAlert from 'components/toastAlert/toastAlert';
+import { ServiceContext } from 'common/components/react-types';
+import ToastAlert from 'common/components/toastAlert';
 import React, { useContext, useState } from 'react';
 import { Col, Container, Row } from 'react-bootstrap';
 import { useNavigate } from 'react-router-dom';
diff --git a/src/options/pages/viewPage.tsx b/src/options/pages/viewPage.tsx
index 07e74465..a10a59b0 100644
--- a/src/options/pages/viewPage.tsx
+++ b/src/options/pages/viewPage.tsx
@@ -3,8 +3,8 @@ import {
     FormBooleanField,
     FormNumberField,
     FormSelectField,
-} from 'components/formFields';
-import { ViewConfigContext } from 'components/react-types';
+} from 'common/components/formFields';
+import { ViewConfigContext } from 'common/components/react-types';
 import DashboardTheme from 'dashboard/components/dashboardTheme';
 import React, { useContext } from 'react';
 import { Col, Container, Form, Row } from 'react-bootstrap';