diff --git a/src/components/dashboard/users/AccessContainer.tsx b/src/components/dashboard/users/AccessContainer.tsx
index 13680070d..656292ece 100644
--- a/src/components/dashboard/users/AccessContainer.tsx
+++ b/src/components/dashboard/users/AccessContainer.tsx
@@ -1,6 +1,6 @@
 import React, { FunctionComponent } from 'react';
 import globalize from '../../../scripts/globalize';
-import CheckBoxElement from '../elements/CheckBoxElement';
+import CheckBoxElement from '../../../elements/CheckBoxElement';
 
 type IProps = {
     containerClassName?: string;
diff --git a/src/components/dashboard/users/AccessScheduleList.tsx b/src/components/dashboard/users/AccessScheduleList.tsx
index 6549f9e19..a89f8837c 100644
--- a/src/components/dashboard/users/AccessScheduleList.tsx
+++ b/src/components/dashboard/users/AccessScheduleList.tsx
@@ -1,7 +1,7 @@
 import React, { FunctionComponent } from 'react';
 import datetime from '../../../scripts/datetime';
 import globalize from '../../../scripts/globalize';
-import IconButtonElement from '../elements/IconButtonElement';
+import IconButtonElement from '../../../elements/IconButtonElement';
 
 type IProps = {
     index: number;
diff --git a/src/components/dashboard/users/BlockedTagList.tsx b/src/components/dashboard/users/BlockedTagList.tsx
index 4c46d30a5..6a9a5e6a9 100644
--- a/src/components/dashboard/users/BlockedTagList.tsx
+++ b/src/components/dashboard/users/BlockedTagList.tsx
@@ -1,5 +1,5 @@
 import React, { FunctionComponent } from 'react';
-import IconButtonElement from '../elements/IconButtonElement';
+import IconButtonElement from '../../../elements/IconButtonElement';
 
 type IProps = {
     tag?: string;
diff --git a/src/components/dashboard/users/UserCardBox.tsx b/src/components/dashboard/users/UserCardBox.tsx
index 285ccfe3c..3d4bb2e56 100644
--- a/src/components/dashboard/users/UserCardBox.tsx
+++ b/src/components/dashboard/users/UserCardBox.tsx
@@ -4,7 +4,7 @@ import { formatDistanceToNow } from 'date-fns';
 import { localeWithSuffix } from '../../../scripts/dfnshelper';
 import globalize from '../../../scripts/globalize';
 import cardBuilder from '../../cardbuilder/cardBuilder';
-import IconButtonElement from '../elements/IconButtonElement';
+import IconButtonElement from '../../../elements/IconButtonElement';
 import escapeHTML from 'escape-html';
 
 const createLinkElement = ({ user, renderImgUrl }: { user: UserDto, renderImgUrl: string }) => ({
diff --git a/src/components/dashboard/users/UserPasswordForm.tsx b/src/components/dashboard/users/UserPasswordForm.tsx
index d7467fd1b..7a4344690 100644
--- a/src/components/dashboard/users/UserPasswordForm.tsx
+++ b/src/components/dashboard/users/UserPasswordForm.tsx
@@ -6,9 +6,9 @@ import LibraryMenu from '../../../scripts/libraryMenu';
 import confirm from '../../confirm/confirm';
 import loading from '../../loading/loading';
 import toast from '../../toast/toast';
-import ButtonElement from '../elements/ButtonElement';
-import CheckBoxElement from '../elements/CheckBoxElement';
-import InputElement from '../elements/InputElement';
+import ButtonElement from '../../../elements/ButtonElement';
+import CheckBoxElement from '../../../elements/CheckBoxElement';
+import InputElement from '../../../elements/InputElement';
 
 type IProps = {
     userId: string;
diff --git a/src/components/dashboard/elements/ButtonElement.tsx b/src/elements/ButtonElement.tsx
similarity index 95%
rename from src/components/dashboard/elements/ButtonElement.tsx
rename to src/elements/ButtonElement.tsx
index a872166b0..3de90f0c1 100644
--- a/src/components/dashboard/elements/ButtonElement.tsx
+++ b/src/elements/ButtonElement.tsx
@@ -1,5 +1,5 @@
 import React, { FunctionComponent } from 'react';
-import globalize from '../../../scripts/globalize';
+import globalize from '../scripts/globalize';
 
 const createButtonElement = ({ type, id, className, title, leftIcon, rightIcon }: IProps) => ({
     __html: `<button
diff --git a/src/components/dashboard/elements/CheckBoxElement.tsx b/src/elements/CheckBoxElement.tsx
similarity index 97%
rename from src/components/dashboard/elements/CheckBoxElement.tsx
rename to src/elements/CheckBoxElement.tsx
index 16b8fb28b..fade82389 100644
--- a/src/components/dashboard/elements/CheckBoxElement.tsx
+++ b/src/elements/CheckBoxElement.tsx
@@ -1,6 +1,6 @@
 import escapeHTML from 'escape-html';
 import React, { FunctionComponent } from 'react';
-import globalize from '../../../scripts/globalize';
+import globalize from '../scripts/globalize';
 
 const createCheckBoxElement = ({ labelClassName, className, id, dataFilter, dataItemType, dataId, checkedAttribute, renderContent }: { labelClassName?: string, type?: string, className?: string, id?: string, dataFilter?: string, dataItemType?: string, dataId?: string, checkedAttribute?: string, renderContent?: string }) => ({
     __html: `<label ${labelClassName}>
diff --git a/src/components/dashboard/elements/IconButtonElement.tsx b/src/elements/IconButtonElement.tsx
similarity index 96%
rename from src/components/dashboard/elements/IconButtonElement.tsx
rename to src/elements/IconButtonElement.tsx
index 919e4d5ce..c879e0ce0 100644
--- a/src/components/dashboard/elements/IconButtonElement.tsx
+++ b/src/elements/IconButtonElement.tsx
@@ -1,5 +1,5 @@
 import React, { FunctionComponent } from 'react';
-import globalize from '../../../scripts/globalize';
+import globalize from '../scripts/globalize';
 
 type IProps = {
     is?: string;
diff --git a/src/components/dashboard/elements/InputElement.tsx b/src/elements/InputElement.tsx
similarity index 93%
rename from src/components/dashboard/elements/InputElement.tsx
rename to src/elements/InputElement.tsx
index a22febb12..42267fb91 100644
--- a/src/components/dashboard/elements/InputElement.tsx
+++ b/src/elements/InputElement.tsx
@@ -1,5 +1,5 @@
 import React, { FunctionComponent } from 'react';
-import globalize from '../../../scripts/globalize';
+import globalize from '../scripts/globalize';
 
 const createInputElement = ({ type, id, label, options }: { type?: string, id?: string, label?: string, options?: string }) => ({
     __html: `<input
diff --git a/src/components/dashboard/elements/SectionTitleContainer.tsx b/src/elements/SectionTitleContainer.tsx
similarity index 100%
rename from src/components/dashboard/elements/SectionTitleContainer.tsx
rename to src/elements/SectionTitleContainer.tsx
diff --git a/src/components/dashboard/elements/SectionTitleLinkElement.tsx b/src/elements/SectionTitleLinkElement.tsx
similarity index 94%
rename from src/components/dashboard/elements/SectionTitleLinkElement.tsx
rename to src/elements/SectionTitleLinkElement.tsx
index 89755dc29..a3ef6bb8a 100644
--- a/src/components/dashboard/elements/SectionTitleLinkElement.tsx
+++ b/src/elements/SectionTitleLinkElement.tsx
@@ -1,5 +1,5 @@
 import React, { FunctionComponent } from 'react';
-import globalize from '../../../scripts/globalize';
+import globalize from '../scripts/globalize';
 
 const createLinkElement = ({ className, title, href }: { className?: string, title?: string, href?: string }) => ({
     __html: `<a
diff --git a/src/components/dashboard/elements/SelectElement.tsx b/src/elements/SelectElement.tsx
similarity index 95%
rename from src/components/dashboard/elements/SelectElement.tsx
rename to src/elements/SelectElement.tsx
index bcabc3583..89735952b 100644
--- a/src/components/dashboard/elements/SelectElement.tsx
+++ b/src/elements/SelectElement.tsx
@@ -1,5 +1,5 @@
 import React, { FunctionComponent } from 'react';
-import globalize from '../../../scripts/globalize';
+import globalize from '../scripts/globalize';
 
 const createSelectElement = ({ name, id, required, label, option }: { name?: string, id?: string, required?: string, label?: string, option?: React.ReactNode }) => ({
     __html: `<select
diff --git a/src/routes/NewUserPage.tsx b/src/routes/NewUserPage.tsx
index 55e8ed3ec..95cba0b4c 100644
--- a/src/routes/NewUserPage.tsx
+++ b/src/routes/NewUserPage.tsx
@@ -4,11 +4,11 @@ import Dashboard from '../utils/dashboard';
 import globalize from '../scripts/globalize';
 import loading from '../components/loading/loading';
 import toast from '../components/toast/toast';
-import SectionTitleContainer from '../components/dashboard/elements/SectionTitleContainer';
-import InputElement from '../components/dashboard/elements/InputElement';
-import ButtonElement from '../components/dashboard/elements/ButtonElement';
+import SectionTitleContainer from '../elements/SectionTitleContainer';
+import InputElement from '../elements/InputElement';
+import ButtonElement from '../elements/ButtonElement';
 import AccessContainer from '../components/dashboard/users/AccessContainer';
-import CheckBoxElement from '../components/dashboard/elements/CheckBoxElement';
+import CheckBoxElement from '../elements/CheckBoxElement';
 import Page from '../components/Page';
 
 type userInput = {
diff --git a/src/routes/UserEditPage.tsx b/src/routes/UserEditPage.tsx
index a88a4d10c..618a74b42 100644
--- a/src/routes/UserEditPage.tsx
+++ b/src/routes/UserEditPage.tsx
@@ -3,17 +3,17 @@ import React, { FunctionComponent, useCallback, useEffect, useState, useRef } fr
 import Dashboard from '../utils/dashboard';
 import globalize from '../scripts/globalize';
 import LibraryMenu from '../scripts/libraryMenu';
-import ButtonElement from '../components/dashboard/elements/ButtonElement';
-import CheckBoxElement from '../components/dashboard/elements/CheckBoxElement';
-import InputElement from '../components/dashboard/elements/InputElement';
+import ButtonElement from '../elements/ButtonElement';
+import CheckBoxElement from '../elements/CheckBoxElement';
+import InputElement from '../elements/InputElement';
 import LinkEditUserPreferences from '../components/dashboard/users/LinkEditUserPreferences';
-import SectionTitleContainer from '../components/dashboard/elements/SectionTitleContainer';
+import SectionTitleContainer from '../elements/SectionTitleContainer';
 import SectionTabs from '../components/dashboard/users/SectionTabs';
 import loading from '../components/loading/loading';
 import toast from '../components/toast/toast';
 import { getParameterByName } from '../utils/url';
 import escapeHTML from 'escape-html';
-import SelectElement from '../components/dashboard/elements/SelectElement';
+import SelectElement from '../elements/SelectElement';
 import Page from '../components/Page';
 
 type ItemsArr = {
diff --git a/src/routes/UserLibraryAccessPage.tsx b/src/routes/UserLibraryAccessPage.tsx
index 7cb645783..80fdedbd7 100644
--- a/src/routes/UserLibraryAccessPage.tsx
+++ b/src/routes/UserLibraryAccessPage.tsx
@@ -6,11 +6,11 @@ import libraryMenu from '../scripts/libraryMenu';
 import globalize from '../scripts/globalize';
 import toast from '../components/toast/toast';
 import SectionTabs from '../components/dashboard/users/SectionTabs';
-import ButtonElement from '../components/dashboard/elements/ButtonElement';
+import ButtonElement from '../elements/ButtonElement';
 import { getParameterByName } from '../utils/url';
-import SectionTitleContainer from '../components/dashboard/elements/SectionTitleContainer';
+import SectionTitleContainer from '../elements/SectionTitleContainer';
 import AccessContainer from '../components/dashboard/users/AccessContainer';
-import CheckBoxElement from '../components/dashboard/elements/CheckBoxElement';
+import CheckBoxElement from '../elements/CheckBoxElement';
 import Page from '../components/Page';
 
 type ItemsArr = {
diff --git a/src/routes/UserParentalControl.tsx b/src/routes/UserParentalControl.tsx
index 85cef59ef..a4bc24e28 100644
--- a/src/routes/UserParentalControl.tsx
+++ b/src/routes/UserParentalControl.tsx
@@ -4,15 +4,15 @@ import globalize from '../scripts/globalize';
 import LibraryMenu from '../scripts/libraryMenu';
 import AccessScheduleList from '../components/dashboard/users/AccessScheduleList';
 import BlockedTagList from '../components/dashboard/users/BlockedTagList';
-import ButtonElement from '../components/dashboard/elements/ButtonElement';
-import SectionTitleContainer from '../components/dashboard/elements/SectionTitleContainer';
+import ButtonElement from '../elements/ButtonElement';
+import SectionTitleContainer from '../elements/SectionTitleContainer';
 import SectionTabs from '../components/dashboard/users/SectionTabs';
 import loading from '../components/loading/loading';
 import toast from '../components/toast/toast';
 import { getParameterByName } from '../utils/url';
-import CheckBoxElement from '../components/dashboard/elements/CheckBoxElement';
+import CheckBoxElement from '../elements/CheckBoxElement';
 import escapeHTML from 'escape-html';
-import SelectElement from '../components/dashboard/elements/SelectElement';
+import SelectElement from '../elements/SelectElement';
 import Page from '../components/Page';
 
 type RatingsArr = {
diff --git a/src/routes/UserPasswordPage.tsx b/src/routes/UserPasswordPage.tsx
index 83298b80d..576f28ffd 100644
--- a/src/routes/UserPasswordPage.tsx
+++ b/src/routes/UserPasswordPage.tsx
@@ -2,7 +2,7 @@ import React, { FunctionComponent, useCallback, useEffect, useState } from 'reac
 import SectionTabs from '../components/dashboard/users/SectionTabs';
 import UserPasswordForm from '../components/dashboard/users/UserPasswordForm';
 import { getParameterByName } from '../utils/url';
-import SectionTitleContainer from '../components/dashboard/elements/SectionTitleContainer';
+import SectionTitleContainer from '../elements/SectionTitleContainer';
 import Page from '../components/Page';
 import loading from '../components/loading/loading';
 
diff --git a/src/routes/UserProfilePage.tsx b/src/routes/UserProfilePage.tsx
index cebcb460c..14dfec22a 100644
--- a/src/routes/UserProfilePage.tsx
+++ b/src/routes/UserProfilePage.tsx
@@ -6,7 +6,7 @@ import globalize from '../scripts/globalize';
 import LibraryMenu from '../scripts/libraryMenu';
 import { appHost } from '../components/apphost';
 import confirm from '../components/confirm/confirm';
-import ButtonElement from '../components/dashboard/elements/ButtonElement';
+import ButtonElement from '../elements/ButtonElement';
 import UserPasswordForm from '../components/dashboard/users/UserPasswordForm';
 import loading from '../components/loading/loading';
 import toast from '../components/toast/toast';
diff --git a/src/routes/UserProfilesPage.tsx b/src/routes/UserProfilesPage.tsx
index 6fad23157..5f293f526 100644
--- a/src/routes/UserProfilesPage.tsx
+++ b/src/routes/UserProfilesPage.tsx
@@ -6,7 +6,7 @@ import loading from '../components/loading/loading';
 import dom from '../scripts/dom';
 import confirm from '../components/confirm/confirm';
 import UserCardBox from '../components/dashboard/users/UserCardBox';
-import SectionTitleContainer from '../components/dashboard/elements/SectionTitleContainer';
+import SectionTitleContainer from '../elements/SectionTitleContainer';
 import '../elements/emby-button/emby-button';
 import '../elements/emby-button/paper-icon-button-light';
 import '../components/cardbuilder/card.scss';