diff --git a/rsconcept/frontend/src/app/ErrorFallback.tsx b/rsconcept/frontend/src/app/ErrorFallback.tsx
index 48e6cd6d..04188fb5 100644
--- a/rsconcept/frontend/src/app/ErrorFallback.tsx
+++ b/rsconcept/frontend/src/app/ErrorFallback.tsx
@@ -1,7 +1,7 @@
 import { type FallbackProps } from 'react-error-boundary';
 
-import Button from '../components/Common/Button';
 import InfoError from '../components/InfoError';
+import Button from '../components/ui/Button';
 
 function ErrorFallback({ error, resetErrorBoundary }: FallbackProps) {
   return (
diff --git a/rsconcept/frontend/src/app/Footer.tsx b/rsconcept/frontend/src/app/Footer.tsx
index e04159f8..bbc1c9c5 100644
--- a/rsconcept/frontend/src/app/Footer.tsx
+++ b/rsconcept/frontend/src/app/Footer.tsx
@@ -3,7 +3,7 @@ import clsx from 'clsx';
 import { useConceptTheme } from '@/context/ThemeContext';
 import { urls } from '@/utils/constants';
 
-import TextURL from '../components/Common/TextURL';
+import TextURL from '../components/ui/TextURL';
 
 function Footer() {
   const { noNavigation, noFooter } = useConceptTheme();
diff --git a/rsconcept/frontend/src/app/Navigation/UserDropdown.tsx b/rsconcept/frontend/src/app/Navigation/UserDropdown.tsx
index 0d99b482..5970ac41 100644
--- a/rsconcept/frontend/src/app/Navigation/UserDropdown.tsx
+++ b/rsconcept/frontend/src/app/Navigation/UserDropdown.tsx
@@ -1,5 +1,5 @@
-import Dropdown from '@/components/Common/Dropdown';
-import DropdownButton from '@/components/Common/DropdownButton';
+import Dropdown from '@/components/ui/Dropdown';
+import DropdownButton from '@/components/ui/DropdownButton';
 import { useAuth } from '@/context/AuthContext';
 import { useConceptNavigation } from '@/context/NavigationContext';
 import { useConceptTheme } from '@/context/ThemeContext';
diff --git a/rsconcept/frontend/src/components/Shared/ConstituentaBadge.tsx b/rsconcept/frontend/src/components/ConstituentaBadge.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Shared/ConstituentaBadge.tsx
rename to rsconcept/frontend/src/components/ConstituentaBadge.tsx
diff --git a/rsconcept/frontend/src/components/Shared/ConstituentaPicker.tsx b/rsconcept/frontend/src/components/ConstituentaPicker.tsx
similarity index 98%
rename from rsconcept/frontend/src/components/Shared/ConstituentaPicker.tsx
rename to rsconcept/frontend/src/components/ConstituentaPicker.tsx
index 55149400..4d4421a1 100644
--- a/rsconcept/frontend/src/components/Shared/ConstituentaPicker.tsx
+++ b/rsconcept/frontend/src/components/ConstituentaPicker.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useMemo, useState } from 'react';
 
-import SearchBar from '@/components/Common/SearchBar';
 import DataTable, { createColumnHelper, IConditionalStyle } from '@/components/DataTable';
+import SearchBar from '@/components/ui/SearchBar';
 import { useConceptTheme } from '@/context/ThemeContext';
 import { CstMatchMode } from '@/models/miscellaneous';
 import { IConstituenta } from '@/models/rsform';
diff --git a/rsconcept/frontend/src/components/DataTable/SelectAll.tsx b/rsconcept/frontend/src/components/DataTable/SelectAll.tsx
index 4d679b61..5d72bc50 100644
--- a/rsconcept/frontend/src/components/DataTable/SelectAll.tsx
+++ b/rsconcept/frontend/src/components/DataTable/SelectAll.tsx
@@ -1,6 +1,6 @@
 import { Table } from '@tanstack/react-table';
 
-import CheckboxTristate from '@/components/Common/CheckboxTristate';
+import CheckboxTristate from '@/components/ui/CheckboxTristate';
 
 interface SelectAllProps<TData> {
   table: Table<TData>;
diff --git a/rsconcept/frontend/src/components/DataTable/SelectRow.tsx b/rsconcept/frontend/src/components/DataTable/SelectRow.tsx
index f46a2c50..ee66ef8e 100644
--- a/rsconcept/frontend/src/components/DataTable/SelectRow.tsx
+++ b/rsconcept/frontend/src/components/DataTable/SelectRow.tsx
@@ -1,6 +1,6 @@
 import { Row } from '@tanstack/react-table';
 
-import Checkbox from '@/components/Common/Checkbox';
+import Checkbox from '@/components/ui/Checkbox';
 
 interface SelectRowProps<TData> {
   row: Row<TData>;
diff --git a/rsconcept/frontend/src/components/ExpectedAnonymous.tsx b/rsconcept/frontend/src/components/ExpectedAnonymous.tsx
index e4c58d12..4d9f1e54 100644
--- a/rsconcept/frontend/src/components/ExpectedAnonymous.tsx
+++ b/rsconcept/frontend/src/components/ExpectedAnonymous.tsx
@@ -1,7 +1,7 @@
 import { useAuth } from '@/context/AuthContext';
 import { useConceptNavigation } from '@/context/NavigationContext';
 
-import TextURL from './Common/TextURL';
+import TextURL from './ui/TextURL';
 
 function ExpectedAnonymous() {
   const { user, logout } = useAuth();
diff --git a/rsconcept/frontend/src/components/Shared/GrammemeBadge.tsx b/rsconcept/frontend/src/components/GrammemeBadge.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Shared/GrammemeBadge.tsx
rename to rsconcept/frontend/src/components/GrammemeBadge.tsx
diff --git a/rsconcept/frontend/src/components/Help/ConstituentaTooltip.tsx b/rsconcept/frontend/src/components/Help/ConstituentaTooltip.tsx
index ff48281c..3a7c1327 100644
--- a/rsconcept/frontend/src/components/Help/ConstituentaTooltip.tsx
+++ b/rsconcept/frontend/src/components/Help/ConstituentaTooltip.tsx
@@ -1,5 +1,5 @@
-import Tooltip from '@/components/Common/Tooltip';
-import InfoConstituenta from '@/components/Shared/InfoConstituenta';
+import InfoConstituenta from '@/components/InfoConstituenta';
+import Tooltip from '@/components/ui/Tooltip';
 import { IConstituenta } from '@/models/rsform';
 
 interface ConstituentaTooltipProps {
diff --git a/rsconcept/frontend/src/components/Help/HelpAPI.tsx b/rsconcept/frontend/src/components/Help/HelpAPI.tsx
index 4dfcdf7f..1c7e6740 100644
--- a/rsconcept/frontend/src/components/Help/HelpAPI.tsx
+++ b/rsconcept/frontend/src/components/Help/HelpAPI.tsx
@@ -1,4 +1,4 @@
-import TextURL from '@/components/Common/TextURL';
+import TextURL from '@/components/ui/TextURL';
 import { urls } from '@/utils/constants';
 
 function HelpAPI() {
diff --git a/rsconcept/frontend/src/components/Help/HelpButton.tsx b/rsconcept/frontend/src/components/Help/HelpButton.tsx
index 3fdfe026..55cdc7e5 100644
--- a/rsconcept/frontend/src/components/Help/HelpButton.tsx
+++ b/rsconcept/frontend/src/components/Help/HelpButton.tsx
@@ -1,7 +1,7 @@
 import { BiInfoCircle } from 'react-icons/bi';
 
-import TextURL from '@/components/Common/TextURL';
-import Tooltip from '@/components/Common/Tooltip';
+import TextURL from '@/components/ui/TextURL';
+import Tooltip from '@/components/ui/Tooltip';
 import { HelpTopic } from '@/models/miscellaneous';
 
 import { CProps } from '../props';
diff --git a/rsconcept/frontend/src/components/Help/HelpConstituenta.tsx b/rsconcept/frontend/src/components/Help/HelpConstituenta.tsx
index 6a187afd..44ee348a 100644
--- a/rsconcept/frontend/src/components/Help/HelpConstituenta.tsx
+++ b/rsconcept/frontend/src/components/Help/HelpConstituenta.tsx
@@ -1,5 +1,5 @@
-import Divider from '@/components/Common/Divider';
-import InfoCstStatus from '@/components/Shared/InfoCstStatus';
+import InfoCstStatus from '@/components/InfoCstStatus';
+import Divider from '@/components/ui/Divider';
 
 function HelpConstituenta() {
   // prettier-ignore
diff --git a/rsconcept/frontend/src/components/Help/HelpExteor.tsx b/rsconcept/frontend/src/components/Help/HelpExteor.tsx
index f993c7d0..4ea218b0 100644
--- a/rsconcept/frontend/src/components/Help/HelpExteor.tsx
+++ b/rsconcept/frontend/src/components/Help/HelpExteor.tsx
@@ -1,4 +1,4 @@
-import TextURL from '@/components/Common/TextURL';
+import TextURL from '@/components/ui/TextURL';
 import { urls } from '@/utils/constants';
 
 function HelpExteor() {
diff --git a/rsconcept/frontend/src/components/Help/HelpMain.tsx b/rsconcept/frontend/src/components/Help/HelpMain.tsx
index 49754311..9a13b282 100644
--- a/rsconcept/frontend/src/components/Help/HelpMain.tsx
+++ b/rsconcept/frontend/src/components/Help/HelpMain.tsx
@@ -1,4 +1,4 @@
-import TextURL from '@/components/Common/TextURL';
+import TextURL from '@/components/ui/TextURL';
 import { urls } from '@/utils/constants';
 
 function HelpMain() {
diff --git a/rsconcept/frontend/src/components/Help/HelpRSFormItems.tsx b/rsconcept/frontend/src/components/Help/HelpRSFormItems.tsx
index 80d32f7f..14a6ddde 100644
--- a/rsconcept/frontend/src/components/Help/HelpRSFormItems.tsx
+++ b/rsconcept/frontend/src/components/Help/HelpRSFormItems.tsx
@@ -1,5 +1,5 @@
-import Divider from '@/components/Common/Divider';
-import InfoCstStatus from '@/components/Shared/InfoCstStatus';
+import InfoCstStatus from '@/components/InfoCstStatus';
+import Divider from '@/components/ui/Divider';
 
 function HelpRSFormItems() {
   // prettier-ignore
diff --git a/rsconcept/frontend/src/components/Help/HelpRSLang.tsx b/rsconcept/frontend/src/components/Help/HelpRSLang.tsx
index 30015ff9..dfa1f1f2 100644
--- a/rsconcept/frontend/src/components/Help/HelpRSLang.tsx
+++ b/rsconcept/frontend/src/components/Help/HelpRSLang.tsx
@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
 
-import EmbedYoutube from '@/components/Common/EmbedYoutube';
+import EmbedYoutube from '@/components/ui/EmbedYoutube';
 import useWindowSize from '@/hooks/useWindowSize';
 import { urls, youtube } from '@/utils/constants';
 
diff --git a/rsconcept/frontend/src/components/Help/HelpTermGraph.tsx b/rsconcept/frontend/src/components/Help/HelpTermGraph.tsx
index 9f694971..1c62d7b2 100644
--- a/rsconcept/frontend/src/components/Help/HelpTermGraph.tsx
+++ b/rsconcept/frontend/src/components/Help/HelpTermGraph.tsx
@@ -1,6 +1,6 @@
-import Divider from '@/components/Common/Divider';
-import InfoCstClass from '@/components/Shared/InfoCstClass';
-import InfoCstStatus from '@/components/Shared/InfoCstStatus';
+import InfoCstClass from '@/components/InfoCstClass';
+import InfoCstStatus from '@/components/InfoCstStatus';
+import Divider from '@/components/ui/Divider';
 
 function HelpTermGraph() {
   // prettier-ignore
diff --git a/rsconcept/frontend/src/components/Shared/InfoConstituenta.tsx b/rsconcept/frontend/src/components/InfoConstituenta.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Shared/InfoConstituenta.tsx
rename to rsconcept/frontend/src/components/InfoConstituenta.tsx
diff --git a/rsconcept/frontend/src/components/Shared/InfoCstClass.tsx b/rsconcept/frontend/src/components/InfoCstClass.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Shared/InfoCstClass.tsx
rename to rsconcept/frontend/src/components/InfoCstClass.tsx
diff --git a/rsconcept/frontend/src/components/Shared/InfoCstStatus.tsx b/rsconcept/frontend/src/components/InfoCstStatus.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Shared/InfoCstStatus.tsx
rename to rsconcept/frontend/src/components/InfoCstStatus.tsx
diff --git a/rsconcept/frontend/src/components/InfoError.tsx b/rsconcept/frontend/src/components/InfoError.tsx
index a9de87de..28579623 100644
--- a/rsconcept/frontend/src/components/InfoError.tsx
+++ b/rsconcept/frontend/src/components/InfoError.tsx
@@ -2,7 +2,7 @@ import axios, { type AxiosError } from 'axios';
 
 import { isResponseHtml } from '@/utils/utils';
 
-import PrettyJson from './Common/PrettyJSON';
+import PrettyJson from './ui/PrettyJSON';
 
 export type ErrorData = string | Error | AxiosError | undefined;
 
diff --git a/rsconcept/frontend/src/components/Shared/InfoLibraryItem.tsx b/rsconcept/frontend/src/components/InfoLibraryItem.tsx
similarity index 94%
rename from rsconcept/frontend/src/components/Shared/InfoLibraryItem.tsx
rename to rsconcept/frontend/src/components/InfoLibraryItem.tsx
index dde0a5fd..1e8f45a6 100644
--- a/rsconcept/frontend/src/components/Shared/InfoLibraryItem.tsx
+++ b/rsconcept/frontend/src/components/InfoLibraryItem.tsx
@@ -3,7 +3,7 @@ import { useIntl } from 'react-intl';
 import { useUsers } from '@/context/UsersContext';
 import { ILibraryItemEx } from '@/models/library';
 
-import LabeledValue from '../Common/LabeledValue';
+import LabeledValue from './ui/LabeledValue';
 
 interface InfoLibraryItemProps {
   item?: ILibraryItemEx;
diff --git a/rsconcept/frontend/src/components/PDFViewer/PDFViewer.tsx b/rsconcept/frontend/src/components/PDFViewer/PDFViewer.tsx
index dd4cb6ef..7838c5e3 100644
--- a/rsconcept/frontend/src/components/PDFViewer/PDFViewer.tsx
+++ b/rsconcept/frontend/src/components/PDFViewer/PDFViewer.tsx
@@ -7,7 +7,7 @@ import { Document, Page } from 'react-pdf';
 import useWindowSize from '@/hooks/useWindowSize';
 import { graphLightT } from '@/utils/color';
 
-import Overlay from '../Common/Overlay';
+import Overlay from '../ui/Overlay';
 import PageControls from './PageControls';
 
 const MAXIMUM_WIDTH = 1000;
diff --git a/rsconcept/frontend/src/components/RSInput/RSInput.tsx b/rsconcept/frontend/src/components/RSInput/RSInput.tsx
index 8c77f5af..3a139f3b 100644
--- a/rsconcept/frontend/src/components/RSInput/RSInput.tsx
+++ b/rsconcept/frontend/src/components/RSInput/RSInput.tsx
@@ -8,7 +8,7 @@ import clsx from 'clsx';
 import { EditorView } from 'codemirror';
 import { forwardRef, useCallback, useMemo, useRef } from 'react';
 
-import Label from '@/components/Common/Label';
+import Label from '@/components/ui/Label';
 import { useRSForm } from '@/context/RSFormContext';
 import { useConceptTheme } from '@/context/ThemeContext';
 
diff --git a/rsconcept/frontend/src/components/RefsInput/RefsInput.tsx b/rsconcept/frontend/src/components/RefsInput/RefsInput.tsx
index 670f95a1..4bce66f1 100644
--- a/rsconcept/frontend/src/components/RefsInput/RefsInput.tsx
+++ b/rsconcept/frontend/src/components/RefsInput/RefsInput.tsx
@@ -9,7 +9,7 @@ import { EditorView } from 'codemirror';
 import { AnimatePresence } from 'framer-motion';
 import { forwardRef, useCallback, useMemo, useRef, useState } from 'react';
 
-import Label from '@/components/Common/Label';
+import Label from '@/components/ui/Label';
 import { useRSForm } from '@/context/RSFormContext';
 import { useConceptTheme } from '@/context/ThemeContext';
 import DlgEditReference from '@/dialogs/DlgEditReference';
diff --git a/rsconcept/frontend/src/components/RequireAuth.tsx b/rsconcept/frontend/src/components/RequireAuth.tsx
index 1e5136b4..f7923549 100644
--- a/rsconcept/frontend/src/components/RequireAuth.tsx
+++ b/rsconcept/frontend/src/components/RequireAuth.tsx
@@ -2,7 +2,7 @@
 
 import { useAuth } from '@/context/AuthContext';
 
-import TextURL from './Common/TextURL';
+import TextURL from './ui/TextURL';
 
 interface RequireAuthProps {
   children: React.ReactNode;
diff --git a/rsconcept/frontend/src/components/Shared/SelectGrammeme.tsx b/rsconcept/frontend/src/components/SelectGrammeme.tsx
similarity index 93%
rename from rsconcept/frontend/src/components/Shared/SelectGrammeme.tsx
rename to rsconcept/frontend/src/components/SelectGrammeme.tsx
index 18956c37..b40295f6 100644
--- a/rsconcept/frontend/src/components/Shared/SelectGrammeme.tsx
+++ b/rsconcept/frontend/src/components/SelectGrammeme.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 
-import SelectMulti, { SelectMultiProps } from '@/components/Common/SelectMulti';
+import SelectMulti, { SelectMultiProps } from '@/components/ui/SelectMulti';
 import { Grammeme } from '@/models/language';
 import { getCompatibleGrams } from '@/models/languageAPI';
 import { compareGrammemeOptions, IGrammemeOption, SelectorGrammemes } from '@/utils/selectors';
diff --git a/rsconcept/frontend/src/components/Shared/SelectedCounter.tsx b/rsconcept/frontend/src/components/SelectedCounter.tsx
similarity index 90%
rename from rsconcept/frontend/src/components/Shared/SelectedCounter.tsx
rename to rsconcept/frontend/src/components/SelectedCounter.tsx
index bad1e4f0..8ba9d0f5 100644
--- a/rsconcept/frontend/src/components/Shared/SelectedCounter.tsx
+++ b/rsconcept/frontend/src/components/SelectedCounter.tsx
@@ -1,4 +1,4 @@
-import Overlay from '@/components/Common/Overlay';
+import Overlay from '@/components/ui/Overlay';
 
 interface SelectedCounterProps {
   total: number;
diff --git a/rsconcept/frontend/src/components/Shared/WordFormBadge.tsx b/rsconcept/frontend/src/components/WordFormBadge.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Shared/WordFormBadge.tsx
rename to rsconcept/frontend/src/components/WordFormBadge.tsx
diff --git a/rsconcept/frontend/src/components/Common/Button.tsx b/rsconcept/frontend/src/components/ui/Button.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Common/Button.tsx
rename to rsconcept/frontend/src/components/ui/Button.tsx
diff --git a/rsconcept/frontend/src/components/Common/Checkbox.tsx b/rsconcept/frontend/src/components/ui/Checkbox.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Common/Checkbox.tsx
rename to rsconcept/frontend/src/components/ui/Checkbox.tsx
diff --git a/rsconcept/frontend/src/components/Common/CheckboxTristate.tsx b/rsconcept/frontend/src/components/ui/CheckboxTristate.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Common/CheckboxTristate.tsx
rename to rsconcept/frontend/src/components/ui/CheckboxTristate.tsx
diff --git a/rsconcept/frontend/src/components/Common/Divider.tsx b/rsconcept/frontend/src/components/ui/Divider.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Common/Divider.tsx
rename to rsconcept/frontend/src/components/ui/Divider.tsx
diff --git a/rsconcept/frontend/src/components/Common/Dropdown.tsx b/rsconcept/frontend/src/components/ui/Dropdown.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Common/Dropdown.tsx
rename to rsconcept/frontend/src/components/ui/Dropdown.tsx
diff --git a/rsconcept/frontend/src/components/Common/DropdownButton.tsx b/rsconcept/frontend/src/components/ui/DropdownButton.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Common/DropdownButton.tsx
rename to rsconcept/frontend/src/components/ui/DropdownButton.tsx
diff --git a/rsconcept/frontend/src/components/Common/DropdownCheckbox.tsx b/rsconcept/frontend/src/components/ui/DropdownCheckbox.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Common/DropdownCheckbox.tsx
rename to rsconcept/frontend/src/components/ui/DropdownCheckbox.tsx
diff --git a/rsconcept/frontend/src/components/Common/EmbedYoutube.tsx b/rsconcept/frontend/src/components/ui/EmbedYoutube.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Common/EmbedYoutube.tsx
rename to rsconcept/frontend/src/components/ui/EmbedYoutube.tsx
diff --git a/rsconcept/frontend/src/components/Common/FileInput.tsx b/rsconcept/frontend/src/components/ui/FileInput.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Common/FileInput.tsx
rename to rsconcept/frontend/src/components/ui/FileInput.tsx
diff --git a/rsconcept/frontend/src/components/Common/FlexColumn.tsx b/rsconcept/frontend/src/components/ui/FlexColumn.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Common/FlexColumn.tsx
rename to rsconcept/frontend/src/components/ui/FlexColumn.tsx
diff --git a/rsconcept/frontend/src/components/Common/Label.tsx b/rsconcept/frontend/src/components/ui/Label.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Common/Label.tsx
rename to rsconcept/frontend/src/components/ui/Label.tsx
diff --git a/rsconcept/frontend/src/components/Common/LabeledValue.tsx b/rsconcept/frontend/src/components/ui/LabeledValue.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Common/LabeledValue.tsx
rename to rsconcept/frontend/src/components/ui/LabeledValue.tsx
diff --git a/rsconcept/frontend/src/components/Common/Loader.tsx b/rsconcept/frontend/src/components/ui/Loader.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Common/Loader.tsx
rename to rsconcept/frontend/src/components/ui/Loader.tsx
diff --git a/rsconcept/frontend/src/components/Common/MiniButton.tsx b/rsconcept/frontend/src/components/ui/MiniButton.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Common/MiniButton.tsx
rename to rsconcept/frontend/src/components/ui/MiniButton.tsx
diff --git a/rsconcept/frontend/src/components/Common/Modal.tsx b/rsconcept/frontend/src/components/ui/Modal.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Common/Modal.tsx
rename to rsconcept/frontend/src/components/ui/Modal.tsx
diff --git a/rsconcept/frontend/src/components/Common/Overlay.tsx b/rsconcept/frontend/src/components/ui/Overlay.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Common/Overlay.tsx
rename to rsconcept/frontend/src/components/ui/Overlay.tsx
diff --git a/rsconcept/frontend/src/components/Common/PrettyJSON.tsx b/rsconcept/frontend/src/components/ui/PrettyJSON.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Common/PrettyJSON.tsx
rename to rsconcept/frontend/src/components/ui/PrettyJSON.tsx
diff --git a/rsconcept/frontend/src/components/Common/SearchBar.tsx b/rsconcept/frontend/src/components/ui/SearchBar.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Common/SearchBar.tsx
rename to rsconcept/frontend/src/components/ui/SearchBar.tsx
diff --git a/rsconcept/frontend/src/components/Common/SelectMulti.tsx b/rsconcept/frontend/src/components/ui/SelectMulti.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Common/SelectMulti.tsx
rename to rsconcept/frontend/src/components/ui/SelectMulti.tsx
diff --git a/rsconcept/frontend/src/components/Common/SelectSingle.tsx b/rsconcept/frontend/src/components/ui/SelectSingle.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Common/SelectSingle.tsx
rename to rsconcept/frontend/src/components/ui/SelectSingle.tsx
diff --git a/rsconcept/frontend/src/components/Common/SelectorButton.tsx b/rsconcept/frontend/src/components/ui/SelectorButton.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Common/SelectorButton.tsx
rename to rsconcept/frontend/src/components/ui/SelectorButton.tsx
diff --git a/rsconcept/frontend/src/components/Common/SubmitButton.tsx b/rsconcept/frontend/src/components/ui/SubmitButton.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Common/SubmitButton.tsx
rename to rsconcept/frontend/src/components/ui/SubmitButton.tsx
diff --git a/rsconcept/frontend/src/components/Common/TabLabel.tsx b/rsconcept/frontend/src/components/ui/TabLabel.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Common/TabLabel.tsx
rename to rsconcept/frontend/src/components/ui/TabLabel.tsx
diff --git a/rsconcept/frontend/src/components/Common/TextArea.tsx b/rsconcept/frontend/src/components/ui/TextArea.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Common/TextArea.tsx
rename to rsconcept/frontend/src/components/ui/TextArea.tsx
diff --git a/rsconcept/frontend/src/components/Common/TextInput.tsx b/rsconcept/frontend/src/components/ui/TextInput.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Common/TextInput.tsx
rename to rsconcept/frontend/src/components/ui/TextInput.tsx
diff --git a/rsconcept/frontend/src/components/Common/TextURL.tsx b/rsconcept/frontend/src/components/ui/TextURL.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Common/TextURL.tsx
rename to rsconcept/frontend/src/components/ui/TextURL.tsx
diff --git a/rsconcept/frontend/src/components/Common/Tooltip.tsx b/rsconcept/frontend/src/components/ui/Tooltip.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/Common/Tooltip.tsx
rename to rsconcept/frontend/src/components/ui/Tooltip.tsx
diff --git a/rsconcept/frontend/src/context/ThemeContext.tsx b/rsconcept/frontend/src/context/ThemeContext.tsx
index b8c216cd..d9667b67 100644
--- a/rsconcept/frontend/src/context/ThemeContext.tsx
+++ b/rsconcept/frontend/src/context/ThemeContext.tsx
@@ -3,7 +3,7 @@
 import clsx from 'clsx';
 import { createContext, useCallback, useContext, useLayoutEffect, useMemo, useState } from 'react';
 
-import Tooltip from '@/components/Common/Tooltip';
+import Tooltip from '@/components/ui/Tooltip';
 import useLocalStorage from '@/hooks/useLocalStorage';
 import { animationDuration } from '@/utils/animations';
 import { darkT, IColorTheme, lightT } from '@/utils/color';
diff --git a/rsconcept/frontend/src/dialogs/DlgCloneLibraryItem.tsx b/rsconcept/frontend/src/dialogs/DlgCloneLibraryItem.tsx
index f850c754..db116d18 100644
--- a/rsconcept/frontend/src/dialogs/DlgCloneLibraryItem.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgCloneLibraryItem.tsx
@@ -4,10 +4,10 @@ import clsx from 'clsx';
 import { useEffect, useMemo, useState } from 'react';
 import { toast } from 'react-toastify';
 
-import Checkbox from '@/components/Common/Checkbox';
-import Modal, { ModalProps } from '@/components/Common/Modal';
-import TextArea from '@/components/Common/TextArea';
-import TextInput from '@/components/Common/TextInput';
+import Checkbox from '@/components/ui/Checkbox';
+import Modal, { ModalProps } from '@/components/ui/Modal';
+import TextArea from '@/components/ui/TextArea';
+import TextInput from '@/components/ui/TextInput';
 import { useLibrary } from '@/context/LibraryContext';
 import { useConceptNavigation } from '@/context/NavigationContext';
 import { ILibraryItem } from '@/models/library';
diff --git a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx
index e575b80a..56b997d7 100644
--- a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx
@@ -5,10 +5,10 @@ import clsx from 'clsx';
 import { Dispatch, useCallback, useEffect, useMemo, useState } from 'react';
 import { BiCheck, BiRefresh, BiX } from 'react-icons/bi';
 
-import MiniButton from '@/components/Common/MiniButton';
+import ConstituentaPicker from '@/components/ConstituentaPicker';
 import DataTable, { IConditionalStyle } from '@/components/DataTable';
 import RSInput from '@/components/RSInput';
-import ConstituentaPicker from '@/components/Shared/ConstituentaPicker';
+import MiniButton from '@/components/ui/MiniButton';
 import { useConceptTheme } from '@/context/ThemeContext';
 import { IConstituenta, IRSForm } from '@/models/rsform';
 import { IArgumentValue } from '@/models/rslang';
diff --git a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ConstituentaTab.tsx b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ConstituentaTab.tsx
index d2155ab0..6023be60 100644
--- a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ConstituentaTab.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ConstituentaTab.tsx
@@ -2,10 +2,10 @@
 
 import { Dispatch } from 'react';
 
-import SelectSingle from '@/components/Common/SelectSingle';
-import TextArea from '@/components/Common/TextArea';
-import TextInput from '@/components/Common/TextInput';
 import RSInput from '@/components/RSInput';
+import SelectSingle from '@/components/ui/SelectSingle';
+import TextArea from '@/components/ui/TextArea';
+import TextInput from '@/components/ui/TextInput';
 import { CstType, ICstCreateData } from '@/models/rsform';
 import { labelCstType } from '@/utils/labels';
 import { SelectorCstType } from '@/utils/selectors';
diff --git a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx
index 16a7f0c2..b0213b8f 100644
--- a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx
@@ -4,10 +4,10 @@ import clsx from 'clsx';
 import { useLayoutEffect, useState } from 'react';
 import { TabList, TabPanel, Tabs } from 'react-tabs';
 
-import Modal, { ModalProps } from '@/components/Common/Modal';
-import Overlay from '@/components/Common/Overlay';
-import TabLabel from '@/components/Common/TabLabel';
 import HelpButton from '@/components/Help/HelpButton';
+import Modal, { ModalProps } from '@/components/ui/Modal';
+import Overlay from '@/components/ui/Overlay';
+import TabLabel from '@/components/ui/TabLabel';
 import usePartialUpdate from '@/hooks/usePartialUpdate';
 import { HelpTopic } from '@/models/miscellaneous';
 import { CstType, ICstCreateData, IRSForm } from '@/models/rsform';
diff --git a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TemplateTab.tsx b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TemplateTab.tsx
index adbd9112..90bd0778 100644
--- a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TemplateTab.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TemplateTab.tsx
@@ -2,10 +2,10 @@
 
 import { Dispatch, useEffect, useMemo, useState } from 'react';
 
-import SelectSingle from '@/components/Common/SelectSingle';
-import TextArea from '@/components/Common/TextArea';
+import ConstituentaPicker from '@/components/ConstituentaPicker';
 import RSInput from '@/components/RSInput';
-import ConstituentaPicker from '@/components/Shared/ConstituentaPicker';
+import SelectSingle from '@/components/ui/SelectSingle';
+import TextArea from '@/components/ui/TextArea';
 import { useLibrary } from '@/context/LibraryContext';
 import { CATEGORY_CST_TYPE, IConstituenta, IRSForm } from '@/models/rsform';
 import { applyFilterCategory } from '@/models/rsformAPI';
diff --git a/rsconcept/frontend/src/dialogs/DlgCreateCst.tsx b/rsconcept/frontend/src/dialogs/DlgCreateCst.tsx
index a92d685b..2a6eab4f 100644
--- a/rsconcept/frontend/src/dialogs/DlgCreateCst.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgCreateCst.tsx
@@ -3,11 +3,11 @@
 import clsx from 'clsx';
 import { useEffect, useLayoutEffect, useState } from 'react';
 
-import Modal, { ModalProps } from '@/components/Common/Modal';
-import SelectSingle from '@/components/Common/SelectSingle';
-import TextArea from '@/components/Common/TextArea';
-import TextInput from '@/components/Common/TextInput';
 import RSInput from '@/components/RSInput';
+import Modal, { ModalProps } from '@/components/ui/Modal';
+import SelectSingle from '@/components/ui/SelectSingle';
+import TextArea from '@/components/ui/TextArea';
+import TextInput from '@/components/ui/TextInput';
 import usePartialUpdate from '@/hooks/usePartialUpdate';
 import { CstType, ICstCreateData, IRSForm } from '@/models/rsform';
 import { generateAlias, validateNewAlias } from '@/models/rsformAPI';
diff --git a/rsconcept/frontend/src/dialogs/DlgDeleteCst/DlgDeleteCst.tsx b/rsconcept/frontend/src/dialogs/DlgDeleteCst/DlgDeleteCst.tsx
index 88726205..c36e08c1 100644
--- a/rsconcept/frontend/src/dialogs/DlgDeleteCst/DlgDeleteCst.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgDeleteCst/DlgDeleteCst.tsx
@@ -3,8 +3,8 @@
 import clsx from 'clsx';
 import { useMemo, useState } from 'react';
 
-import Checkbox from '@/components/Common/Checkbox';
-import Modal, { ModalProps } from '@/components/Common/Modal';
+import Checkbox from '@/components/ui/Checkbox';
+import Modal, { ModalProps } from '@/components/ui/Modal';
 import { IRSForm } from '@/models/rsform';
 import { classnames, prefixes } from '@/utils/constants';
 
diff --git a/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx b/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx
index 063738d2..9197c15c 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx
@@ -4,10 +4,10 @@ import clsx from 'clsx';
 import { useState } from 'react';
 import { TabList, TabPanel, Tabs } from 'react-tabs';
 
-import TabLabel from '@/components/Common/TabLabel';
-import Modal from '@/components/Common/Modal';
-import Overlay from '@/components/Common/Overlay';
 import HelpButton from '@/components/Help/HelpButton';
+import Modal from '@/components/ui/Modal';
+import Overlay from '@/components/ui/Overlay';
+import TabLabel from '@/components/ui/TabLabel';
 import { ReferenceType } from '@/models/language';
 import { HelpTopic } from '@/models/miscellaneous';
 import { IConstituenta } from '@/models/rsform';
diff --git a/rsconcept/frontend/src/dialogs/DlgEditReference/EntityTab.tsx b/rsconcept/frontend/src/dialogs/DlgEditReference/EntityTab.tsx
index 7404f88e..53bb815c 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditReference/EntityTab.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgEditReference/EntityTab.tsx
@@ -2,11 +2,11 @@
 
 import { useEffect, useLayoutEffect, useState } from 'react';
 
-import FlexColumn from '@/components/Common/FlexColumn';
-import Label from '@/components/Common/Label';
-import TextInput from '@/components/Common/TextInput';
-import ConstituentaPicker from '@/components/Shared/ConstituentaPicker';
-import SelectGrammeme from '@/components/Shared/SelectGrammeme';
+import ConstituentaPicker from '@/components/ConstituentaPicker';
+import SelectGrammeme from '@/components/SelectGrammeme';
+import FlexColumn from '@/components/ui/FlexColumn';
+import Label from '@/components/ui/Label';
+import TextInput from '@/components/ui/TextInput';
 import { ReferenceType } from '@/models/language';
 import { parseEntityReference, parseGrammemes } from '@/models/languageAPI';
 import { CstMatchMode } from '@/models/miscellaneous';
diff --git a/rsconcept/frontend/src/dialogs/DlgEditReference/SyntacticTab.tsx b/rsconcept/frontend/src/dialogs/DlgEditReference/SyntacticTab.tsx
index f37c929a..ab7e4472 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditReference/SyntacticTab.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgEditReference/SyntacticTab.tsx
@@ -2,7 +2,7 @@
 
 import { useEffect, useLayoutEffect, useMemo, useState } from 'react';
 
-import TextInput from '@/components/Common/TextInput';
+import TextInput from '@/components/ui/TextInput';
 import { ReferenceType } from '@/models/language';
 import { parseSyntacticReference } from '@/models/languageAPI';
 
diff --git a/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx b/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx
index 9283d64b..16c52b17 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx
@@ -4,13 +4,13 @@ import clsx from 'clsx';
 import { useLayoutEffect, useState } from 'react';
 import { BiCheck, BiChevronsDown, BiLeftArrow, BiRightArrow, BiX } from 'react-icons/bi';
 
-import Label from '@/components/Common/Label';
-import MiniButton from '@/components/Common/MiniButton';
-import Modal from '@/components/Common/Modal';
-import Overlay from '@/components/Common/Overlay';
-import TextArea from '@/components/Common/TextArea';
 import HelpButton from '@/components/Help/HelpButton';
-import SelectGrammeme from '@/components/Shared/SelectGrammeme';
+import SelectGrammeme from '@/components/SelectGrammeme';
+import Label from '@/components/ui/Label';
+import MiniButton from '@/components/ui/MiniButton';
+import Modal from '@/components/ui/Modal';
+import Overlay from '@/components/ui/Overlay';
+import TextArea from '@/components/ui/TextArea';
 import useConceptText from '@/hooks/useConceptText';
 import { Grammeme, ITextRequest, IWordForm, IWordFormPlain } from '@/models/language';
 import { parseGrammemes, wordFormEquals } from '@/models/languageAPI';
diff --git a/rsconcept/frontend/src/dialogs/DlgEditWordForms/WordFormsTable.tsx b/rsconcept/frontend/src/dialogs/DlgEditWordForms/WordFormsTable.tsx
index 3188a7a5..8b0e3114 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditWordForms/WordFormsTable.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgEditWordForms/WordFormsTable.tsx
@@ -4,9 +4,9 @@ import clsx from 'clsx';
 import { useCallback, useMemo } from 'react';
 import { BiX } from 'react-icons/bi';
 
-import MiniButton from '@/components/Common/MiniButton';
+import MiniButton from '@/components/ui/MiniButton';
 import DataTable, { createColumnHelper } from '@/components/DataTable';
-import WordFormBadge from '@/components/Shared/WordFormBadge';
+import WordFormBadge from '@/components/WordFormBadge';
 import { IWordForm } from '@/models/language';
 
 interface WordFormsTableProps {
diff --git a/rsconcept/frontend/src/dialogs/DlgGraphParams.tsx b/rsconcept/frontend/src/dialogs/DlgGraphParams.tsx
index 8508aca0..441a93d1 100644
--- a/rsconcept/frontend/src/dialogs/DlgGraphParams.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgGraphParams.tsx
@@ -1,7 +1,7 @@
 'use client';
 
-import Checkbox from '@/components/Common/Checkbox';
-import Modal, { ModalProps } from '@/components/Common/Modal';
+import Checkbox from '@/components/ui/Checkbox';
+import Modal, { ModalProps } from '@/components/ui/Modal';
 import usePartialUpdate from '@/hooks/usePartialUpdate';
 import { GraphFilterParams } from '@/models/miscellaneous';
 import { CstType } from '@/models/rsform';
diff --git a/rsconcept/frontend/src/dialogs/DlgRenameCst.tsx b/rsconcept/frontend/src/dialogs/DlgRenameCst.tsx
index b19a3710..6168f63e 100644
--- a/rsconcept/frontend/src/dialogs/DlgRenameCst.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgRenameCst.tsx
@@ -3,9 +3,9 @@
 import clsx from 'clsx';
 import { useLayoutEffect, useState } from 'react';
 
-import Modal, { ModalProps } from '@/components/Common/Modal';
-import SelectSingle from '@/components/Common/SelectSingle';
-import TextInput from '@/components/Common/TextInput';
+import Modal, { ModalProps } from '@/components/ui/Modal';
+import SelectSingle from '@/components/ui/SelectSingle';
+import TextInput from '@/components/ui/TextInput';
 import { useRSForm } from '@/context/RSFormContext';
 import usePartialUpdate from '@/hooks/usePartialUpdate';
 import { CstType, ICstRenameData } from '@/models/rsform';
diff --git a/rsconcept/frontend/src/dialogs/DlgShowAST.tsx b/rsconcept/frontend/src/dialogs/DlgShowAST.tsx
index ddac24b1..56193646 100644
--- a/rsconcept/frontend/src/dialogs/DlgShowAST.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgShowAST.tsx
@@ -2,8 +2,8 @@
 
 import { useCallback, useMemo, useState } from 'react';
 
-import Modal, { ModalProps } from '@/components/Common/Modal';
 import GraphUI, { GraphEdge, GraphNode } from '@/components/GraphUI';
+import Modal, { ModalProps } from '@/components/ui/Modal';
 import { useConceptTheme } from '@/context/ThemeContext';
 import { SyntaxTree } from '@/models/rslang';
 import { graphDarkT, graphLightT } from '@/utils/color';
diff --git a/rsconcept/frontend/src/dialogs/DlgUploadRSForm.tsx b/rsconcept/frontend/src/dialogs/DlgUploadRSForm.tsx
index 96c9e1a9..77a8abb8 100644
--- a/rsconcept/frontend/src/dialogs/DlgUploadRSForm.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgUploadRSForm.tsx
@@ -3,9 +3,9 @@
 import { useState } from 'react';
 import { toast } from 'react-toastify';
 
-import Checkbox from '@/components/Common/Checkbox';
-import FileInput from '@/components/Common/FileInput';
-import Modal from '@/components/Common/Modal';
+import Checkbox from '@/components/ui/Checkbox';
+import FileInput from '@/components/ui/FileInput';
+import Modal from '@/components/ui/Modal';
 import { useRSForm } from '@/context/RSFormContext';
 import { IRSFormUploadData } from '@/models/rsform';
 import { EXTEOR_TRS_FILE } from '@/utils/constants';
diff --git a/rsconcept/frontend/src/pages/CreateRSFormPage.tsx b/rsconcept/frontend/src/pages/CreateRSFormPage.tsx
index adece5d3..cf5c3601 100644
--- a/rsconcept/frontend/src/pages/CreateRSFormPage.tsx
+++ b/rsconcept/frontend/src/pages/CreateRSFormPage.tsx
@@ -5,16 +5,16 @@ import { useEffect, useRef, useState } from 'react';
 import { BiDownload } from 'react-icons/bi';
 import { toast } from 'react-toastify';
 
-import Button from '@/components/Common/Button';
-import Checkbox from '@/components/Common/Checkbox';
-import Label from '@/components/Common/Label';
-import MiniButton from '@/components/Common/MiniButton';
-import Overlay from '@/components/Common/Overlay';
-import SubmitButton from '@/components/Common/SubmitButton';
-import TextArea from '@/components/Common/TextArea';
-import TextInput from '@/components/Common/TextInput';
 import InfoError from '@/components/InfoError';
 import RequireAuth from '@/components/RequireAuth';
+import Button from '@/components/ui/Button';
+import Checkbox from '@/components/ui/Checkbox';
+import Label from '@/components/ui/Label';
+import MiniButton from '@/components/ui/MiniButton';
+import Overlay from '@/components/ui/Overlay';
+import SubmitButton from '@/components/ui/SubmitButton';
+import TextArea from '@/components/ui/TextArea';
+import TextInput from '@/components/ui/TextInput';
 import { useLibrary } from '@/context/LibraryContext';
 import { useConceptNavigation } from '@/context/NavigationContext';
 import { LibraryItemType } from '@/models/library';
diff --git a/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx b/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx
index 42eda81e..5773d896 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx
@@ -2,8 +2,8 @@
 
 import { useCallback, useLayoutEffect, useState } from 'react';
 
-import { Loader } from '@/components/Common/Loader';
 import InfoError from '@/components/InfoError';
+import { Loader } from '@/components/ui/Loader';
 import { useAuth } from '@/context/AuthContext';
 import { useLibrary } from '@/context/LibraryContext';
 import { useConceptNavigation } from '@/context/NavigationContext';
diff --git a/rsconcept/frontend/src/pages/LibraryPage/PickerStrategy.tsx b/rsconcept/frontend/src/pages/LibraryPage/PickerStrategy.tsx
index 4419b2db..6e29faff 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/PickerStrategy.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/PickerStrategy.tsx
@@ -3,9 +3,9 @@
 import { useCallback } from 'react';
 import { BiFilterAlt } from 'react-icons/bi';
 
-import Dropdown from '@/components/Common/Dropdown';
-import DropdownCheckbox from '@/components/Common/DropdownCheckbox';
-import SelectorButton from '@/components/Common/SelectorButton';
+import Dropdown from '@/components/ui/Dropdown';
+import DropdownCheckbox from '@/components/ui/DropdownCheckbox';
+import SelectorButton from '@/components/ui/SelectorButton';
 import { useAuth } from '@/context/AuthContext';
 import useDropdown from '@/hooks/useDropdown';
 import { LibraryFilterStrategy } from '@/models/miscellaneous';
diff --git a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx b/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
index ec7dffa6..7a3238d2 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
@@ -3,7 +3,7 @@
 import clsx from 'clsx';
 import { useCallback } from 'react';
 
-import SearchBar from '@/components/Common/SearchBar';
+import SearchBar from '@/components/ui/SearchBar';
 import { useConceptNavigation } from '@/context/NavigationContext';
 import { ILibraryFilter } from '@/models/miscellaneous';
 import { LibraryFilterStrategy } from '@/models/miscellaneous';
diff --git a/rsconcept/frontend/src/pages/LibraryPage/ViewLibrary.tsx b/rsconcept/frontend/src/pages/LibraryPage/ViewLibrary.tsx
index 3fa8dab3..b6854502 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/ViewLibrary.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/ViewLibrary.tsx
@@ -4,9 +4,9 @@ import clsx from 'clsx';
 import { useMemo } from 'react';
 import { useIntl } from 'react-intl';
 
-import TextURL from '@/components/Common/TextURL';
 import DataTable, { createColumnHelper } from '@/components/DataTable';
 import HelpButton from '@/components/Help/HelpButton';
+import TextURL from '@/components/ui/TextURL';
 import { useAuth } from '@/context/AuthContext';
 import { useConceptNavigation } from '@/context/NavigationContext';
 import { useUsers } from '@/context/UsersContext';
diff --git a/rsconcept/frontend/src/pages/LoginPage.tsx b/rsconcept/frontend/src/pages/LoginPage.tsx
index 8c6ddda8..a30b506d 100644
--- a/rsconcept/frontend/src/pages/LoginPage.tsx
+++ b/rsconcept/frontend/src/pages/LoginPage.tsx
@@ -4,11 +4,11 @@ import axios from 'axios';
 import clsx from 'clsx';
 import { useEffect, useState } from 'react';
 
-import SubmitButton from '@/components/Common/SubmitButton';
-import TextInput from '@/components/Common/TextInput';
-import TextURL from '@/components/Common/TextURL';
 import ExpectedAnonymous from '@/components/ExpectedAnonymous';
 import InfoError, { ErrorData } from '@/components/InfoError';
+import SubmitButton from '@/components/ui/SubmitButton';
+import TextInput from '@/components/ui/TextInput';
+import TextURL from '@/components/ui/TextURL';
 import { useAuth } from '@/context/AuthContext';
 import { useConceptNavigation } from '@/context/NavigationContext';
 import useQueryStrings from '@/hooks/useQueryStrings';
diff --git a/rsconcept/frontend/src/pages/NotFoundPage.tsx b/rsconcept/frontend/src/pages/NotFoundPage.tsx
index 570ff7cc..146c8bc4 100644
--- a/rsconcept/frontend/src/pages/NotFoundPage.tsx
+++ b/rsconcept/frontend/src/pages/NotFoundPage.tsx
@@ -1,4 +1,4 @@
-import TextURL from '@/components/Common/TextURL';
+import TextURL from '@/components/ui/TextURL';
 
 export function NotFoundPage() {
   return (
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ConstituentaToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ConstituentaToolbar.tsx
index 33e5ab48..d3194db5 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ConstituentaToolbar.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ConstituentaToolbar.tsx
@@ -4,9 +4,9 @@ import { useMemo } from 'react';
 import { BiDuplicate, BiPlusCircle, BiReset, BiTrash } from 'react-icons/bi';
 import { FiSave } from 'react-icons/fi';
 
-import MiniButton from '@/components/Common/MiniButton';
-import Overlay from '@/components/Common/Overlay';
 import HelpButton from '@/components/Help/HelpButton';
+import MiniButton from '@/components/ui/MiniButton';
+import Overlay from '@/components/ui/Overlay';
 import { HelpTopic } from '@/models/miscellaneous';
 
 interface ConstituentaToolbarProps {
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
index 65732195..c99ebc1a 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
@@ -6,11 +6,11 @@ import { FiSave } from 'react-icons/fi';
 import { LiaEdit } from 'react-icons/lia';
 import { toast } from 'react-toastify';
 
-import MiniButton from '@/components/Common/MiniButton';
-import Overlay from '@/components/Common/Overlay';
-import SubmitButton from '@/components/Common/SubmitButton';
-import TextArea from '@/components/Common/TextArea';
 import RefsInput from '@/components/RefsInput';
+import MiniButton from '@/components/ui/MiniButton';
+import Overlay from '@/components/ui/Overlay';
+import SubmitButton from '@/components/ui/SubmitButton';
+import TextArea from '@/components/ui/TextArea';
 import { useRSForm } from '@/context/RSFormContext';
 import { IConstituenta, ICstRenameData, ICstUpdateData } from '@/models/rsform';
 import { classnames } from '@/utils/constants';
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
index 5604963f..923e3be2 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
@@ -8,10 +8,10 @@ import { FaRegKeyboard } from 'react-icons/fa6';
 import { RiNodeTree } from 'react-icons/ri';
 import { toast } from 'react-toastify';
 
-import MiniButton from '@/components/Common/MiniButton';
-import Overlay from '@/components/Common/Overlay';
 import RSInput from '@/components/RSInput';
 import { RSTextWrapper } from '@/components/RSInput/textEditing';
+import MiniButton from '@/components/ui/MiniButton';
+import Overlay from '@/components/ui/Overlay';
 import { useRSForm } from '@/context/RSFormContext';
 import DlgShowAST from '@/dialogs/DlgShowAST';
 import useCheckExpression from '@/hooks/useCheckExpression';
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusBar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusBar.tsx
index c6b304f6..4bd70cdf 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusBar.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusBar.tsx
@@ -3,7 +3,7 @@
 import clsx from 'clsx';
 import { useMemo } from 'react';
 
-import { Loader } from '@/components/Common/Loader';
+import { Loader } from '@/components/ui/Loader';
 import { useConceptTheme } from '@/context/ThemeContext';
 import { ExpressionStatus } from '@/models/rsform';
 import { type IConstituenta } from '@/models/rsform';
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/EditorRSForm.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/EditorRSForm.tsx
index ac6bd329..85e2db72 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/EditorRSForm.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/EditorRSForm.tsx
@@ -2,9 +2,9 @@
 
 import { Dispatch, SetStateAction } from 'react';
 
-import Divider from '@/components/Common/Divider';
-import FlexColumn from '@/components/Common/FlexColumn';
-import InfoLibraryItem from '@/components/Shared/InfoLibraryItem';
+import InfoLibraryItem from '@/components/InfoLibraryItem';
+import Divider from '@/components/ui/Divider';
+import FlexColumn from '@/components/ui/FlexColumn';
 import { useAuth } from '@/context/AuthContext';
 import { useRSForm } from '@/context/RSFormContext';
 import { globalIDs } from '@/utils/constants';
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/FormRSForm.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/FormRSForm.tsx
index 3df82b21..3720b1fa 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/FormRSForm.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/FormRSForm.tsx
@@ -5,10 +5,10 @@ import { Dispatch, SetStateAction, useEffect, useLayoutEffect, useState } from '
 import { FiSave } from 'react-icons/fi';
 import { toast } from 'react-toastify';
 
-import Checkbox from '@/components/Common/Checkbox';
-import SubmitButton from '@/components/Common/SubmitButton';
-import TextArea from '@/components/Common/TextArea';
-import TextInput from '@/components/Common/TextInput';
+import Checkbox from '@/components/ui/Checkbox';
+import SubmitButton from '@/components/ui/SubmitButton';
+import TextArea from '@/components/ui/TextArea';
+import TextInput from '@/components/ui/TextInput';
 import { useAuth } from '@/context/AuthContext';
 import { useRSForm } from '@/context/RSFormContext';
 import { LibraryItemType } from '@/models/library';
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormStats.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormStats.tsx
index 006ed3ec..72479824 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormStats.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormStats.tsx
@@ -1,5 +1,5 @@
-import Divider from '@/components/Common/Divider';
-import LabeledValue from '@/components/Common/LabeledValue';
+import Divider from '@/components/ui/Divider';
+import LabeledValue from '@/components/ui/LabeledValue';
 import { type IRSFormStats } from '@/models/rsform';
 
 interface RSFormStatsProps {
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormToolbar.tsx
index 8ae1272c..f167ab4b 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormToolbar.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormToolbar.tsx
@@ -5,9 +5,9 @@ import { BiDownload, BiShareAlt, BiTrash } from 'react-icons/bi';
 import { FiBell, FiBellOff, FiSave } from 'react-icons/fi';
 import { LuCrown } from 'react-icons/lu';
 
-import MiniButton from '@/components/Common/MiniButton';
-import Overlay from '@/components/Common/Overlay';
 import HelpButton from '@/components/Help/HelpButton';
+import MiniButton from '@/components/ui/MiniButton';
+import Overlay from '@/components/ui/Overlay';
 import { HelpTopic } from '@/models/miscellaneous';
 
 interface RSFormToolbarProps {
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/EditorRSList.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/EditorRSList.tsx
index eecfa7ac..240cc91f 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/EditorRSList.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/EditorRSList.tsx
@@ -3,7 +3,7 @@
 import { useLayoutEffect, useState } from 'react';
 
 import { type RowSelectionState } from '@/components/DataTable';
-import SelectedCounter from '@/components/Shared/SelectedCounter';
+import SelectedCounter from '@/components/SelectedCounter';
 import { useRSForm } from '@/context/RSFormContext';
 import { CstType, ICstCreateData, ICstMovetoData } from '@/models/rsform';
 
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSListToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSListToolbar.tsx
index 149f7ebe..d781c53c 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSListToolbar.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSListToolbar.tsx
@@ -3,11 +3,11 @@
 import { useMemo } from 'react';
 import { BiDownArrowCircle, BiDownvote, BiDuplicate, BiPlusCircle, BiTrash, BiUpvote } from 'react-icons/bi';
 
-import Dropdown from '@/components/Common/Dropdown';
-import DropdownButton from '@/components/Common/DropdownButton';
-import MiniButton from '@/components/Common/MiniButton';
-import Overlay from '@/components/Common/Overlay';
 import HelpButton from '@/components/Help/HelpButton';
+import Dropdown from '@/components/ui/Dropdown';
+import DropdownButton from '@/components/ui/DropdownButton';
+import MiniButton from '@/components/ui/MiniButton';
+import Overlay from '@/components/ui/Overlay';
 import useDropdown from '@/hooks/useDropdown';
 import { HelpTopic } from '@/models/miscellaneous';
 import { CstType } from '@/models/rsform';
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSTable.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSTable.tsx
index 35ccd253..e2f04687 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSTable.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSTable.tsx
@@ -3,8 +3,8 @@
 import clsx from 'clsx';
 import { useCallback, useLayoutEffect, useMemo, useState } from 'react';
 
+import ConstituentaBadge from '@/components/ConstituentaBadge';
 import DataTable, { createColumnHelper, RowSelectionState, VisibilityState } from '@/components/DataTable';
-import ConstituentaBadge from '@/components/Shared/ConstituentaBadge';
 import { useConceptTheme } from '@/context/ThemeContext';
 import useWindowSize from '@/hooks/useWindowSize';
 import { IConstituenta } from '@/models/rsform';
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx
index cd69af4e..fe34fd40 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx
@@ -5,9 +5,9 @@ import { AnimatePresence } from 'framer-motion';
 import { useCallback, useLayoutEffect, useMemo, useState } from 'react';
 import { GraphEdge, GraphNode, LayoutTypes } from 'reagraph';
 
-import Overlay from '@/components/Common/Overlay';
-import InfoConstituenta from '@/components/Shared/InfoConstituenta';
-import SelectedCounter from '@/components/Shared/SelectedCounter';
+import InfoConstituenta from '@/components/InfoConstituenta';
+import SelectedCounter from '@/components/SelectedCounter';
+import Overlay from '@/components/ui/Overlay';
 import { useRSForm } from '@/context/RSFormContext';
 import { useConceptTheme } from '@/context/ThemeContext';
 import DlgGraphParams from '@/dialogs/DlgGraphParams';
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphSidebar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphSidebar.tsx
index 750d35bf..c10d9bc6 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphSidebar.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphSidebar.tsx
@@ -1,6 +1,6 @@
 import { LayoutTypes } from 'reagraph';
 
-import SelectSingle from '@/components/Common/SelectSingle';
+import SelectSingle from '@/components/ui/SelectSingle';
 import { GraphColoringScheme } from '@/models/miscellaneous';
 import { mapLabelColoring, mapLabelLayout } from '@/utils/labels';
 import { SelectorGraphColoring, SelectorGraphLayout } from '@/utils/selectors';
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphToolbar.tsx
index 1bb4f673..00c00c15 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphToolbar.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphToolbar.tsx
@@ -2,9 +2,9 @@
 
 import { BiCollapse, BiFilterAlt, BiFont, BiFontFamily, BiPlanet, BiPlusCircle, BiTrash } from 'react-icons/bi';
 
-import MiniButton from '@/components/Common/MiniButton';
-import Overlay from '@/components/Common/Overlay';
 import HelpButton from '@/components/Help/HelpButton';
+import MiniButton from '@/components/ui/MiniButton';
+import Overlay from '@/components/ui/Overlay';
 import { HelpTopic } from '@/models/miscellaneous';
 
 interface GraphToolbarProps {
diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx b/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx
index 1b5e63ad..a8653e66 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx
@@ -8,10 +8,10 @@ import { useCallback, useLayoutEffect, useMemo, useState } from 'react';
 import { TabList, TabPanel, Tabs } from 'react-tabs';
 import { toast } from 'react-toastify';
 
-import { Loader } from '@/components/Common/Loader';
-import TabLabel from '@/components/Common/TabLabel';
-import TextURL from '@/components/Common/TextURL';
 import InfoError, { ErrorData } from '@/components/InfoError';
+import { Loader } from '@/components/ui/Loader';
+import TabLabel from '@/components/ui/TabLabel';
+import TextURL from '@/components/ui/TextURL';
 import { useAccessMode } from '@/context/AccessModeContext';
 import { useAuth } from '@/context/AuthContext';
 import { useLibrary } from '@/context/LibraryContext';
diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx b/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx
index 9fd3aeb7..bbb4b591 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx
@@ -15,9 +15,9 @@ import {
 import { FiEdit } from 'react-icons/fi';
 import { LuCrown, LuGlasses } from 'react-icons/lu';
 
-import Button from '@/components/Common/Button';
-import Dropdown from '@/components/Common/Dropdown';
-import DropdownButton from '@/components/Common/DropdownButton';
+import Button from '@/components/ui/Button';
+import Dropdown from '@/components/ui/Dropdown';
+import DropdownButton from '@/components/ui/DropdownButton';
 import { useAccessMode } from '@/context/AccessModeContext';
 import { useAuth } from '@/context/AuthContext';
 import { useConceptNavigation } from '@/context/NavigationContext';
diff --git a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx
index 3c8374a9..bfc2d2de 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx
@@ -3,10 +3,10 @@
 import { useCallback, useLayoutEffect } from 'react';
 import { BiCog, BiFilterAlt } from 'react-icons/bi';
 
-import Dropdown from '@/components/Common/Dropdown';
-import DropdownButton from '@/components/Common/DropdownButton';
-import SearchBar from '@/components/Common/SearchBar';
-import SelectorButton from '@/components/Common/SelectorButton';
+import Dropdown from '@/components/ui/Dropdown';
+import DropdownButton from '@/components/ui/DropdownButton';
+import SearchBar from '@/components/ui/SearchBar';
+import SelectorButton from '@/components/ui/SelectorButton';
 import useDropdown from '@/hooks/useDropdown';
 import useLocalStorage from '@/hooks/useLocalStorage';
 import { CstMatchMode, DependencyMode } from '@/models/miscellaneous';
diff --git a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsTable.tsx b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsTable.tsx
index e7ffad8e..e3fd7599 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsTable.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsTable.tsx
@@ -3,8 +3,8 @@
 import clsx from 'clsx';
 import { useCallback, useLayoutEffect, useMemo, useState } from 'react';
 
+import ConstituentaBadge from '@/components/ConstituentaBadge';
 import DataTable, { createColumnHelper, IConditionalStyle, VisibilityState } from '@/components/DataTable';
-import ConstituentaBadge from '@/components/Shared/ConstituentaBadge';
 import { useConceptTheme } from '@/context/ThemeContext';
 import useWindowSize from '@/hooks/useWindowSize';
 import { IConstituenta } from '@/models/rsform';
diff --git a/rsconcept/frontend/src/pages/RegisterPage.tsx b/rsconcept/frontend/src/pages/RegisterPage.tsx
index 4720f012..a8823d66 100644
--- a/rsconcept/frontend/src/pages/RegisterPage.tsx
+++ b/rsconcept/frontend/src/pages/RegisterPage.tsx
@@ -5,16 +5,16 @@ import { useEffect, useState } from 'react';
 import { BiInfoCircle } from 'react-icons/bi';
 import { toast } from 'react-toastify';
 
-import Button from '@/components/Common/Button';
-import Checkbox from '@/components/Common/Checkbox';
-import FlexColumn from '@/components/Common/FlexColumn';
-import Overlay from '@/components/Common/Overlay';
-import SubmitButton from '@/components/Common/SubmitButton';
-import TextInput from '@/components/Common/TextInput';
-import TextURL from '@/components/Common/TextURL';
-import Tooltip from '@/components/Common/Tooltip';
 import ExpectedAnonymous from '@/components/ExpectedAnonymous';
 import InfoError from '@/components/InfoError';
+import Button from '@/components/ui/Button';
+import Checkbox from '@/components/ui/Checkbox';
+import FlexColumn from '@/components/ui/FlexColumn';
+import Overlay from '@/components/ui/Overlay';
+import SubmitButton from '@/components/ui/SubmitButton';
+import TextInput from '@/components/ui/TextInput';
+import TextURL from '@/components/ui/TextURL';
+import Tooltip from '@/components/ui/Tooltip';
 import { useAuth } from '@/context/AuthContext';
 import { useConceptNavigation } from '@/context/NavigationContext';
 import { type IUserSignupData } from '@/models/library';
diff --git a/rsconcept/frontend/src/pages/RestorePasswordPage.tsx b/rsconcept/frontend/src/pages/RestorePasswordPage.tsx
index 0a197cca..67480f66 100644
--- a/rsconcept/frontend/src/pages/RestorePasswordPage.tsx
+++ b/rsconcept/frontend/src/pages/RestorePasswordPage.tsx
@@ -1,4 +1,4 @@
-import TextURL from '@/components/Common/TextURL';
+import TextURL from '@/components/ui/TextURL';
 import { urls } from '@/utils/constants';
 
 function RestorePasswordPage() {
diff --git a/rsconcept/frontend/src/pages/UserProfilePage/EditorPassword.tsx b/rsconcept/frontend/src/pages/UserProfilePage/EditorPassword.tsx
index 4c0cc639..cb53389e 100644
--- a/rsconcept/frontend/src/pages/UserProfilePage/EditorPassword.tsx
+++ b/rsconcept/frontend/src/pages/UserProfilePage/EditorPassword.tsx
@@ -5,10 +5,10 @@ import clsx from 'clsx';
 import { useEffect, useMemo, useState } from 'react';
 import { toast } from 'react-toastify';
 
-import FlexColumn from '@/components/Common/FlexColumn';
-import SubmitButton from '@/components/Common/SubmitButton';
-import TextInput from '@/components/Common/TextInput';
 import InfoError, { ErrorData } from '@/components/InfoError';
+import FlexColumn from '@/components/ui/FlexColumn';
+import SubmitButton from '@/components/ui/SubmitButton';
+import TextInput from '@/components/ui/TextInput';
 import { useAuth } from '@/context/AuthContext';
 import { useConceptNavigation } from '@/context/NavigationContext';
 import { IUserUpdatePassword } from '@/models/library';
diff --git a/rsconcept/frontend/src/pages/UserProfilePage/EditorProfile.tsx b/rsconcept/frontend/src/pages/UserProfilePage/EditorProfile.tsx
index 0c3ca6f0..ef3df512 100644
--- a/rsconcept/frontend/src/pages/UserProfilePage/EditorProfile.tsx
+++ b/rsconcept/frontend/src/pages/UserProfilePage/EditorProfile.tsx
@@ -4,8 +4,8 @@ import clsx from 'clsx';
 import { useLayoutEffect, useMemo, useState } from 'react';
 import { toast } from 'react-toastify';
 
-import SubmitButton from '@/components/Common/SubmitButton';
-import TextInput from '@/components/Common/TextInput';
+import SubmitButton from '@/components/ui/SubmitButton';
+import TextInput from '@/components/ui/TextInput';
 import { useBlockNavigation } from '@/context/NavigationContext';
 import { useUserProfile } from '@/context/UserProfileContext';
 import { IUserUpdateData } from '@/models/library';
diff --git a/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx b/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx
index a43c44d7..c5aa4606 100644
--- a/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx
+++ b/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx
@@ -4,10 +4,10 @@ import { AnimatePresence } from 'framer-motion';
 import { useMemo, useState } from 'react';
 import { FiBell, FiBellOff } from 'react-icons/fi';
 
-import { Loader } from '@/components/Common/Loader';
-import MiniButton from '@/components/Common/MiniButton';
-import Overlay from '@/components/Common/Overlay';
 import InfoError from '@/components/InfoError';
+import { Loader } from '@/components/ui/Loader';
+import MiniButton from '@/components/ui/MiniButton';
+import Overlay from '@/components/ui/Overlay';
 import { useAuth } from '@/context/AuthContext';
 import { useLibrary } from '@/context/LibraryContext';
 import { useUserProfile } from '@/context/UserProfileContext';