diff --git a/rsconcept/frontend/src/app/application-layout.tsx b/rsconcept/frontend/src/app/application-layout.tsx
index 84cb4c60..bb4e5f8c 100644
--- a/rsconcept/frontend/src/app/application-layout.tsx
+++ b/rsconcept/frontend/src/app/application-layout.tsx
@@ -1,18 +1,18 @@
 import { Suspense } from 'react';
 import { Outlet } from 'react-router';
 
-import { ModalLoader } from '@/components/modal1';
+import { ModalLoader } from '@/components/modal';
 import { useAppLayoutStore, useMainHeight, useViewportHeight } from '@/stores/app-layout';
 import { useDialogsStore } from '@/stores/dialogs';
 
-import { NavigationState } from './navigation1/navigation-context';
-import { Footer } from './footer1';
+import { NavigationState } from './navigation/navigation-context';
+import { Footer } from './footer';
 import { GlobalDialogs } from './global-dialogs';
 import { GlobalLoader } from './global-Loader';
 import { ToasterThemed } from './global-toaster';
 import { GlobalTooltips } from './global-tooltips';
 import { MutationErrors } from './mutation-errors';
-import { Navigation } from './navigation1';
+import { Navigation } from './navigation';
 
 export function ApplicationLayout() {
   const mainHeight = useMainHeight();
diff --git a/rsconcept/frontend/src/app/error-fallback.tsx b/rsconcept/frontend/src/app/error-fallback.tsx
index e02a9654..46e597a2 100644
--- a/rsconcept/frontend/src/app/error-fallback.tsx
+++ b/rsconcept/frontend/src/app/error-fallback.tsx
@@ -1,6 +1,6 @@
 import { useNavigate, useRouteError } from 'react-router';
 
-import { Button } from '@/components/control1';
+import { Button } from '@/components/control';
 import { InfoError } from '@/components/info-error';
 
 export function ErrorFallback() {
diff --git a/rsconcept/frontend/src/app/footer1.tsx b/rsconcept/frontend/src/app/footer.tsx
similarity index 94%
rename from rsconcept/frontend/src/app/footer1.tsx
rename to rsconcept/frontend/src/app/footer.tsx
index 23222843..74371692 100644
--- a/rsconcept/frontend/src/app/footer1.tsx
+++ b/rsconcept/frontend/src/app/footer.tsx
@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 
-import { TextURL } from '@/components/control1';
+import { TextURL } from '@/components/control';
 import { external_urls } from '@/utils/constants';
 
 export function Footer() {
diff --git a/rsconcept/frontend/src/app/global-Loader.tsx b/rsconcept/frontend/src/app/global-Loader.tsx
index 72bf9f28..eaab1546 100644
--- a/rsconcept/frontend/src/app/global-Loader.tsx
+++ b/rsconcept/frontend/src/app/global-Loader.tsx
@@ -1,8 +1,8 @@
 import { useNavigation } from 'react-router';
 import { useDebounce } from 'use-debounce';
 
-import { Loader } from '@/components/loader1';
-import { ModalBackdrop } from '@/components/modal1/modal-backdrop';
+import { Loader } from '@/components/loader';
+import { ModalBackdrop } from '@/components/modal/modal-backdrop';
 import { PARAMETER } from '@/utils/constants';
 
 export function GlobalLoader() {
diff --git a/rsconcept/frontend/src/app/global-tooltips.tsx b/rsconcept/frontend/src/app/global-tooltips.tsx
index 179c4326..adff5fb9 100644
--- a/rsconcept/frontend/src/app/global-tooltips.tsx
+++ b/rsconcept/frontend/src/app/global-tooltips.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { Tooltip } from '@/components/container1';
+import { Tooltip } from '@/components/container';
 import { globalIDs } from '@/utils/constants';
 
 export const GlobalTooltips = () => {
diff --git a/rsconcept/frontend/src/app/index.tsx b/rsconcept/frontend/src/app/index.tsx
index ab7f9e01..9ae74cb6 100644
--- a/rsconcept/frontend/src/app/index.tsx
+++ b/rsconcept/frontend/src/app/index.tsx
@@ -3,7 +3,7 @@ export { useBlockNavigation } from './navigation1/navigation-context';
 export { urls } from './urls';
 import { RouterProvider } from 'react-router';
 
-import { Router } from './router1';
+import { Router } from './router';
 
 export function App() {
   return <RouterProvider router={Router} />;
diff --git a/rsconcept/frontend/src/app/mutation-errors.tsx b/rsconcept/frontend/src/app/mutation-errors.tsx
index c5754947..e633b969 100644
--- a/rsconcept/frontend/src/app/mutation-errors.tsx
+++ b/rsconcept/frontend/src/app/mutation-errors.tsx
@@ -1,7 +1,7 @@
 import { useMutationErrors } from '@/backend/use-mutation-errors';
-import { Button } from '@/components/control1';
+import { Button } from '@/components/control';
 import { DescribeError } from '@/components/info-error';
-import { ModalBackdrop } from '@/components/modal1/modal-backdrop';
+import { ModalBackdrop } from '@/components/modal/modal-backdrop';
 import { useEscapeKey } from '@/hooks/use-escape-key';
 import { useDialogsStore } from '@/stores/dialogs';
 
diff --git a/rsconcept/frontend/src/app/navigation/index.tsx b/rsconcept/frontend/src/app/navigation/index.tsx
new file mode 100644
index 00000000..efb95db0
--- /dev/null
+++ b/rsconcept/frontend/src/app/navigation/index.tsx
@@ -0,0 +1 @@
+export { Navigation } from './navigation';
diff --git a/rsconcept/frontend/src/app/navigation1/logo1.tsx b/rsconcept/frontend/src/app/navigation/logo.tsx
similarity index 100%
rename from rsconcept/frontend/src/app/navigation1/logo1.tsx
rename to rsconcept/frontend/src/app/navigation/logo.tsx
diff --git a/rsconcept/frontend/src/app/navigation1/navigation-button.tsx b/rsconcept/frontend/src/app/navigation/navigation-button.tsx
similarity index 100%
rename from rsconcept/frontend/src/app/navigation1/navigation-button.tsx
rename to rsconcept/frontend/src/app/navigation/navigation-button.tsx
diff --git a/rsconcept/frontend/src/app/navigation1/navigation-context.tsx b/rsconcept/frontend/src/app/navigation/navigation-context.tsx
similarity index 100%
rename from rsconcept/frontend/src/app/navigation1/navigation-context.tsx
rename to rsconcept/frontend/src/app/navigation/navigation-context.tsx
diff --git a/rsconcept/frontend/src/app/navigation1/navigation1.tsx b/rsconcept/frontend/src/app/navigation/navigation.tsx
similarity index 97%
rename from rsconcept/frontend/src/app/navigation1/navigation1.tsx
rename to rsconcept/frontend/src/app/navigation/navigation.tsx
index ca91a6cf..d12d0cbb 100644
--- a/rsconcept/frontend/src/app/navigation1/navigation1.tsx
+++ b/rsconcept/frontend/src/app/navigation/navigation.tsx
@@ -1,10 +1,10 @@
-import { IconLibrary2, IconManuals, IconNewItem2 } from '@/components/icons1';
+import { IconLibrary2, IconManuals, IconNewItem2 } from '@/components/icons';
 import { useWindowSize } from '@/hooks/use-window-size';
 import { useAppLayoutStore } from '@/stores/app-layout';
 
 import { urls } from '../urls';
 
-import { Logo } from './logo1';
+import { Logo } from './logo';
 import { NavigationButton } from './navigation-button';
 import { useConceptNavigation } from './navigation-context';
 import { ToggleNavigation } from './toggle-navigation';
diff --git a/rsconcept/frontend/src/app/navigation1/toggle-navigation.tsx b/rsconcept/frontend/src/app/navigation/toggle-navigation.tsx
similarity index 98%
rename from rsconcept/frontend/src/app/navigation1/toggle-navigation.tsx
rename to rsconcept/frontend/src/app/navigation/toggle-navigation.tsx
index 3ab5d237..f0ba576d 100644
--- a/rsconcept/frontend/src/app/navigation1/toggle-navigation.tsx
+++ b/rsconcept/frontend/src/app/navigation/toggle-navigation.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { IconDarkTheme, IconLightTheme, IconPin, IconUnpin } from '@/components/icons1';
+import { IconDarkTheme, IconLightTheme, IconPin, IconUnpin } from '@/components/icons';
 import { useAppLayoutStore } from '@/stores/app-layout';
 import { usePreferencesStore } from '@/stores/preferences';
 import { globalIDs } from '@/utils/constants';
diff --git a/rsconcept/frontend/src/app/navigation1/user-button.tsx b/rsconcept/frontend/src/app/navigation/user-button.tsx
similarity index 95%
rename from rsconcept/frontend/src/app/navigation1/user-button.tsx
rename to rsconcept/frontend/src/app/navigation/user-button.tsx
index d2b28e83..c381d97a 100644
--- a/rsconcept/frontend/src/app/navigation1/user-button.tsx
+++ b/rsconcept/frontend/src/app/navigation/user-button.tsx
@@ -1,6 +1,6 @@
 import { useAuthSuspense } from '@/features/auth';
 
-import { IconLogin, IconUser2 } from '@/components/icons1';
+import { IconLogin, IconUser2 } from '@/components/icons';
 import { usePreferencesStore } from '@/stores/preferences';
 import { globalIDs } from '@/utils/constants';
 
diff --git a/rsconcept/frontend/src/app/navigation1/user-dropdown.tsx b/rsconcept/frontend/src/app/navigation/user-dropdown.tsx
similarity index 97%
rename from rsconcept/frontend/src/app/navigation1/user-dropdown.tsx
rename to rsconcept/frontend/src/app/navigation/user-dropdown.tsx
index 53deacc8..2375ac2a 100644
--- a/rsconcept/frontend/src/app/navigation1/user-dropdown.tsx
+++ b/rsconcept/frontend/src/app/navigation/user-dropdown.tsx
@@ -1,7 +1,7 @@
 import { useAuthSuspense } from '@/features/auth';
 import { useLogout } from '@/features/auth/backend/use-logout';
 
-import { Dropdown, DropdownButton } from '@/components/dropdown1';
+import { Dropdown, DropdownButton } from '@/components/dropdown';
 import {
   IconAdmin,
   IconAdminOff,
@@ -15,7 +15,7 @@ import {
   IconLogout,
   IconRESTapi,
   IconUser
-} from '@/components/icons1';
+} from '@/components/icons';
 import { usePreferencesStore } from '@/stores/preferences';
 import { globalIDs } from '@/utils/constants';
 
diff --git a/rsconcept/frontend/src/app/navigation1/user-menu.tsx b/rsconcept/frontend/src/app/navigation/user-menu.tsx
similarity index 88%
rename from rsconcept/frontend/src/app/navigation1/user-menu.tsx
rename to rsconcept/frontend/src/app/navigation/user-menu.tsx
index 8fa6859d..5ff80daa 100644
--- a/rsconcept/frontend/src/app/navigation1/user-menu.tsx
+++ b/rsconcept/frontend/src/app/navigation/user-menu.tsx
@@ -1,7 +1,7 @@
 import { Suspense } from 'react';
 
-import { useDropdown } from '@/components/dropdown1';
-import { Loader } from '@/components/loader1';
+import { useDropdown } from '@/components/dropdown';
+import { Loader } from '@/components/loader';
 
 import { urls } from '../urls';
 
diff --git a/rsconcept/frontend/src/app/navigation1/index.tsx b/rsconcept/frontend/src/app/navigation1/index.tsx
deleted file mode 100644
index 31ba062c..00000000
--- a/rsconcept/frontend/src/app/navigation1/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { Navigation } from './navigation1';
diff --git a/rsconcept/frontend/src/app/router1.tsx b/rsconcept/frontend/src/app/router.tsx
similarity index 98%
rename from rsconcept/frontend/src/app/router1.tsx
rename to rsconcept/frontend/src/app/router.tsx
index b0b9e382..4031ea8f 100644
--- a/rsconcept/frontend/src/app/router1.tsx
+++ b/rsconcept/frontend/src/app/router.tsx
@@ -11,7 +11,7 @@ import { prefetchRSForm } from '@/features/rsform/backend/use-rsform';
 import { prefetchProfile } from '@/features/users/backend/use-profile';
 import { prefetchUsers } from '@/features/users/backend/use-users';
 
-import { Loader } from '@/components/loader1';
+import { Loader } from '@/components/loader';
 
 import { ApplicationLayout } from './application-layout';
 import { ErrorFallback } from './error-fallback';
diff --git a/rsconcept/frontend/src/components/container1/divider1.tsx b/rsconcept/frontend/src/components/container/divider.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/container1/divider1.tsx
rename to rsconcept/frontend/src/components/container/divider.tsx
diff --git a/rsconcept/frontend/src/components/container/index.tsx b/rsconcept/frontend/src/components/container/index.tsx
new file mode 100644
index 00000000..7e764f72
--- /dev/null
+++ b/rsconcept/frontend/src/components/container/index.tsx
@@ -0,0 +1,2 @@
+export { Divider } from './divider';
+export { type PlacesType, Tooltip } from './tooltip';
diff --git a/rsconcept/frontend/src/components/container1/tooltip1.tsx b/rsconcept/frontend/src/components/container/tooltip.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/container1/tooltip1.tsx
rename to rsconcept/frontend/src/components/container/tooltip.tsx
diff --git a/rsconcept/frontend/src/components/container1/index.tsx b/rsconcept/frontend/src/components/container1/index.tsx
deleted file mode 100644
index cec5ed98..00000000
--- a/rsconcept/frontend/src/components/container1/index.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-export { Divider } from './divider1';
-export { type PlacesType, Tooltip } from './tooltip1';
diff --git a/rsconcept/frontend/src/components/control1/button1.tsx b/rsconcept/frontend/src/components/control/button.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/control1/button1.tsx
rename to rsconcept/frontend/src/components/control/button.tsx
diff --git a/rsconcept/frontend/src/components/control1/index.tsx b/rsconcept/frontend/src/components/control/index.tsx
similarity index 83%
rename from rsconcept/frontend/src/components/control1/index.tsx
rename to rsconcept/frontend/src/components/control/index.tsx
index 06f9a81a..b9ad1002 100644
--- a/rsconcept/frontend/src/components/control1/index.tsx
+++ b/rsconcept/frontend/src/components/control/index.tsx
@@ -1,4 +1,4 @@
-export { Button } from './button1';
+export { Button } from './button';
 export { MiniButton } from './mini-button';
 export { SelectorButton } from './selector-button';
 export { SubmitButton } from './submit-button';
diff --git a/rsconcept/frontend/src/components/control1/mini-button.tsx b/rsconcept/frontend/src/components/control/mini-button.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/control1/mini-button.tsx
rename to rsconcept/frontend/src/components/control/mini-button.tsx
diff --git a/rsconcept/frontend/src/components/control1/selector-button.tsx b/rsconcept/frontend/src/components/control/selector-button.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/control1/selector-button.tsx
rename to rsconcept/frontend/src/components/control/selector-button.tsx
diff --git a/rsconcept/frontend/src/components/control1/submit-button.tsx b/rsconcept/frontend/src/components/control/submit-button.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/control1/submit-button.tsx
rename to rsconcept/frontend/src/components/control/submit-button.tsx
diff --git a/rsconcept/frontend/src/components/control1/text-url.tsx b/rsconcept/frontend/src/components/control/text-url.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/control1/text-url.tsx
rename to rsconcept/frontend/src/components/control/text-url.tsx
diff --git a/rsconcept/frontend/src/components/data-table/pagination-tools.tsx b/rsconcept/frontend/src/components/data-table/pagination-tools.tsx
index ecb66ab5..4fe93cdd 100644
--- a/rsconcept/frontend/src/components/data-table/pagination-tools.tsx
+++ b/rsconcept/frontend/src/components/data-table/pagination-tools.tsx
@@ -6,7 +6,7 @@ import { type Table } from '@tanstack/react-table';
 
 import { prefixes } from '@/utils/constants';
 
-import { IconPageFirst, IconPageLast, IconPageLeft, IconPageRight } from '../icons1';
+import { IconPageFirst, IconPageLast, IconPageLeft, IconPageRight } from '../icons';
 
 interface PaginationToolsProps<TData> {
   id?: string;
diff --git a/rsconcept/frontend/src/components/data-table/select-all.tsx b/rsconcept/frontend/src/components/data-table/select-all.tsx
index 8e8cb6e0..167120dd 100644
--- a/rsconcept/frontend/src/components/data-table/select-all.tsx
+++ b/rsconcept/frontend/src/components/data-table/select-all.tsx
@@ -2,7 +2,7 @@
 
 import { type Table } from '@tanstack/react-table';
 
-import { CheckboxTristate } from '../input1';
+import { CheckboxTristate } from '../input';
 
 interface SelectAllProps<TData> {
   table: Table<TData>;
diff --git a/rsconcept/frontend/src/components/data-table/select-row.tsx b/rsconcept/frontend/src/components/data-table/select-row.tsx
index f255303d..b77482a4 100644
--- a/rsconcept/frontend/src/components/data-table/select-row.tsx
+++ b/rsconcept/frontend/src/components/data-table/select-row.tsx
@@ -2,7 +2,7 @@
 
 import { type Row } from '@tanstack/react-table';
 
-import { Checkbox } from '../input1';
+import { Checkbox } from '../input';
 
 interface SelectRowProps<TData> {
   row: Row<TData>;
diff --git a/rsconcept/frontend/src/components/data-table/sorting-icon.tsx b/rsconcept/frontend/src/components/data-table/sorting-icon.tsx
index 7e516774..4503b582 100644
--- a/rsconcept/frontend/src/components/data-table/sorting-icon.tsx
+++ b/rsconcept/frontend/src/components/data-table/sorting-icon.tsx
@@ -2,7 +2,7 @@
 
 import { type Column } from '@tanstack/react-table';
 
-import { IconSortAsc, IconSortDesc } from '../icons1';
+import { IconSortAsc, IconSortDesc } from '../icons';
 
 interface SortingIconProps<TData> {
   column: Column<TData>;
diff --git a/rsconcept/frontend/src/components/dropdown1/dropdown-button.tsx b/rsconcept/frontend/src/components/dropdown/dropdown-button.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/dropdown1/dropdown-button.tsx
rename to rsconcept/frontend/src/components/dropdown/dropdown-button.tsx
diff --git a/rsconcept/frontend/src/components/dropdown1/dropdown-checkbox.tsx b/rsconcept/frontend/src/components/dropdown/dropdown-checkbox.tsx
similarity index 90%
rename from rsconcept/frontend/src/components/dropdown1/dropdown-checkbox.tsx
rename to rsconcept/frontend/src/components/dropdown/dropdown-checkbox.tsx
index 2db9baa2..dfb0bab6 100644
--- a/rsconcept/frontend/src/components/dropdown1/dropdown-checkbox.tsx
+++ b/rsconcept/frontend/src/components/dropdown/dropdown-checkbox.tsx
@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 
-import { Checkbox, type CheckboxProps } from '../input1';
+import { Checkbox, type CheckboxProps } from '../input';
 
 /** Animated {@link Checkbox} inside a {@link Dropdown} item. */
 export function DropdownCheckbox({ onChange: setValue, disabled, ...restProps }: CheckboxProps) {
diff --git a/rsconcept/frontend/src/components/dropdown1/dropdown1.tsx b/rsconcept/frontend/src/components/dropdown/dropdown.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/dropdown1/dropdown1.tsx
rename to rsconcept/frontend/src/components/dropdown/dropdown.tsx
diff --git a/rsconcept/frontend/src/components/dropdown1/index.tsx b/rsconcept/frontend/src/components/dropdown/index.tsx
similarity index 79%
rename from rsconcept/frontend/src/components/dropdown1/index.tsx
rename to rsconcept/frontend/src/components/dropdown/index.tsx
index cf1e13c1..c0dd4aa1 100644
--- a/rsconcept/frontend/src/components/dropdown1/index.tsx
+++ b/rsconcept/frontend/src/components/dropdown/index.tsx
@@ -1,4 +1,4 @@
 export { DropdownButton } from './dropdown-button';
 export { DropdownCheckbox } from './dropdown-checkbox';
-export { Dropdown } from './dropdown1';
+export { Dropdown } from './dropdown';
 export { useDropdown } from './use-dropdown';
diff --git a/rsconcept/frontend/src/components/dropdown1/use-dropdown.ts b/rsconcept/frontend/src/components/dropdown/use-dropdown.ts
similarity index 100%
rename from rsconcept/frontend/src/components/dropdown1/use-dropdown.ts
rename to rsconcept/frontend/src/components/dropdown/use-dropdown.ts
diff --git a/rsconcept/frontend/src/components/flow1/dynamic-edge.tsx b/rsconcept/frontend/src/components/flow/dynamic-edge.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/flow1/dynamic-edge.tsx
rename to rsconcept/frontend/src/components/flow/dynamic-edge.tsx
diff --git a/rsconcept/frontend/src/components/icons1.tsx b/rsconcept/frontend/src/components/icons.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/icons1.tsx
rename to rsconcept/frontend/src/components/icons.tsx
diff --git a/rsconcept/frontend/src/components/info-error.tsx b/rsconcept/frontend/src/components/info-error.tsx
index 474b6b80..73ebddae 100644
--- a/rsconcept/frontend/src/components/info-error.tsx
+++ b/rsconcept/frontend/src/components/info-error.tsx
@@ -4,7 +4,7 @@ import { ZodError } from 'zod';
 import { type AxiosError, isAxiosError } from '@/backend/api-transport';
 import { isResponseHtml } from '@/utils/utils';
 
-import { PrettyJson } from './view1';
+import { PrettyJson } from './view';
 
 export type ErrorData = string | Error | AxiosError | ZodError;
 
diff --git a/rsconcept/frontend/src/components/input1/checkbox-tristate.tsx b/rsconcept/frontend/src/components/input/checkbox-tristate.tsx
similarity index 94%
rename from rsconcept/frontend/src/components/input1/checkbox-tristate.tsx
rename to rsconcept/frontend/src/components/input/checkbox-tristate.tsx
index 3c0311dc..1c0dcd2a 100644
--- a/rsconcept/frontend/src/components/input1/checkbox-tristate.tsx
+++ b/rsconcept/frontend/src/components/input/checkbox-tristate.tsx
@@ -2,9 +2,9 @@ import clsx from 'clsx';
 
 import { globalIDs } from '@/utils/constants';
 
-import { CheckboxChecked, CheckboxNull } from '../icons1';
+import { CheckboxChecked, CheckboxNull } from '../icons';
 
-import { type CheckboxProps } from './checkbox1';
+import { type CheckboxProps } from './checkbox';
 
 export interface CheckboxTristateProps extends Omit<CheckboxProps, 'value' | 'onChange'> {
   /** Current value - `null`, `true` or `false`. */
diff --git a/rsconcept/frontend/src/components/input1/checkbox1.tsx b/rsconcept/frontend/src/components/input/checkbox.tsx
similarity index 97%
rename from rsconcept/frontend/src/components/input1/checkbox1.tsx
rename to rsconcept/frontend/src/components/input/checkbox.tsx
index 79a38f29..e6f612fe 100644
--- a/rsconcept/frontend/src/components/input1/checkbox1.tsx
+++ b/rsconcept/frontend/src/components/input/checkbox.tsx
@@ -2,7 +2,7 @@ import clsx from 'clsx';
 
 import { globalIDs } from '@/utils/constants';
 
-import { CheckboxChecked } from '../icons1';
+import { CheckboxChecked } from '../icons';
 import { type Button } from '../props';
 
 export interface CheckboxProps extends Omit<Button, 'value' | 'onClick' | 'onChange'> {
diff --git a/rsconcept/frontend/src/components/input1/error-field.tsx b/rsconcept/frontend/src/components/input/error-field.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/input1/error-field.tsx
rename to rsconcept/frontend/src/components/input/error-field.tsx
diff --git a/rsconcept/frontend/src/components/input1/file-input.tsx b/rsconcept/frontend/src/components/input/file-input.tsx
similarity index 93%
rename from rsconcept/frontend/src/components/input1/file-input.tsx
rename to rsconcept/frontend/src/components/input/file-input.tsx
index 21629d52..3f28a9e0 100644
--- a/rsconcept/frontend/src/components/input1/file-input.tsx
+++ b/rsconcept/frontend/src/components/input/file-input.tsx
@@ -3,11 +3,11 @@
 import { useRef, useState } from 'react';
 import clsx from 'clsx';
 
-import { Button } from '../control1';
-import { IconUpload } from '../icons1';
+import { Button } from '../control';
+import { IconUpload } from '../icons';
 import { type Titled } from '../props';
 
-import { Label } from './label1';
+import { Label } from './label';
 
 interface FileInputProps extends Titled, Omit<React.ComponentProps<'input'>, 'accept' | 'type'> {
   /** Label to display in file upload button. */
diff --git a/rsconcept/frontend/src/components/input1/index.tsx b/rsconcept/frontend/src/components/input/index.tsx
similarity index 82%
rename from rsconcept/frontend/src/components/input1/index.tsx
rename to rsconcept/frontend/src/components/input/index.tsx
index e67a7cae..af613602 100644
--- a/rsconcept/frontend/src/components/input1/index.tsx
+++ b/rsconcept/frontend/src/components/input/index.tsx
@@ -1,8 +1,8 @@
 export { CheckboxTristate } from './checkbox-tristate';
-export { Checkbox, type CheckboxProps } from './checkbox1';
+export { Checkbox, type CheckboxProps } from './checkbox';
 export { ErrorField } from './error-field';
 export { FileInput } from './file-input';
-export { Label } from './label1';
+export { Label } from './label';
 export { SearchBar } from './search-bar';
 export { SelectMulti, type SelectMultiProps } from './select-multi';
 export { SelectSingle, type SelectSingleProps } from './select-single';
diff --git a/rsconcept/frontend/src/components/input1/label1.tsx b/rsconcept/frontend/src/components/input/label.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/input1/label1.tsx
rename to rsconcept/frontend/src/components/input/label.tsx
diff --git a/rsconcept/frontend/src/components/input1/search-bar.tsx b/rsconcept/frontend/src/components/input/search-bar.tsx
similarity index 96%
rename from rsconcept/frontend/src/components/input1/search-bar.tsx
rename to rsconcept/frontend/src/components/input/search-bar.tsx
index 1c49ad84..90381817 100644
--- a/rsconcept/frontend/src/components/input1/search-bar.tsx
+++ b/rsconcept/frontend/src/components/input/search-bar.tsx
@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 
-import { IconSearch } from '@/components/icons1';
+import { IconSearch } from '@/components/icons';
 import { type Styling } from '@/components/props';
 
 import { TextInput } from './text-input';
diff --git a/rsconcept/frontend/src/components/input1/select-multi.tsx b/rsconcept/frontend/src/components/input/select-multi.tsx
similarity index 99%
rename from rsconcept/frontend/src/components/input1/select-multi.tsx
rename to rsconcept/frontend/src/components/input/select-multi.tsx
index ae01918c..3ef4009d 100644
--- a/rsconcept/frontend/src/components/input1/select-multi.tsx
+++ b/rsconcept/frontend/src/components/input/select-multi.tsx
@@ -12,7 +12,7 @@ import Select, {
 import { useWindowSize } from '@/hooks/use-window-size';
 import { APP_COLORS, SELECT_THEME } from '@/styling/colors';
 
-import { IconClose, IconDropArrow, IconDropArrowUp } from '../icons1';
+import { IconClose, IconDropArrow, IconDropArrowUp } from '../icons';
 
 function DropdownIndicator<Option, Group extends GroupBase<Option> = GroupBase<Option>>(
   props: DropdownIndicatorProps<Option, true, Group>
diff --git a/rsconcept/frontend/src/components/input1/select-single.tsx b/rsconcept/frontend/src/components/input/select-single.tsx
similarity index 99%
rename from rsconcept/frontend/src/components/input1/select-single.tsx
rename to rsconcept/frontend/src/components/input/select-single.tsx
index 6dc21e76..cd23a6f7 100644
--- a/rsconcept/frontend/src/components/input1/select-single.tsx
+++ b/rsconcept/frontend/src/components/input/select-single.tsx
@@ -12,7 +12,7 @@ import Select, {
 import { useWindowSize } from '@/hooks/use-window-size';
 import { APP_COLORS, SELECT_THEME } from '@/styling/colors';
 
-import { IconClose, IconDropArrow, IconDropArrowUp } from '../icons1';
+import { IconClose, IconDropArrow, IconDropArrowUp } from '../icons';
 
 function DropdownIndicator<Option, Group extends GroupBase<Option> = GroupBase<Option>>(
   props: DropdownIndicatorProps<Option, false, Group>
diff --git a/rsconcept/frontend/src/components/input1/select-tree.tsx b/rsconcept/frontend/src/components/input/select-tree.tsx
similarity index 97%
rename from rsconcept/frontend/src/components/input1/select-tree.tsx
rename to rsconcept/frontend/src/components/input/select-tree.tsx
index 88832907..a9e136b9 100644
--- a/rsconcept/frontend/src/components/input1/select-tree.tsx
+++ b/rsconcept/frontend/src/components/input/select-tree.tsx
@@ -3,8 +3,8 @@ import clsx from 'clsx';
 
 import { globalIDs, PARAMETER } from '@/utils/constants';
 
-import { MiniButton } from '../control1';
-import { IconDropArrow, IconPageRight } from '../icons1';
+import { MiniButton } from '../control';
+import { IconDropArrow, IconPageRight } from '../icons';
 import { type Styling } from '../props';
 
 interface SelectTreeProps<ItemType> extends Styling {
diff --git a/rsconcept/frontend/src/components/input1/text-area.tsx b/rsconcept/frontend/src/components/input/text-area.tsx
similarity index 98%
rename from rsconcept/frontend/src/components/input1/text-area.tsx
rename to rsconcept/frontend/src/components/input/text-area.tsx
index 82c6a59c..13a44976 100644
--- a/rsconcept/frontend/src/components/input1/text-area.tsx
+++ b/rsconcept/frontend/src/components/input/text-area.tsx
@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 
-import { Label } from './label1';
+import { Label } from './label';
 import { type Editor, type ErrorProcessing, type Titled } from '../props';
 
 import { ErrorField } from './error-field';
diff --git a/rsconcept/frontend/src/components/input1/text-input.tsx b/rsconcept/frontend/src/components/input/text-input.tsx
similarity index 98%
rename from rsconcept/frontend/src/components/input1/text-input.tsx
rename to rsconcept/frontend/src/components/input/text-input.tsx
index 124e6af7..0c4bce43 100644
--- a/rsconcept/frontend/src/components/input1/text-input.tsx
+++ b/rsconcept/frontend/src/components/input/text-input.tsx
@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 
-import { Label } from './label1';
+import { Label } from './label';
 import { type Editor, type ErrorProcessing, type Titled } from '../props';
 
 import { ErrorField } from './error-field';
diff --git a/rsconcept/frontend/src/components/loader1.tsx b/rsconcept/frontend/src/components/loader.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/loader1.tsx
rename to rsconcept/frontend/src/components/loader.tsx
diff --git a/rsconcept/frontend/src/components/modal1/index.tsx b/rsconcept/frontend/src/components/modal/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/modal1/index.tsx
rename to rsconcept/frontend/src/components/modal/index.tsx
diff --git a/rsconcept/frontend/src/components/modal1/modal-backdrop.tsx b/rsconcept/frontend/src/components/modal/modal-backdrop.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/modal1/modal-backdrop.tsx
rename to rsconcept/frontend/src/components/modal/modal-backdrop.tsx
diff --git a/rsconcept/frontend/src/components/modal1/modal-form.tsx b/rsconcept/frontend/src/components/modal/modal-form.tsx
similarity index 97%
rename from rsconcept/frontend/src/components/modal1/modal-form.tsx
rename to rsconcept/frontend/src/components/modal/modal-form.tsx
index 335f880c..4c35a731 100644
--- a/rsconcept/frontend/src/components/modal1/modal-form.tsx
+++ b/rsconcept/frontend/src/components/modal/modal-form.tsx
@@ -9,8 +9,8 @@ import { useEscapeKey } from '@/hooks/use-escape-key';
 import { useDialogsStore } from '@/stores/dialogs';
 import { prepareTooltip } from '@/utils/utils';
 
-import { Button, MiniButton, SubmitButton } from '../control1';
-import { IconClose } from '../icons1';
+import { Button, MiniButton, SubmitButton } from '../control';
+import { IconClose } from '../icons';
 import { type Styling } from '../props';
 
 import { ModalBackdrop } from './modal-backdrop';
diff --git a/rsconcept/frontend/src/components/modal1/modal-loader.tsx b/rsconcept/frontend/src/components/modal/modal-loader.tsx
similarity index 86%
rename from rsconcept/frontend/src/components/modal1/modal-loader.tsx
rename to rsconcept/frontend/src/components/modal/modal-loader.tsx
index 4da2d0d5..1992814f 100644
--- a/rsconcept/frontend/src/components/modal1/modal-loader.tsx
+++ b/rsconcept/frontend/src/components/modal/modal-loader.tsx
@@ -1,4 +1,4 @@
-import { Loader } from '@/components/loader1';
+import { Loader } from '@/components/loader';
 
 import { ModalBackdrop } from './modal-backdrop';
 
diff --git a/rsconcept/frontend/src/components/modal1/modal-view.tsx b/rsconcept/frontend/src/components/modal/modal-view.tsx
similarity index 96%
rename from rsconcept/frontend/src/components/modal1/modal-view.tsx
rename to rsconcept/frontend/src/components/modal/modal-view.tsx
index 6a766fe5..d3874e8b 100644
--- a/rsconcept/frontend/src/components/modal1/modal-view.tsx
+++ b/rsconcept/frontend/src/components/modal/modal-view.tsx
@@ -8,8 +8,8 @@ import { useEscapeKey } from '@/hooks/use-escape-key';
 import { useDialogsStore } from '@/stores/dialogs';
 import { prepareTooltip } from '@/utils/utils';
 
-import { Button, MiniButton } from '../control1';
-import { IconClose } from '../icons1';
+import { Button, MiniButton } from '../control';
+import { IconClose } from '../icons';
 
 import { ModalBackdrop } from './modal-backdrop';
 import { type ModalProps } from './modal-form';
diff --git a/rsconcept/frontend/src/components/tabs1/index.tsx b/rsconcept/frontend/src/components/tabs/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/tabs1/index.tsx
rename to rsconcept/frontend/src/components/tabs/index.tsx
diff --git a/rsconcept/frontend/src/components/tabs1/tab-label.tsx b/rsconcept/frontend/src/components/tabs/tab-label.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/tabs1/tab-label.tsx
rename to rsconcept/frontend/src/components/tabs/tab-label.tsx
diff --git a/rsconcept/frontend/src/components/view1/EmbedYoutube.tsx b/rsconcept/frontend/src/components/view/embed-youtube.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/view1/EmbedYoutube.tsx
rename to rsconcept/frontend/src/components/view/embed-youtube.tsx
diff --git a/rsconcept/frontend/src/components/view/index.tsx b/rsconcept/frontend/src/components/view/index.tsx
new file mode 100644
index 00000000..0dc55bdc
--- /dev/null
+++ b/rsconcept/frontend/src/components/view/index.tsx
@@ -0,0 +1,9 @@
+export { EmbedYoutube } from './embed-youtube';
+export { Indicator } from './indicator1';
+export { NoData } from './no-data';
+export { PDFViewer } from './pdf-viewer';
+export { PrettyJson } from './pretty-json';
+export { TextContent } from './text-content';
+export { ValueIcon } from './value-icon';
+export { ValueLabeled } from './value-labeled';
+export { ValueStats } from './value-stats';
diff --git a/rsconcept/frontend/src/components/view1/Indicator.tsx b/rsconcept/frontend/src/components/view/indicator1.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/view1/Indicator.tsx
rename to rsconcept/frontend/src/components/view/indicator1.tsx
diff --git a/rsconcept/frontend/src/components/view1/NoData.tsx b/rsconcept/frontend/src/components/view/no-data.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/view1/NoData.tsx
rename to rsconcept/frontend/src/components/view/no-data.tsx
diff --git a/rsconcept/frontend/src/components/view1/PDFViewer.tsx b/rsconcept/frontend/src/components/view/pdf-viewer.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/view1/PDFViewer.tsx
rename to rsconcept/frontend/src/components/view/pdf-viewer.tsx
diff --git a/rsconcept/frontend/src/components/view1/PrettyJSON.tsx b/rsconcept/frontend/src/components/view/pretty-json.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/view1/PrettyJSON.tsx
rename to rsconcept/frontend/src/components/view/pretty-json.tsx
diff --git a/rsconcept/frontend/src/components/view1/TextContent.tsx b/rsconcept/frontend/src/components/view/text-content.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/view1/TextContent.tsx
rename to rsconcept/frontend/src/components/view/text-content.tsx
diff --git a/rsconcept/frontend/src/components/view1/ValueIcon.tsx b/rsconcept/frontend/src/components/view/value-icon.tsx
similarity index 97%
rename from rsconcept/frontend/src/components/view1/ValueIcon.tsx
rename to rsconcept/frontend/src/components/view/value-icon.tsx
index 4dfdde7d..e9f942e3 100644
--- a/rsconcept/frontend/src/components/view1/ValueIcon.tsx
+++ b/rsconcept/frontend/src/components/view/value-icon.tsx
@@ -2,7 +2,7 @@ import clsx from 'clsx';
 
 import { globalIDs } from '@/utils/constants';
 
-import { MiniButton } from '../control1';
+import { MiniButton } from '../control';
 import { type Styling, type Titled } from '../props';
 
 interface ValueIconProps extends Styling, Titled {
diff --git a/rsconcept/frontend/src/components/view1/ValueLabeled.tsx b/rsconcept/frontend/src/components/view/value-labeled.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/view1/ValueLabeled.tsx
rename to rsconcept/frontend/src/components/view/value-labeled.tsx
diff --git a/rsconcept/frontend/src/components/view1/ValueStats.tsx b/rsconcept/frontend/src/components/view/value-stats.tsx
similarity index 93%
rename from rsconcept/frontend/src/components/view1/ValueStats.tsx
rename to rsconcept/frontend/src/components/view/value-stats.tsx
index 0bd69346..da92b417 100644
--- a/rsconcept/frontend/src/components/view1/ValueStats.tsx
+++ b/rsconcept/frontend/src/components/view/value-stats.tsx
@@ -1,6 +1,6 @@
 import { type Styling, type Titled } from '@/components/props';
 
-import { ValueIcon } from './ValueIcon';
+import { ValueIcon } from './value-icon';
 
 // characters - threshold for small labels - small font
 const SMALL_THRESHOLD = 3;
diff --git a/rsconcept/frontend/src/components/view1/index.tsx b/rsconcept/frontend/src/components/view1/index.tsx
deleted file mode 100644
index 7f8074dc..00000000
--- a/rsconcept/frontend/src/components/view1/index.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-export { EmbedYoutube } from './EmbedYoutube';
-export { Indicator } from './Indicator';
-export { NoData } from './NoData';
-export { PDFViewer } from './PDFViewer';
-export { PrettyJson } from './PrettyJSON';
-export { TextContent } from './TextContent';
-export { ValueIcon } from './ValueIcon';
-export { ValueLabeled } from './ValueLabeled';
-export { ValueStats } from './ValueStats';
diff --git a/rsconcept/frontend/src/features/auth/components/expected-anonymous.tsx b/rsconcept/frontend/src/features/auth/components/expected-anonymous.tsx
index db7fd8aa..c3ab59ec 100644
--- a/rsconcept/frontend/src/features/auth/components/expected-anonymous.tsx
+++ b/rsconcept/frontend/src/features/auth/components/expected-anonymous.tsx
@@ -1,6 +1,6 @@
 import { urls, useConceptNavigation } from '@/app';
 
-import { TextURL } from '@/components/control1';
+import { TextURL } from '@/components/control';
 
 import { useAuthSuspense } from '../backend/use-auth';
 import { useLogout } from '../backend/use-logout';
diff --git a/rsconcept/frontend/src/features/auth/components/require-auth.tsx b/rsconcept/frontend/src/features/auth/components/require-auth.tsx
index a1eef878..e9b8be7b 100644
--- a/rsconcept/frontend/src/features/auth/components/require-auth.tsx
+++ b/rsconcept/frontend/src/features/auth/components/require-auth.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { TextURL } from '@/components/control1';
+import { TextURL } from '@/components/control';
 
 import { useAuthSuspense } from '../backend/use-auth';
 
diff --git a/rsconcept/frontend/src/features/auth/pages/login-page.tsx b/rsconcept/frontend/src/features/auth/pages/login-page.tsx
index 0aedf9ec..5c7b17d5 100644
--- a/rsconcept/frontend/src/features/auth/pages/login-page.tsx
+++ b/rsconcept/frontend/src/features/auth/pages/login-page.tsx
@@ -6,9 +6,9 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { urls, useConceptNavigation } from '@/app';
 
 import { isAxiosError } from '@/backend/api-transport';
-import { SubmitButton, TextURL } from '@/components/control1';
+import { SubmitButton, TextURL } from '@/components/control';
 import { type ErrorData } from '@/components/info-error';
-import { TextInput } from '@/components/input1';
+import { TextInput } from '@/components/input';
 import { useQueryStrings } from '@/hooks/use-query-strings';
 import { resources } from '@/utils/constants';
 
diff --git a/rsconcept/frontend/src/features/auth/pages/password-change-page.tsx b/rsconcept/frontend/src/features/auth/pages/password-change-page.tsx
index 312a2ce2..1a8f7e9f 100644
--- a/rsconcept/frontend/src/features/auth/pages/password-change-page.tsx
+++ b/rsconcept/frontend/src/features/auth/pages/password-change-page.tsx
@@ -5,10 +5,10 @@ import { useEffect, useState } from 'react';
 import { urls, useConceptNavigation } from '@/app';
 
 import { isAxiosError } from '@/backend/api-transport';
-import { SubmitButton } from '@/components/control1';
+import { SubmitButton } from '@/components/control';
 import { type ErrorData, InfoError } from '@/components/info-error';
-import { TextInput } from '@/components/input1';
-import { Loader } from '@/components/loader1';
+import { TextInput } from '@/components/input';
+import { Loader } from '@/components/loader';
 import { useQueryStrings } from '@/hooks/use-query-strings';
 
 import { useResetPassword } from '../backend/use-reset-password';
diff --git a/rsconcept/frontend/src/features/auth/pages/restore-password-page.tsx b/rsconcept/frontend/src/features/auth/pages/restore-password-page.tsx
index d7059eeb..6e1558f6 100644
--- a/rsconcept/frontend/src/features/auth/pages/restore-password-page.tsx
+++ b/rsconcept/frontend/src/features/auth/pages/restore-password-page.tsx
@@ -3,9 +3,9 @@
 import { useState } from 'react';
 
 import { isAxiosError } from '@/backend/api-transport';
-import { SubmitButton, TextURL } from '@/components/control1';
+import { SubmitButton, TextURL } from '@/components/control';
 import { type ErrorData } from '@/components/info-error';
-import { TextInput } from '@/components/input1';
+import { TextInput } from '@/components/input';
 
 import { useRequestPasswordReset } from '../backend/use-request-password-reset';
 
diff --git a/rsconcept/frontend/src/features/help/components/badge-help.tsx b/rsconcept/frontend/src/features/help/components/badge-help.tsx
index 0ba1b558..84f6b12c 100644
--- a/rsconcept/frontend/src/features/help/components/badge-help.tsx
+++ b/rsconcept/frontend/src/features/help/components/badge-help.tsx
@@ -1,10 +1,10 @@
 import React, { Suspense } from 'react';
 import clsx from 'clsx';
 
-import { type PlacesType, Tooltip } from '@/components/container1';
-import { TextURL } from '@/components/control1';
-import { IconHelp } from '@/components/icons1';
-import { Loader } from '@/components/loader1';
+import { type PlacesType, Tooltip } from '@/components/container';
+import { TextURL } from '@/components/control';
+import { IconHelp } from '@/components/icons';
+import { Loader } from '@/components/loader';
 import { type Styling } from '@/components/props';
 import { usePreferencesStore } from '@/stores/preferences';
 import { PARAMETER } from '@/utils/constants';
diff --git a/rsconcept/frontend/src/features/help/components/link-topic.tsx b/rsconcept/frontend/src/features/help/components/link-topic.tsx
index 29087811..2af9a345 100644
--- a/rsconcept/frontend/src/features/help/components/link-topic.tsx
+++ b/rsconcept/frontend/src/features/help/components/link-topic.tsx
@@ -1,6 +1,6 @@
 import { urls } from '@/app';
 
-import { TextURL } from '@/components/control1';
+import { TextURL } from '@/components/control';
 
 import { type HelpTopic } from '../models/help-topic';
 
diff --git a/rsconcept/frontend/src/features/help/components/subtopics1.tsx b/rsconcept/frontend/src/features/help/components/subtopics.tsx
similarity index 100%
rename from rsconcept/frontend/src/features/help/components/subtopics1.tsx
rename to rsconcept/frontend/src/features/help/components/subtopics.tsx
diff --git a/rsconcept/frontend/src/features/help/items/cc/help-concept-oss.tsx b/rsconcept/frontend/src/features/help/items/cc/help-concept-oss.tsx
index 36ad9b2c..90a85eea 100644
--- a/rsconcept/frontend/src/features/help/items/cc/help-concept-oss.tsx
+++ b/rsconcept/frontend/src/features/help/items/cc/help-concept-oss.tsx
@@ -6,7 +6,7 @@ import {
   IconRSFormImported,
   IconRSFormOwned,
   IconSynthesis
-} from '@/components/icons1';
+} from '@/components/icons';
 
 import { LinkTopic } from '../../components/link-topic';
 import { HelpTopic } from '../../models/help-topic';
diff --git a/rsconcept/frontend/src/features/help/items/cc/help-concept-propagation.tsx b/rsconcept/frontend/src/features/help/items/cc/help-concept-propagation.tsx
index 245be962..f04245a8 100644
--- a/rsconcept/frontend/src/features/help/items/cc/help-concept-propagation.tsx
+++ b/rsconcept/frontend/src/features/help/items/cc/help-concept-propagation.tsx
@@ -1,4 +1,4 @@
-import { IconPredecessor } from '@/components/icons1';
+import { IconPredecessor } from '@/components/icons';
 
 import { LinkTopic } from '../../components/link-topic';
 import { HelpTopic } from '../../models/help-topic';
diff --git a/rsconcept/frontend/src/features/help/items/help-access.tsx b/rsconcept/frontend/src/features/help/items/help-access.tsx
index 90551cbe..fabfb964 100644
--- a/rsconcept/frontend/src/features/help/items/help-access.tsx
+++ b/rsconcept/frontend/src/features/help/items/help-access.tsx
@@ -1,4 +1,4 @@
-import { IconHide, IconImmutable, IconPrivate, IconProtected, IconPublic } from '@/components/icons1';
+import { IconHide, IconImmutable, IconPrivate, IconProtected, IconPublic } from '@/components/icons';
 
 export function HelpAccess() {
   return (
diff --git a/rsconcept/frontend/src/features/help/items/help-concept.tsx b/rsconcept/frontend/src/features/help/items/help-concept.tsx
index e7e325a3..a9b7dde8 100644
--- a/rsconcept/frontend/src/features/help/items/help-concept.tsx
+++ b/rsconcept/frontend/src/features/help/items/help-concept.tsx
@@ -1,7 +1,7 @@
-import { TextURL } from '@/components/control1';
+import { TextURL } from '@/components/control';
 import { external_urls } from '@/utils/constants';
 
-import { Subtopics } from '../components/subtopics1';
+import { Subtopics } from '../components/subtopics';
 import { HelpTopic } from '../models/help-topic';
 
 export function HelpConcept() {
diff --git a/rsconcept/frontend/src/features/help/items/help-exteor.tsx b/rsconcept/frontend/src/features/help/items/help-exteor.tsx
index 499a6220..2d080a80 100644
--- a/rsconcept/frontend/src/features/help/items/help-exteor.tsx
+++ b/rsconcept/frontend/src/features/help/items/help-exteor.tsx
@@ -1,4 +1,4 @@
-import { TextURL } from '@/components/control1';
+import { TextURL } from '@/components/control';
 import { external_urls, PARAMETER } from '@/utils/constants';
 
 export function HelpExteor() {
diff --git a/rsconcept/frontend/src/features/help/items/help-info.tsx b/rsconcept/frontend/src/features/help/items/help-info.tsx
index f413992f..7cf697df 100644
--- a/rsconcept/frontend/src/features/help/items/help-info.tsx
+++ b/rsconcept/frontend/src/features/help/items/help-info.tsx
@@ -1,4 +1,4 @@
-import { Subtopics } from '../components/subtopics1';
+import { Subtopics } from '../components/subtopics';
 import { HelpTopic } from '../models/help-topic';
 
 export function HelpInfo() {
diff --git a/rsconcept/frontend/src/features/help/items/help-interface.tsx b/rsconcept/frontend/src/features/help/items/help-interface.tsx
index b70355cb..347233da 100644
--- a/rsconcept/frontend/src/features/help/items/help-interface.tsx
+++ b/rsconcept/frontend/src/features/help/items/help-interface.tsx
@@ -7,9 +7,9 @@ import {
   IconLogout,
   IconPin,
   IconUser2
-} from '@/components/icons1';
+} from '@/components/icons';
 
-import { Subtopics } from '../components/subtopics1';
+import { Subtopics } from '../components/subtopics';
 import { HelpTopic } from '../models/help-topic';
 
 export function HelpInterface() {
diff --git a/rsconcept/frontend/src/features/help/items/help-main.tsx b/rsconcept/frontend/src/features/help/items/help-main.tsx
index 6f014e2f..fbc39312 100644
--- a/rsconcept/frontend/src/features/help/items/help-main.tsx
+++ b/rsconcept/frontend/src/features/help/items/help-main.tsx
@@ -1,4 +1,4 @@
-import { TextURL } from '@/components/control1';
+import { TextURL } from '@/components/control';
 import { external_urls, prefixes } from '@/utils/constants';
 
 import { LinkTopic } from '../components/link-topic';
diff --git a/rsconcept/frontend/src/features/help/items/help-rslang.tsx b/rsconcept/frontend/src/features/help/items/help-rslang.tsx
index d096b066..76c8176e 100644
--- a/rsconcept/frontend/src/features/help/items/help-rslang.tsx
+++ b/rsconcept/frontend/src/features/help/items/help-rslang.tsx
@@ -1,8 +1,8 @@
-import { EmbedYoutube } from '@/components/view1';
+import { EmbedYoutube } from '@/components/view';
 import { useWindowSize } from '@/hooks/use-window-size';
 import { external_urls, youtube } from '@/utils/constants';
 
-import { Subtopics } from '../components/subtopics1';
+import { Subtopics } from '../components/subtopics';
 import { HelpTopic } from '../models/help-topic';
 
 export function HelpRSLang() {
diff --git a/rsconcept/frontend/src/features/help/items/help-thesaurus.tsx b/rsconcept/frontend/src/features/help/items/help-thesaurus.tsx
index 97e9cd84..f7d6e71e 100644
--- a/rsconcept/frontend/src/features/help/items/help-thesaurus.tsx
+++ b/rsconcept/frontend/src/features/help/items/help-thesaurus.tsx
@@ -25,7 +25,7 @@ import {
   IconStatusProperty,
   IconStatusUnknown,
   IconSynthesis
-} from '@/components/icons1';
+} from '@/components/icons';
 
 import { LinkTopic } from '../components/link-topic';
 import { HelpTopic } from '../models/help-topic';
diff --git a/rsconcept/frontend/src/features/help/items/help-versions.tsx b/rsconcept/frontend/src/features/help/items/help-versions.tsx
index 79042876..7bb149d5 100644
--- a/rsconcept/frontend/src/features/help/items/help-versions.tsx
+++ b/rsconcept/frontend/src/features/help/items/help-versions.tsx
@@ -1,4 +1,4 @@
-import { IconEditor, IconNewVersion, IconShare, IconUpload, IconVersions } from '@/components/icons1';
+import { IconEditor, IconNewVersion, IconShare, IconUpload, IconVersions } from '@/components/icons';
 
 export function HelpVersions() {
   return (
diff --git a/rsconcept/frontend/src/features/help/items/info/help-api.tsx b/rsconcept/frontend/src/features/help/items/info/help-api.tsx
index 14510b0a..4f286721 100644
--- a/rsconcept/frontend/src/features/help/items/info/help-api.tsx
+++ b/rsconcept/frontend/src/features/help/items/info/help-api.tsx
@@ -1,4 +1,4 @@
-import { TextURL } from '@/components/control1';
+import { TextURL } from '@/components/control';
 import { external_urls } from '@/utils/constants';
 
 export function HelpAPI() {
diff --git a/rsconcept/frontend/src/features/help/items/info/help-contributors.tsx b/rsconcept/frontend/src/features/help/items/info/help-contributors.tsx
index 2a633760..653e1bc6 100644
--- a/rsconcept/frontend/src/features/help/items/info/help-contributors.tsx
+++ b/rsconcept/frontend/src/features/help/items/info/help-contributors.tsx
@@ -1,4 +1,4 @@
-import { TextURL } from '@/components/control1';
+import { TextURL } from '@/components/control';
 import { external_urls } from '@/utils/constants';
 
 import { LinkTopic } from '../../components/link-topic';
diff --git a/rsconcept/frontend/src/features/help/items/info/help-privacy.tsx b/rsconcept/frontend/src/features/help/items/info/help-privacy.tsx
index c33c2e57..e8e7cf41 100644
--- a/rsconcept/frontend/src/features/help/items/info/help-privacy.tsx
+++ b/rsconcept/frontend/src/features/help/items/info/help-privacy.tsx
@@ -1,4 +1,4 @@
-import { PDFViewer } from '@/components/view1';
+import { PDFViewer } from '@/components/view';
 import { resources } from '@/utils/constants';
 
 interface HelpPrivacyProps {
diff --git a/rsconcept/frontend/src/features/help/items/info/help-rules.tsx b/rsconcept/frontend/src/features/help/items/info/help-rules.tsx
index 6ce02fc6..6dedc81a 100644
--- a/rsconcept/frontend/src/features/help/items/info/help-rules.tsx
+++ b/rsconcept/frontend/src/features/help/items/info/help-rules.tsx
@@ -1,6 +1,6 @@
 import { urls } from '@/app';
 
-import { TextURL } from '@/components/control1';
+import { TextURL } from '@/components/control';
 import { external_urls } from '@/utils/constants';
 
 export function HelpRules() {
diff --git a/rsconcept/frontend/src/features/help/items/rslang/help-rslang-operations.tsx b/rsconcept/frontend/src/features/help/items/rslang/help-rslang-operations.tsx
index 31a432e8..694f5fbe 100644
--- a/rsconcept/frontend/src/features/help/items/rslang/help-rslang-operations.tsx
+++ b/rsconcept/frontend/src/features/help/items/rslang/help-rslang-operations.tsx
@@ -5,7 +5,7 @@ import {
   IconReplace,
   IconSortList,
   IconTemplates
-} from '@/components/icons1';
+} from '@/components/icons';
 
 import { LinkTopic } from '../../components/link-topic';
 import { HelpTopic } from '../../models/help-topic';
diff --git a/rsconcept/frontend/src/features/help/items/ui/help-library.tsx b/rsconcept/frontend/src/features/help/items/ui/help-library.tsx
index 6a816e00..e4eee3db 100644
--- a/rsconcept/frontend/src/features/help/items/ui/help-library.tsx
+++ b/rsconcept/frontend/src/features/help/items/ui/help-library.tsx
@@ -15,7 +15,7 @@ import {
   IconSortDesc,
   IconSubfolders,
   IconUserSearch
-} from '@/components/icons1';
+} from '@/components/icons';
 import { APP_COLORS } from '@/styling/colors';
 
 import { LinkTopic } from '../../components/link-topic';
diff --git a/rsconcept/frontend/src/features/help/items/ui/help-oss-graph.tsx b/rsconcept/frontend/src/features/help/items/ui/help-oss-graph.tsx
index b3f6037f..96b1910f 100644
--- a/rsconcept/frontend/src/features/help/items/ui/help-oss-graph.tsx
+++ b/rsconcept/frontend/src/features/help/items/ui/help-oss-graph.tsx
@@ -1,4 +1,4 @@
-import { Divider } from '@/components/container1';
+import { Divider } from '@/components/container';
 import {
   IconAnimation,
   IconAnimationOff,
@@ -17,7 +17,7 @@ import {
   IconReset,
   IconRSForm,
   IconSave
-} from '@/components/icons1';
+} from '@/components/icons';
 
 import { LinkTopic } from '../../components/link-topic';
 import { HelpTopic } from '../../models/help-topic';
diff --git a/rsconcept/frontend/src/features/help/items/ui/help-relocate-cst.tsx b/rsconcept/frontend/src/features/help/items/ui/help-relocate-cst.tsx
index 3f95a68e..7659a47e 100644
--- a/rsconcept/frontend/src/features/help/items/ui/help-relocate-cst.tsx
+++ b/rsconcept/frontend/src/features/help/items/ui/help-relocate-cst.tsx
@@ -1,4 +1,4 @@
-import { IconMoveDown, IconMoveUp, IconOSS, IconPredecessor } from '@/components/icons1';
+import { IconMoveDown, IconMoveUp, IconOSS, IconPredecessor } from '@/components/icons';
 
 import { LinkTopic } from '../../components/link-topic';
 import { HelpTopic } from '../../models/help-topic';
diff --git a/rsconcept/frontend/src/features/help/items/ui/help-rscard.tsx b/rsconcept/frontend/src/features/help/items/ui/help-rscard.tsx
index 157ff74d..486b9adf 100644
--- a/rsconcept/frontend/src/features/help/items/ui/help-rscard.tsx
+++ b/rsconcept/frontend/src/features/help/items/ui/help-rscard.tsx
@@ -8,7 +8,7 @@ import {
   IconOwner,
   IconPublic,
   IconSave
-} from '@/components/icons1';
+} from '@/components/icons';
 
 import { LinkTopic } from '../../components/link-topic';
 import { HelpTopic } from '../../models/help-topic';
diff --git a/rsconcept/frontend/src/features/help/items/ui/help-rseditor.tsx b/rsconcept/frontend/src/features/help/items/ui/help-rseditor.tsx
index 43287e92..7ff846ad 100644
--- a/rsconcept/frontend/src/features/help/items/ui/help-rseditor.tsx
+++ b/rsconcept/frontend/src/features/help/items/ui/help-rseditor.tsx
@@ -17,7 +17,7 @@ import {
   IconStatusOK,
   IconTree,
   IconTypeGraph
-} from '@/components/icons1';
+} from '@/components/icons';
 import { APP_COLORS } from '@/styling/colors';
 
 import { LinkTopic } from '../../components/link-topic';
diff --git a/rsconcept/frontend/src/features/help/items/ui/help-rsgraph-term.tsx b/rsconcept/frontend/src/features/help/items/ui/help-rsgraph-term.tsx
index 2c250332..55b40870 100644
--- a/rsconcept/frontend/src/features/help/items/ui/help-rsgraph-term.tsx
+++ b/rsconcept/frontend/src/features/help/items/ui/help-rsgraph-term.tsx
@@ -1,4 +1,4 @@
-import { Divider } from '@/components/container1';
+import { Divider } from '@/components/container';
 import {
   IconClustering,
   IconDestroy,
@@ -18,7 +18,7 @@ import {
   IconRotate3D,
   IconText,
   IconTypeGraph
-} from '@/components/icons1';
+} from '@/components/icons';
 import { APP_COLORS } from '@/styling/colors';
 
 import { LinkTopic } from '../../components/link-topic';
diff --git a/rsconcept/frontend/src/features/help/items/ui/help-rslist.tsx b/rsconcept/frontend/src/features/help/items/ui/help-rslist.tsx
index dc9df108..3274228d 100644
--- a/rsconcept/frontend/src/features/help/items/ui/help-rslist.tsx
+++ b/rsconcept/frontend/src/features/help/items/ui/help-rslist.tsx
@@ -1,4 +1,4 @@
-import { Divider } from '@/components/container1';
+import { Divider } from '@/components/container';
 import {
   IconAlias,
   IconClone,
@@ -9,7 +9,7 @@ import {
   IconOpenList,
   IconOSS,
   IconReset
-} from '@/components/icons1';
+} from '@/components/icons';
 
 import { InfoCstStatus } from '../../components/info-cst-status';
 import { LinkTopic } from '../../components/link-topic';
diff --git a/rsconcept/frontend/src/features/help/items/ui/help-rsmenu.tsx b/rsconcept/frontend/src/features/help/items/ui/help-rsmenu.tsx
index ba19b9e9..97ffcfb4 100644
--- a/rsconcept/frontend/src/features/help/items/ui/help-rsmenu.tsx
+++ b/rsconcept/frontend/src/features/help/items/ui/help-rsmenu.tsx
@@ -1,4 +1,4 @@
-import { Divider } from '@/components/container1';
+import { Divider } from '@/components/container';
 import {
   IconAdmin,
   IconAlert,
@@ -13,7 +13,7 @@ import {
   IconReader,
   IconShare,
   IconUpload
-} from '@/components/icons1';
+} from '@/components/icons';
 
 import { LinkTopic } from '../../components/link-topic';
 import { HelpTopic } from '../../models/help-topic';
diff --git a/rsconcept/frontend/src/features/help/pages/manuals-page/topics-dropdown.tsx b/rsconcept/frontend/src/features/help/pages/manuals-page/topics-dropdown.tsx
index b18f9447..013bc072 100644
--- a/rsconcept/frontend/src/features/help/pages/manuals-page/topics-dropdown.tsx
+++ b/rsconcept/frontend/src/features/help/pages/manuals-page/topics-dropdown.tsx
@@ -2,10 +2,10 @@
 
 import clsx from 'clsx';
 
-import { Button } from '@/components/control1';
-import { useDropdown } from '@/components/dropdown1';
-import { IconMenuFold, IconMenuUnfold } from '@/components/icons1';
-import { SelectTree } from '@/components/input1';
+import { Button } from '@/components/control';
+import { useDropdown } from '@/components/dropdown';
+import { IconMenuFold, IconMenuUnfold } from '@/components/icons';
+import { SelectTree } from '@/components/input';
 import { useAppLayoutStore, useFitHeight } from '@/stores/app-layout';
 import { PARAMETER, prefixes } from '@/utils/constants';
 
diff --git a/rsconcept/frontend/src/features/help/pages/manuals-page/topics-static.tsx b/rsconcept/frontend/src/features/help/pages/manuals-page/topics-static.tsx
index 12ad330b..d5fa4b93 100644
--- a/rsconcept/frontend/src/features/help/pages/manuals-page/topics-static.tsx
+++ b/rsconcept/frontend/src/features/help/pages/manuals-page/topics-static.tsx
@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 
-import { SelectTree } from '@/components/input1';
+import { SelectTree } from '@/components/input';
 import { useFitHeight } from '@/stores/app-layout';
 import { prefixes } from '@/utils/constants';
 
diff --git a/rsconcept/frontend/src/features/home/icons-page.tsx b/rsconcept/frontend/src/features/home/icons-page.tsx
index 169202f4..3122c446 100644
--- a/rsconcept/frontend/src/features/home/icons-page.tsx
+++ b/rsconcept/frontend/src/features/home/icons-page.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-nocheck
-import * as icons from '@/components/icons1';
+import * as icons from '@/components/icons';
 
 export function Component() {
   const iconsList = Object.keys(icons).filter(key => key.startsWith('Icon'));
diff --git a/rsconcept/frontend/src/features/home/not-found-page.tsx b/rsconcept/frontend/src/features/home/not-found-page.tsx
index 06d447e9..3c6bdce0 100644
--- a/rsconcept/frontend/src/features/home/not-found-page.tsx
+++ b/rsconcept/frontend/src/features/home/not-found-page.tsx
@@ -1,4 +1,4 @@
-import { TextURL } from '@/components/control1';
+import { TextURL } from '@/components/control';
 
 export function NotFoundPage() {
   return (
diff --git a/rsconcept/frontend/src/features/library/components/editor-library-item.tsx b/rsconcept/frontend/src/features/library/components/editor-library-item.tsx
index c20d79d1..9ab44ac9 100644
--- a/rsconcept/frontend/src/features/library/components/editor-library-item.tsx
+++ b/rsconcept/frontend/src/features/library/components/editor-library-item.tsx
@@ -5,9 +5,9 @@ import { urls, useConceptNavigation } from '@/app';
 import { useLabelUser, useRoleStore, UserRole } from '@/features/users';
 import { InfoUsers, SelectUser } from '@/features/users/components';
 
-import { Tooltip } from '@/components/container1';
-import { MiniButton } from '@/components/control1';
-import { useDropdown } from '@/components/dropdown1';
+import { Tooltip } from '@/components/container';
+import { MiniButton } from '@/components/control';
+import { useDropdown } from '@/components/dropdown';
 import {
   IconDateCreate,
   IconDateUpdate,
@@ -15,9 +15,9 @@ import {
   IconFolderEdit,
   IconFolderOpened,
   IconOwner
-} from '@/components/icons1';
-import { Loader } from '@/components/loader1';
-import { ValueIcon } from '@/components/view1';
+} from '@/components/icons';
+import { Loader } from '@/components/loader';
+import { ValueIcon } from '@/components/view';
 import { useDialogsStore } from '@/stores/dialogs';
 import { useModificationStore } from '@/stores/modification';
 import { prefixes } from '@/utils/constants';
diff --git a/rsconcept/frontend/src/features/library/components/icon-access-policy.tsx b/rsconcept/frontend/src/features/library/components/icon-access-policy.tsx
index d1d782fd..775eb60f 100644
--- a/rsconcept/frontend/src/features/library/components/icon-access-policy.tsx
+++ b/rsconcept/frontend/src/features/library/components/icon-access-policy.tsx
@@ -1,4 +1,4 @@
-import { type DomIconProps, IconPrivate, IconProtected, IconPublic } from '@/components/icons1';
+import { type DomIconProps, IconPrivate, IconProtected, IconPublic } from '@/components/icons';
 
 import { AccessPolicy } from '../backend/types';
 
diff --git a/rsconcept/frontend/src/features/library/components/icon-item-visibility.tsx b/rsconcept/frontend/src/features/library/components/icon-item-visibility.tsx
index 238f67a8..0659c37e 100644
--- a/rsconcept/frontend/src/features/library/components/icon-item-visibility.tsx
+++ b/rsconcept/frontend/src/features/library/components/icon-item-visibility.tsx
@@ -1,4 +1,4 @@
-import { type DomIconProps, IconHide, IconShow } from '@/components/icons1';
+import { type DomIconProps, IconHide, IconShow } from '@/components/icons';
 
 /** Icon for visibility. */
 export function IconItemVisibility({ value, size = '1.25rem', className }: DomIconProps<boolean>) {
diff --git a/rsconcept/frontend/src/features/library/components/icon-library-item-type.tsx b/rsconcept/frontend/src/features/library/components/icon-library-item-type.tsx
index 1b93485b..259d42ea 100644
--- a/rsconcept/frontend/src/features/library/components/icon-library-item-type.tsx
+++ b/rsconcept/frontend/src/features/library/components/icon-library-item-type.tsx
@@ -1,4 +1,4 @@
-import { type DomIconProps, IconOSS, IconRSForm } from '@/components/icons1';
+import { type DomIconProps, IconOSS, IconRSForm } from '@/components/icons';
 
 import { LibraryItemType } from '../backend/types';
 
diff --git a/rsconcept/frontend/src/features/library/components/icon-location-head.tsx b/rsconcept/frontend/src/features/library/components/icon-location-head.tsx
index dffeacb1..ba088be6 100644
--- a/rsconcept/frontend/src/features/library/components/icon-location-head.tsx
+++ b/rsconcept/frontend/src/features/library/components/icon-location-head.tsx
@@ -1,4 +1,4 @@
-import { type DomIconProps, IconBusiness, IconPublic, IconTemplates, IconUser } from '@/components/icons1';
+import { type DomIconProps, IconBusiness, IconPublic, IconTemplates, IconUser } from '@/components/icons';
 
 import { LocationHead } from '../models/library';
 
diff --git a/rsconcept/frontend/src/features/library/components/icon-role.tsx b/rsconcept/frontend/src/features/library/components/icon-role.tsx
index 314c599f..bc840178 100644
--- a/rsconcept/frontend/src/features/library/components/icon-role.tsx
+++ b/rsconcept/frontend/src/features/library/components/icon-role.tsx
@@ -1,6 +1,6 @@
 import { UserRole } from '@/features/users';
 
-import { IconAdmin, IconEditor, IconOwner, IconReader } from '@/components/icons1';
+import { IconAdmin, IconEditor, IconOwner, IconReader } from '@/components/icons';
 
 interface IconRoleProps {
   role: UserRole;
diff --git a/rsconcept/frontend/src/features/library/components/icon-show-subfolders.tsx b/rsconcept/frontend/src/features/library/components/icon-show-subfolders.tsx
index 320bb7e4..f8c6ed4c 100644
--- a/rsconcept/frontend/src/features/library/components/icon-show-subfolders.tsx
+++ b/rsconcept/frontend/src/features/library/components/icon-show-subfolders.tsx
@@ -1,4 +1,4 @@
-import { type DomIconProps, IconSubfolders } from '@/components/icons1';
+import { type DomIconProps, IconSubfolders } from '@/components/icons';
 
 /** Icon for subfolders. */
 export function IconShowSubfolders({ value, size = '1.25rem', className }: DomIconProps<boolean>) {
diff --git a/rsconcept/frontend/src/features/library/components/menu-role.tsx b/rsconcept/frontend/src/features/library/components/menu-role.tsx
index d5d972e6..4b15be6a 100644
--- a/rsconcept/frontend/src/features/library/components/menu-role.tsx
+++ b/rsconcept/frontend/src/features/library/components/menu-role.tsx
@@ -3,9 +3,9 @@ import { useAuthSuspense } from '@/features/auth';
 import { useRoleStore, UserRole } from '@/features/users';
 import { describeUserRole, labelUserRole } from '@/features/users/labels';
 
-import { Button } from '@/components/control1';
-import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown1';
-import { IconAlert } from '@/components/icons1';
+import { Button } from '@/components/control';
+import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown';
+import { IconAlert } from '@/components/icons';
 
 import { IconRole } from './icon-role';
 
diff --git a/rsconcept/frontend/src/features/library/components/mini-selector-oss.tsx b/rsconcept/frontend/src/features/library/components/mini-selector-oss.tsx
index 786c1f9e..ee6c3c7a 100644
--- a/rsconcept/frontend/src/features/library/components/mini-selector-oss.tsx
+++ b/rsconcept/frontend/src/features/library/components/mini-selector-oss.tsx
@@ -2,10 +2,10 @@
 
 import clsx from 'clsx';
 
-import { MiniButton } from '@/components/control1';
-import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown1';
-import { IconOSS } from '@/components/icons1';
-import { Label } from '@/components/input1';
+import { MiniButton } from '@/components/control';
+import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown';
+import { IconOSS } from '@/components/icons';
+import { Label } from '@/components/input';
 import { type Styling } from '@/components/props';
 import { prefixes } from '@/utils/constants';
 
diff --git a/rsconcept/frontend/src/features/library/components/pick-location/pick-location.tsx b/rsconcept/frontend/src/features/library/components/pick-location/pick-location.tsx
index 4d173d9f..f6d97137 100644
--- a/rsconcept/frontend/src/features/library/components/pick-location/pick-location.tsx
+++ b/rsconcept/frontend/src/features/library/components/pick-location/pick-location.tsx
@@ -5,7 +5,7 @@ import clsx from 'clsx';
 
 import { useAuthSuspense } from '@/features/auth';
 
-import { Label, TextArea } from '@/components/input1';
+import { Label, TextArea } from '@/components/input';
 import { type Styling } from '@/components/props';
 
 import { LocationHead } from '../../models/library';
diff --git a/rsconcept/frontend/src/features/library/components/pick-location/select-location-context.tsx b/rsconcept/frontend/src/features/library/components/pick-location/select-location-context.tsx
index f17986e4..074df8a8 100644
--- a/rsconcept/frontend/src/features/library/components/pick-location/select-location-context.tsx
+++ b/rsconcept/frontend/src/features/library/components/pick-location/select-location-context.tsx
@@ -2,9 +2,9 @@
 
 import clsx from 'clsx';
 
-import { MiniButton } from '@/components/control1';
-import { Dropdown, useDropdown } from '@/components/dropdown1';
-import { IconFolderTree } from '@/components/icons1';
+import { MiniButton } from '@/components/control';
+import { Dropdown, useDropdown } from '@/components/dropdown';
+import { IconFolderTree } from '@/components/icons';
 import { type Styling } from '@/components/props';
 import { prefixes } from '@/utils/constants';
 
diff --git a/rsconcept/frontend/src/features/library/components/pick-schema.tsx b/rsconcept/frontend/src/features/library/components/pick-schema.tsx
index 9a27d9b4..c7843df8 100644
--- a/rsconcept/frontend/src/features/library/components/pick-schema.tsx
+++ b/rsconcept/frontend/src/features/library/components/pick-schema.tsx
@@ -2,11 +2,11 @@ import { useState } from 'react';
 import { useIntl } from 'react-intl';
 import clsx from 'clsx';
 
-import { MiniButton } from '@/components/control1';
+import { MiniButton } from '@/components/control';
 import { createColumnHelper, DataTable, type IConditionalStyle } from '@/components/data-table';
-import { Dropdown, useDropdown } from '@/components/dropdown1';
-import { IconClose, IconFolderTree } from '@/components/icons1';
-import { SearchBar } from '@/components/input1';
+import { Dropdown, useDropdown } from '@/components/dropdown';
+import { IconClose, IconFolderTree } from '@/components/icons';
+import { SearchBar } from '@/components/input';
 import { type Styling } from '@/components/props';
 import { APP_COLORS } from '@/styling/colors';
 import { prefixes } from '@/utils/constants';
diff --git a/rsconcept/frontend/src/features/library/components/select-access-policy.tsx b/rsconcept/frontend/src/features/library/components/select-access-policy.tsx
index b131ab6f..c5e05eb7 100644
--- a/rsconcept/frontend/src/features/library/components/select-access-policy.tsx
+++ b/rsconcept/frontend/src/features/library/components/select-access-policy.tsx
@@ -2,8 +2,8 @@
 
 import clsx from 'clsx';
 
-import { MiniButton } from '@/components/control1';
-import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown1';
+import { MiniButton } from '@/components/control';
+import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown';
 import { type Styling } from '@/components/props';
 import { prefixes } from '@/utils/constants';
 
diff --git a/rsconcept/frontend/src/features/library/components/select-item-type.tsx b/rsconcept/frontend/src/features/library/components/select-item-type.tsx
index c583cef0..229e0b0d 100644
--- a/rsconcept/frontend/src/features/library/components/select-item-type.tsx
+++ b/rsconcept/frontend/src/features/library/components/select-item-type.tsx
@@ -2,8 +2,8 @@
 
 import clsx from 'clsx';
 
-import { SelectorButton } from '@/components/control1';
-import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown1';
+import { SelectorButton } from '@/components/control';
+import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown';
 import { type Styling } from '@/components/props';
 import { prefixes } from '@/utils/constants';
 
diff --git a/rsconcept/frontend/src/features/library/components/select-library-item.tsx b/rsconcept/frontend/src/features/library/components/select-library-item.tsx
index 01da3aec..54e7b83b 100644
--- a/rsconcept/frontend/src/features/library/components/select-library-item.tsx
+++ b/rsconcept/frontend/src/features/library/components/select-library-item.tsx
@@ -2,7 +2,7 @@
 
 import clsx from 'clsx';
 
-import { SelectSingle } from '@/components/input1';
+import { SelectSingle } from '@/components/input';
 import { type Styling } from '@/components/props';
 
 import { type ILibraryItem } from '../backend/types';
diff --git a/rsconcept/frontend/src/features/library/components/select-location-head.tsx b/rsconcept/frontend/src/features/library/components/select-location-head.tsx
index 2cd8fc9d..ae321606 100644
--- a/rsconcept/frontend/src/features/library/components/select-location-head.tsx
+++ b/rsconcept/frontend/src/features/library/components/select-location-head.tsx
@@ -2,8 +2,8 @@
 
 import clsx from 'clsx';
 
-import { SelectorButton } from '@/components/control1';
-import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown1';
+import { SelectorButton } from '@/components/control';
+import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown';
 import { type Styling } from '@/components/props';
 import { prefixes } from '@/utils/constants';
 
diff --git a/rsconcept/frontend/src/features/library/components/select-location.tsx b/rsconcept/frontend/src/features/library/components/select-location.tsx
index d6c2ea90..80b10fb7 100644
--- a/rsconcept/frontend/src/features/library/components/select-location.tsx
+++ b/rsconcept/frontend/src/features/library/components/select-location.tsx
@@ -3,8 +3,8 @@
 import { useEffect, useState } from 'react';
 import clsx from 'clsx';
 
-import { MiniButton } from '@/components/control1';
-import { IconFolder, IconFolderClosed, IconFolderEmpty, IconFolderOpened } from '@/components/icons1';
+import { MiniButton } from '@/components/control';
+import { IconFolder, IconFolderClosed, IconFolderEmpty, IconFolderOpened } from '@/components/icons';
 import { type Styling } from '@/components/props';
 
 import { useFolders } from '../backend/use-folders';
diff --git a/rsconcept/frontend/src/features/library/components/select-version.tsx b/rsconcept/frontend/src/features/library/components/select-version.tsx
index ed68806b..b296474f 100644
--- a/rsconcept/frontend/src/features/library/components/select-version.tsx
+++ b/rsconcept/frontend/src/features/library/components/select-version.tsx
@@ -2,7 +2,7 @@
 
 import clsx from 'clsx';
 
-import { SelectSingle } from '@/components/input1';
+import { SelectSingle } from '@/components/input';
 import { type Styling } from '@/components/props';
 
 import { labelVersion } from '../../rsform/labels';
diff --git a/rsconcept/frontend/src/features/library/components/toolbar-item-access.tsx b/rsconcept/frontend/src/features/library/components/toolbar-item-access.tsx
index 6dfc9876..cc1795ba 100644
--- a/rsconcept/frontend/src/features/library/components/toolbar-item-access.tsx
+++ b/rsconcept/frontend/src/features/library/components/toolbar-item-access.tsx
@@ -4,9 +4,9 @@ import { HelpTopic } from '@/features/help';
 import { BadgeHelp } from '@/features/help/components';
 import { useRoleStore, UserRole } from '@/features/users';
 
-import { MiniButton } from '@/components/control1';
-import { IconImmutable, IconMutable } from '@/components/icons1';
-import { Label } from '@/components/input1';
+import { MiniButton } from '@/components/control';
+import { IconImmutable, IconMutable } from '@/components/icons';
+import { Label } from '@/components/input';
 
 import { type AccessPolicy, type ILibraryItem } from '../backend/types';
 import { useMutatingLibrary } from '../backend/use-mutating-library';
diff --git a/rsconcept/frontend/src/features/library/components/toolbar-item-card.tsx b/rsconcept/frontend/src/features/library/components/toolbar-item-card.tsx
index 235ab61c..d04930ef 100644
--- a/rsconcept/frontend/src/features/library/components/toolbar-item-card.tsx
+++ b/rsconcept/frontend/src/features/library/components/toolbar-item-card.tsx
@@ -8,8 +8,8 @@ import { BadgeHelp } from '@/features/help/components';
 import { type IRSForm } from '@/features/rsform';
 import { useRoleStore, UserRole } from '@/features/users';
 
-import { MiniButton } from '@/components/control1';
-import { IconDestroy, IconSave, IconShare } from '@/components/icons1';
+import { MiniButton } from '@/components/control';
+import { IconDestroy, IconSave, IconShare } from '@/components/icons';
 import { useModificationStore } from '@/stores/modification';
 import { tooltipText } from '@/utils/labels';
 import { prepareTooltip, sharePage } from '@/utils/utils';
diff --git a/rsconcept/frontend/src/features/library/dialogs/dlg-change-location.tsx b/rsconcept/frontend/src/features/library/dialogs/dlg-change-location.tsx
index e73bad74..def0c661 100644
--- a/rsconcept/frontend/src/features/library/dialogs/dlg-change-location.tsx
+++ b/rsconcept/frontend/src/features/library/dialogs/dlg-change-location.tsx
@@ -4,7 +4,7 @@ import { Controller, useForm } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { z } from 'zod';
 
-import { ModalForm } from '@/components/modal1';
+import { ModalForm } from '@/components/modal';
 import { useDialogsStore } from '@/stores/dialogs';
 import { limits } from '@/utils/constants';
 import { errorMsg } from '@/utils/labels';
diff --git a/rsconcept/frontend/src/features/library/dialogs/dlg-clone-library-item.tsx b/rsconcept/frontend/src/features/library/dialogs/dlg-clone-library-item.tsx
index a90be6a8..97c6e60b 100644
--- a/rsconcept/frontend/src/features/library/dialogs/dlg-clone-library-item.tsx
+++ b/rsconcept/frontend/src/features/library/dialogs/dlg-clone-library-item.tsx
@@ -5,9 +5,9 @@ import { zodResolver } from '@hookform/resolvers/zod';
 
 import { urls, useConceptNavigation } from '@/app';
 
-import { MiniButton } from '@/components/control1';
-import { Checkbox, Label, TextArea, TextInput } from '@/components/input1';
-import { ModalForm } from '@/components/modal1';
+import { MiniButton } from '@/components/control';
+import { Checkbox, Label, TextArea, TextInput } from '@/components/input';
+import { ModalForm } from '@/components/modal';
 import { useDialogsStore } from '@/stores/dialogs';
 
 import { AccessPolicy, type ICloneLibraryItemDTO, type ILibraryItem, schemaCloneLibraryItem } from '../backend/types';
diff --git a/rsconcept/frontend/src/features/library/dialogs/dlg-create-version.tsx b/rsconcept/frontend/src/features/library/dialogs/dlg-create-version.tsx
index 09dad646..81acacf5 100644
--- a/rsconcept/frontend/src/features/library/dialogs/dlg-create-version.tsx
+++ b/rsconcept/frontend/src/features/library/dialogs/dlg-create-version.tsx
@@ -3,8 +3,8 @@
 import { Controller, useForm, useWatch } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 
-import { Checkbox, TextArea, TextInput } from '@/components/input1';
-import { ModalForm } from '@/components/modal1';
+import { Checkbox, TextArea, TextInput } from '@/components/input';
+import { ModalForm } from '@/components/modal';
 import { useDialogsStore } from '@/stores/dialogs';
 import { errorMsg } from '@/utils/labels';
 
diff --git a/rsconcept/frontend/src/features/library/dialogs/dlg-edit-editors/dlg-edit-editors.tsx b/rsconcept/frontend/src/features/library/dialogs/dlg-edit-editors/dlg-edit-editors.tsx
index 8d38c3f4..e833a90b 100644
--- a/rsconcept/frontend/src/features/library/dialogs/dlg-edit-editors/dlg-edit-editors.tsx
+++ b/rsconcept/frontend/src/features/library/dialogs/dlg-edit-editors/dlg-edit-editors.tsx
@@ -5,10 +5,10 @@ import { useState } from 'react';
 import { useUsers } from '@/features/users';
 import { SelectUser, TableUsers } from '@/features/users/components';
 
-import { MiniButton } from '@/components/control1';
-import { IconRemove } from '@/components/icons1';
-import { Label } from '@/components/input1';
-import { ModalForm } from '@/components/modal1';
+import { MiniButton } from '@/components/control';
+import { IconRemove } from '@/components/icons';
+import { Label } from '@/components/input';
+import { ModalForm } from '@/components/modal';
 import { useDialogsStore } from '@/stores/dialogs';
 
 import { useSetEditors } from '../../backend/use-set-editors';
diff --git a/rsconcept/frontend/src/features/library/dialogs/dlg-edit-versions/dlg-edit-versions.tsx b/rsconcept/frontend/src/features/library/dialogs/dlg-edit-versions/dlg-edit-versions.tsx
index 06ac704b..0962e20b 100644
--- a/rsconcept/frontend/src/features/library/dialogs/dlg-edit-versions/dlg-edit-versions.tsx
+++ b/rsconcept/frontend/src/features/library/dialogs/dlg-edit-versions/dlg-edit-versions.tsx
@@ -7,10 +7,10 @@ import { zodResolver } from '@hookform/resolvers/zod';
 
 import { useRSFormSuspense } from '@/features/rsform/backend/use-rsform';
 
-import { MiniButton } from '@/components/control1';
-import { IconReset, IconSave } from '@/components/icons1';
-import { TextArea, TextInput } from '@/components/input1';
-import { ModalView } from '@/components/modal1';
+import { MiniButton } from '@/components/control';
+import { IconReset, IconSave } from '@/components/icons';
+import { TextArea, TextInput } from '@/components/input';
+import { ModalView } from '@/components/modal';
 import { useDialogsStore } from '@/stores/dialogs';
 import { errorMsg } from '@/utils/labels';
 
diff --git a/rsconcept/frontend/src/features/library/dialogs/dlg-edit-versions/table-versions.tsx b/rsconcept/frontend/src/features/library/dialogs/dlg-edit-versions/table-versions.tsx
index 3cdc3dac..1aaca6b9 100644
--- a/rsconcept/frontend/src/features/library/dialogs/dlg-edit-versions/table-versions.tsx
+++ b/rsconcept/frontend/src/features/library/dialogs/dlg-edit-versions/table-versions.tsx
@@ -2,9 +2,9 @@
 
 import { useIntl } from 'react-intl';
 
-import { MiniButton } from '@/components/control1';
+import { MiniButton } from '@/components/control';
 import { createColumnHelper, DataTable, type IConditionalStyle } from '@/components/data-table';
-import { IconRemove } from '@/components/icons1';
+import { IconRemove } from '@/components/icons';
 import { APP_COLORS } from '@/styling/colors';
 
 import { type IVersionInfo } from '../../backend/types';
diff --git a/rsconcept/frontend/src/features/library/pages/create-item-page/form-create-item.tsx b/rsconcept/frontend/src/features/library/pages/create-item-page/form-create-item.tsx
index 869dcdd3..c6761415 100644
--- a/rsconcept/frontend/src/features/library/pages/create-item-page/form-create-item.tsx
+++ b/rsconcept/frontend/src/features/library/pages/create-item-page/form-create-item.tsx
@@ -6,10 +6,10 @@ import { zodResolver } from '@hookform/resolvers/zod';
 
 import { urls, useConceptNavigation } from '@/app';
 
-import { Button, MiniButton, SubmitButton } from '@/components/control1';
-import { IconDownload } from '@/components/icons1';
+import { Button, MiniButton, SubmitButton } from '@/components/control';
+import { IconDownload } from '@/components/icons';
 import { InfoError } from '@/components/info-error';
-import { Label, TextArea, TextInput } from '@/components/input1';
+import { Label, TextArea, TextInput } from '@/components/input';
 import { EXTEOR_TRS_FILE } from '@/utils/constants';
 
 import {
diff --git a/rsconcept/frontend/src/features/library/pages/library-page/library-page.tsx b/rsconcept/frontend/src/features/library/pages/library-page/library-page.tsx
index f6529240..c1340e21 100644
--- a/rsconcept/frontend/src/features/library/pages/library-page/library-page.tsx
+++ b/rsconcept/frontend/src/features/library/pages/library-page/library-page.tsx
@@ -3,8 +3,8 @@
 import { toast } from 'react-toastify';
 import fileDownload from 'js-file-download';
 
-import { MiniButton } from '@/components/control1';
-import { IconCSV } from '@/components/icons1';
+import { MiniButton } from '@/components/control';
+import { IconCSV } from '@/components/icons';
 import { useDialogsStore } from '@/stores/dialogs';
 import { infoMsg } from '@/utils/labels';
 import { convertToCSV } from '@/utils/utils';
diff --git a/rsconcept/frontend/src/features/library/pages/library-page/table-library-items.tsx b/rsconcept/frontend/src/features/library/pages/library-page/table-library-items.tsx
index 8a12f4c7..612f856e 100644
--- a/rsconcept/frontend/src/features/library/pages/library-page/table-library-items.tsx
+++ b/rsconcept/frontend/src/features/library/pages/library-page/table-library-items.tsx
@@ -4,7 +4,7 @@ import clsx from 'clsx';
 
 import { urls, useConceptNavigation } from '@/app';
 
-import { TextURL } from '@/components/control1';
+import { TextURL } from '@/components/control';
 import { DataTable, type IConditionalStyle, type VisibilityState } from '@/components/data-table';
 import { useWindowSize } from '@/hooks/use-window-size';
 import { useFitHeight } from '@/stores/app-layout';
diff --git a/rsconcept/frontend/src/features/library/pages/library-page/toolbar-search.tsx b/rsconcept/frontend/src/features/library/pages/library-page/toolbar-search.tsx
index 87720eeb..2bc35495 100644
--- a/rsconcept/frontend/src/features/library/pages/library-page/toolbar-search.tsx
+++ b/rsconcept/frontend/src/features/library/pages/library-page/toolbar-search.tsx
@@ -4,8 +4,8 @@ import clsx from 'clsx';
 
 import { SelectUser } from '@/features/users/components';
 
-import { MiniButton, SelectorButton } from '@/components/control1';
-import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown1';
+import { MiniButton, SelectorButton } from '@/components/control';
+import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown';
 import {
   IconEditor,
   IconFilterReset,
@@ -14,8 +14,8 @@ import {
   IconFolderTree,
   IconOwner,
   IconUserSearch
-} from '@/components/icons1';
-import { SearchBar } from '@/components/input1';
+} from '@/components/icons';
+import { SearchBar } from '@/components/input';
 import { prefixes } from '@/utils/constants';
 import { tripleToggleColor } from '@/utils/utils';
 
diff --git a/rsconcept/frontend/src/features/library/pages/library-page/use-library-columns.tsx b/rsconcept/frontend/src/features/library/pages/library-page/use-library-columns.tsx
index 3a3bd5c0..99bb7563 100644
--- a/rsconcept/frontend/src/features/library/pages/library-page/use-library-columns.tsx
+++ b/rsconcept/frontend/src/features/library/pages/library-page/use-library-columns.tsx
@@ -2,9 +2,9 @@ import { useIntl } from 'react-intl';
 
 import { useLabelUser } from '@/features/users';
 
-import { MiniButton } from '@/components/control1';
+import { MiniButton } from '@/components/control';
 import { createColumnHelper } from '@/components/data-table';
-import { IconFolderTree } from '@/components/icons1';
+import { IconFolderTree } from '@/components/icons';
 import { useWindowSize } from '@/hooks/use-window-size';
 
 import { type ILibraryItem } from '../../backend/types';
diff --git a/rsconcept/frontend/src/features/library/pages/library-page/view-side-location.tsx b/rsconcept/frontend/src/features/library/pages/library-page/view-side-location.tsx
index 8853717a..4b5be6a1 100644
--- a/rsconcept/frontend/src/features/library/pages/library-page/view-side-location.tsx
+++ b/rsconcept/frontend/src/features/library/pages/library-page/view-side-location.tsx
@@ -4,8 +4,8 @@ import { useAuthSuspense } from '@/features/auth';
 import { HelpTopic } from '@/features/help';
 import { BadgeHelp } from '@/features/help/components';
 
-import { MiniButton } from '@/components/control1';
-import { IconFolderEdit, IconFolderTree } from '@/components/icons1';
+import { MiniButton } from '@/components/control';
+import { IconFolderEdit, IconFolderTree } from '@/components/icons';
 import { useWindowSize } from '@/hooks/use-window-size';
 import { useFitHeight } from '@/stores/app-layout';
 import { PARAMETER, prefixes } from '@/utils/constants';
diff --git a/rsconcept/frontend/src/features/oss/backend/oss-loader.ts b/rsconcept/frontend/src/features/oss/backend/oss-loader.ts
index e9c8ec57..fba0565a 100644
--- a/rsconcept/frontend/src/features/oss/backend/oss-loader.ts
+++ b/rsconcept/frontend/src/features/oss/backend/oss-loader.ts
@@ -4,7 +4,7 @@
 
 import { type ILibraryItem } from '@/features/library';
 
-import { Graph } from '@/models/graph1';
+import { Graph } from '@/models/graph';
 
 import { type IOperation, type IOperationSchema, type IOperationSchemaStats } from '../models/oss';
 
diff --git a/rsconcept/frontend/src/features/oss/components/icon-relocation-up.tsx b/rsconcept/frontend/src/features/oss/components/icon-relocation-up.tsx
index 982cae13..b5594e5a 100644
--- a/rsconcept/frontend/src/features/oss/components/icon-relocation-up.tsx
+++ b/rsconcept/frontend/src/features/oss/components/icon-relocation-up.tsx
@@ -1,4 +1,4 @@
-import { type DomIconProps, IconMoveDown, IconMoveUp } from '@/components/icons1';
+import { type DomIconProps, IconMoveDown, IconMoveUp } from '@/components/icons';
 
 /** Icon for relocation direction. */
 export function IconRelocationUp({ value, size = '1.25rem', className }: DomIconProps<boolean>) {
diff --git a/rsconcept/frontend/src/features/oss/components/info-operation.tsx b/rsconcept/frontend/src/features/oss/components/info-operation.tsx
index 87b483cd..bddff84a 100644
--- a/rsconcept/frontend/src/features/oss/components/info-operation.tsx
+++ b/rsconcept/frontend/src/features/oss/components/info-operation.tsx
@@ -3,7 +3,7 @@
 import { createColumnHelper } from '@tanstack/react-table';
 
 import { DataTable } from '@/components/data-table';
-import { IconPageRight } from '@/components/icons1';
+import { IconPageRight } from '@/components/icons';
 
 import { type ICstSubstituteInfo, OperationType } from '../backend/types';
 import { labelOperationType } from '../labels';
diff --git a/rsconcept/frontend/src/features/oss/components/operation-tooltip.tsx b/rsconcept/frontend/src/features/oss/components/operation-tooltip.tsx
index 17a3a33d..b7ee7d60 100644
--- a/rsconcept/frontend/src/features/oss/components/operation-tooltip.tsx
+++ b/rsconcept/frontend/src/features/oss/components/operation-tooltip.tsx
@@ -1,4 +1,4 @@
-import { Tooltip } from '@/components/container1';
+import { Tooltip } from '@/components/container';
 import { globalIDs } from '@/utils/constants';
 
 import { useOperationTooltipStore } from '../stores/operation-tooltip';
diff --git a/rsconcept/frontend/src/features/oss/components/pick-multi-operation.tsx b/rsconcept/frontend/src/features/oss/components/pick-multi-operation.tsx
index 122b247e..eac5b385 100644
--- a/rsconcept/frontend/src/features/oss/components/pick-multi-operation.tsx
+++ b/rsconcept/frontend/src/features/oss/components/pick-multi-operation.tsx
@@ -3,11 +3,11 @@
 import { useState } from 'react';
 import clsx from 'clsx';
 
-import { MiniButton } from '@/components/control1';
+import { MiniButton } from '@/components/control';
 import { createColumnHelper, DataTable } from '@/components/data-table';
-import { IconMoveDown, IconMoveUp, IconRemove } from '@/components/icons1';
+import { IconMoveDown, IconMoveUp, IconRemove } from '@/components/icons';
 import { type Styling } from '@/components/props';
-import { NoData } from '@/components/view1';
+import { NoData } from '@/components/view';
 
 import { type IOperation } from '../models/oss';
 
diff --git a/rsconcept/frontend/src/features/oss/components/select-operation.tsx b/rsconcept/frontend/src/features/oss/components/select-operation.tsx
index e552b7db..92e81f59 100644
--- a/rsconcept/frontend/src/features/oss/components/select-operation.tsx
+++ b/rsconcept/frontend/src/features/oss/components/select-operation.tsx
@@ -2,7 +2,7 @@
 
 import clsx from 'clsx';
 
-import { SelectSingle } from '@/components/input1';
+import { SelectSingle } from '@/components/input';
 import { type Styling } from '@/components/props';
 
 import { type IOperation } from '../models/oss';
diff --git a/rsconcept/frontend/src/features/oss/dialogs/dlg-change-input-schema.tsx b/rsconcept/frontend/src/features/oss/dialogs/dlg-change-input-schema.tsx
index d16b3628..e50d30d6 100644
--- a/rsconcept/frontend/src/features/oss/dialogs/dlg-change-input-schema.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/dlg-change-input-schema.tsx
@@ -7,10 +7,10 @@ import { type ILibraryItem, LibraryItemType } from '@/features/library';
 import { useLibrary } from '@/features/library/backend/use-library';
 import { PickSchema } from '@/features/library/components';
 
-import { MiniButton } from '@/components/control1';
-import { IconReset } from '@/components/icons1';
-import { Label } from '@/components/input1';
-import { ModalForm } from '@/components/modal1';
+import { MiniButton } from '@/components/control';
+import { IconReset } from '@/components/icons';
+import { Label } from '@/components/input';
+import { ModalForm } from '@/components/modal';
 import { useDialogsStore } from '@/stores/dialogs';
 
 import { type IInputUpdateDTO, type IOperationPosition, schemaInputUpdate } from '../backend/types';
diff --git a/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/dlg-create-operation.tsx b/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/dlg-create-operation.tsx
index d80115b6..80d0c64f 100644
--- a/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/dlg-create-operation.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/dlg-create-operation.tsx
@@ -6,8 +6,8 @@ import { zodResolver } from '@hookform/resolvers/zod';
 
 import { HelpTopic } from '@/features/help';
 
-import { ModalForm } from '@/components/modal1';
-import { TabLabel, TabList, TabPanel, Tabs } from '@/components/tabs1';
+import { ModalForm } from '@/components/modal';
+import { TabLabel, TabList, TabPanel, Tabs } from '@/components/tabs';
 import { useDialogsStore } from '@/stores/dialogs';
 
 import {
diff --git a/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/tab-input-operation.tsx b/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/tab-input-operation.tsx
index ceb1cd73..03b4786e 100644
--- a/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/tab-input-operation.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/tab-input-operation.tsx
@@ -6,9 +6,9 @@ import { type ILibraryItem, LibraryItemType } from '@/features/library';
 import { useLibrary } from '@/features/library/backend/use-library';
 import { PickSchema } from '@/features/library/components';
 
-import { MiniButton } from '@/components/control1';
-import { IconReset } from '@/components/icons1';
-import { Checkbox, Label, TextArea, TextInput } from '@/components/input1';
+import { MiniButton } from '@/components/control';
+import { IconReset } from '@/components/icons';
+import { Checkbox, Label, TextArea, TextInput } from '@/components/input';
 import { useDialogsStore } from '@/stores/dialogs';
 
 import { type IOperationCreateDTO } from '../../backend/types';
diff --git a/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/tab-synthesis-operation.tsx b/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/tab-synthesis-operation.tsx
index 36420022..17e538d7 100644
--- a/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/tab-synthesis-operation.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/tab-synthesis-operation.tsx
@@ -1,6 +1,6 @@
 import { Controller, useFormContext, useWatch } from 'react-hook-form';
 
-import { Label, TextArea, TextInput } from '@/components/input1';
+import { Label, TextArea, TextInput } from '@/components/input';
 import { useDialogsStore } from '@/stores/dialogs';
 
 import { type IOperationCreateDTO } from '../../backend/types';
diff --git a/rsconcept/frontend/src/features/oss/dialogs/dlg-delete-operation.tsx b/rsconcept/frontend/src/features/oss/dialogs/dlg-delete-operation.tsx
index ad7911c5..f7ef43a2 100644
--- a/rsconcept/frontend/src/features/oss/dialogs/dlg-delete-operation.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/dlg-delete-operation.tsx
@@ -5,8 +5,8 @@ import { zodResolver } from '@hookform/resolvers/zod';
 
 import { HelpTopic } from '@/features/help';
 
-import { Checkbox, TextInput } from '@/components/input1';
-import { ModalForm } from '@/components/modal1';
+import { Checkbox, TextInput } from '@/components/input';
+import { ModalForm } from '@/components/modal';
 import { useDialogsStore } from '@/stores/dialogs';
 
 import { type IOperationDeleteDTO, type IOperationPosition, schemaOperationDelete } from '../backend/types';
diff --git a/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/dlg-edit-operation.tsx b/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/dlg-edit-operation.tsx
index 0a56089a..79a4f7b7 100644
--- a/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/dlg-edit-operation.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/dlg-edit-operation.tsx
@@ -6,9 +6,9 @@ import { zodResolver } from '@hookform/resolvers/zod';
 
 import { HelpTopic } from '@/features/help';
 
-import { Loader } from '@/components/loader1';
-import { ModalForm } from '@/components/modal1';
-import { TabLabel, TabList, TabPanel, Tabs } from '@/components/tabs1';
+import { Loader } from '@/components/loader';
+import { ModalForm } from '@/components/modal';
+import { TabLabel, TabList, TabPanel, Tabs } from '@/components/tabs';
 import { useDialogsStore } from '@/stores/dialogs';
 
 import {
diff --git a/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/tab-arguments.tsx b/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/tab-arguments.tsx
index c5f67599..5d94f45a 100644
--- a/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/tab-arguments.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/tab-arguments.tsx
@@ -1,7 +1,7 @@
 'use client';
 import { Controller, useFormContext } from 'react-hook-form';
 
-import { Label } from '@/components/input1';
+import { Label } from '@/components/input';
 import { useDialogsStore } from '@/stores/dialogs';
 
 import { type IOperationUpdateDTO } from '../../backend/types';
diff --git a/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/tab-operation.tsx b/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/tab-operation.tsx
index d245c3ed..5370e05c 100644
--- a/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/tab-operation.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/tab-operation.tsx
@@ -1,6 +1,6 @@
 import { useFormContext } from 'react-hook-form';
 
-import { TextArea, TextInput } from '@/components/input1';
+import { TextArea, TextInput } from '@/components/input';
 
 import { type IOperationUpdateDTO } from '../../backend/types';
 
diff --git a/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/tab-synthesis.tsx b/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/tab-synthesis.tsx
index b642a242..8710d6d6 100644
--- a/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/tab-synthesis.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/tab-synthesis.tsx
@@ -5,7 +5,7 @@ import { Controller, useFormContext, useWatch } from 'react-hook-form';
 import { useRSForms } from '@/features/rsform/backend/use-rsforms';
 import { PickSubstitutions } from '@/features/rsform/components';
 
-import { TextArea } from '@/components/input1';
+import { TextArea } from '@/components/input';
 import { useDialogsStore } from '@/stores/dialogs';
 import { APP_COLORS } from '@/styling/colors';
 
diff --git a/rsconcept/frontend/src/features/oss/dialogs/dlg-relocate-constituents.tsx b/rsconcept/frontend/src/features/oss/dialogs/dlg-relocate-constituents.tsx
index bf71fa45..d82117c3 100644
--- a/rsconcept/frontend/src/features/oss/dialogs/dlg-relocate-constituents.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/dlg-relocate-constituents.tsx
@@ -11,9 +11,9 @@ import { SelectLibraryItem } from '@/features/library/components';
 import { useRSForm } from '@/features/rsform/backend/use-rsform';
 import { PickMultiConstituenta } from '@/features/rsform/components';
 
-import { MiniButton } from '@/components/control1';
-import { Loader } from '@/components/loader1';
-import { ModalForm } from '@/components/modal1';
+import { MiniButton } from '@/components/control';
+import { Loader } from '@/components/loader';
+import { ModalForm } from '@/components/modal';
 import { useDialogsStore } from '@/stores/dialogs';
 
 import { type ICstRelocateDTO, type IOperationPosition, schemaCstRelocate } from '../backend/types';
diff --git a/rsconcept/frontend/src/features/oss/models/oss-api.ts b/rsconcept/frontend/src/features/oss/models/oss-api.ts
index 3361ab5d..f9499899 100644
--- a/rsconcept/frontend/src/features/oss/models/oss-api.ts
+++ b/rsconcept/frontend/src/features/oss/models/oss-api.ts
@@ -22,7 +22,7 @@ import {
 import { infoMsg } from '@/utils/labels';
 import { TextMatcher } from '@/utils/utils';
 
-import { Graph } from '../../../models/graph1';
+import { Graph } from '../../../models/graph';
 import { type IOperationPosition, OperationType } from '../backend/types';
 import { describeSubstitutionError } from '../labels';
 
diff --git a/rsconcept/frontend/src/features/oss/models/oss.ts b/rsconcept/frontend/src/features/oss/models/oss.ts
index afa0db6b..56cfd8b1 100644
--- a/rsconcept/frontend/src/features/oss/models/oss.ts
+++ b/rsconcept/frontend/src/features/oss/models/oss.ts
@@ -2,7 +2,7 @@
  * Module: Schema of Synthesis Operations.
  */
 
-import { type Graph } from '@/models/graph1';
+import { type Graph } from '@/models/graph';
 
 import { type ICstSubstituteInfo, type IOperationDTO, type IOperationSchemaDTO } from '../backend/types';
 
diff --git a/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-card/form-oss.tsx b/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-card/form-oss.tsx
index dafe8c9f..34a03bde 100644
--- a/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-card/form-oss.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-card/form-oss.tsx
@@ -9,9 +9,9 @@ import { type IUpdateLibraryItemDTO, LibraryItemType, schemaUpdateLibraryItem }
 import { useUpdateItem } from '@/features/library/backend/use-update-item';
 import { ToolbarItemAccess } from '@/features/library/components';
 
-import { SubmitButton } from '@/components/control1';
-import { IconSave } from '@/components/icons1';
-import { TextArea, TextInput } from '@/components/input1';
+import { SubmitButton } from '@/components/control';
+import { IconSave } from '@/components/icons';
+import { TextArea, TextInput } from '@/components/input';
 import { useModificationStore } from '@/stores/modification';
 import { globalIDs } from '@/utils/constants';
 
diff --git a/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-card/oss-stats.tsx b/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-card/oss-stats.tsx
index e4900d90..d4ed2c51 100644
--- a/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-card/oss-stats.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-card/oss-stats.tsx
@@ -1,7 +1,7 @@
 import clsx from 'clsx';
 
-import { IconDownload, IconRSForm, IconRSFormImported, IconRSFormOwned, IconSynthesis } from '@/components/icons1';
-import { ValueStats } from '@/components/view1';
+import { IconDownload, IconRSForm, IconRSFormImported, IconRSFormOwned, IconSynthesis } from '@/components/icons';
+import { ValueStats } from '@/components/view';
 
 import { type IOperationSchemaStats } from '../../../models/oss';
 
diff --git a/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/graph/node-core.tsx b/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/graph/node-core.tsx
index d7903020..1975a9bf 100644
--- a/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/graph/node-core.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/graph/node-core.tsx
@@ -1,7 +1,7 @@
 'use client';
 
-import { IconConsolidation, IconRSForm } from '@/components/icons1';
-import { Indicator } from '@/components/view1';
+import { IconConsolidation, IconRSForm } from '@/components/icons';
+import { Indicator } from '@/components/view';
 import { globalIDs } from '@/utils/constants';
 
 import { OperationType } from '../../../../backend/types';
diff --git a/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/node-context-menu.tsx b/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/node-context-menu.tsx
index babc0335..898ca938 100644
--- a/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/node-context-menu.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/node-context-menu.tsx
@@ -8,7 +8,7 @@ import { useLibrary } from '@/features/library/backend/use-library';
 import { useInputCreate } from '@/features/oss/backend/use-input-create';
 import { useOperationExecute } from '@/features/oss/backend/use-operation-execute';
 
-import { Dropdown, DropdownButton } from '@/components/dropdown1';
+import { Dropdown, DropdownButton } from '@/components/dropdown';
 import {
   IconChild,
   IconConnect,
@@ -17,7 +17,7 @@ import {
   IconExecute,
   IconNewRSForm,
   IconRSForm
-} from '@/components/icons1';
+} from '@/components/icons';
 import { useClickedOutside } from '@/hooks/use-clicked-outside';
 import { useDialogsStore } from '@/stores/dialogs';
 import { errorMsg } from '@/utils/labels';
diff --git a/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/toolbar-oss-graph.tsx b/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/toolbar-oss-graph.tsx
index b1f69dab..20c66afe 100644
--- a/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/toolbar-oss-graph.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/toolbar-oss-graph.tsx
@@ -8,7 +8,7 @@ import { BadgeHelp } from '@/features/help/components';
 import { useOperationExecute } from '@/features/oss/backend/use-operation-execute';
 import { useUpdatePositions } from '@/features/oss/backend/use-update-positions';
 
-import { MiniButton } from '@/components/control1';
+import { MiniButton } from '@/components/control';
 import {
   IconAnimation,
   IconAnimationOff,
@@ -22,7 +22,7 @@ import {
   IconNewItem,
   IconReset,
   IconSave
-} from '@/components/icons1';
+} from '@/components/icons';
 import { type Styling } from '@/components/props';
 import { useDialogsStore } from '@/stores/dialogs';
 import { PARAMETER } from '@/utils/constants';
diff --git a/rsconcept/frontend/src/features/oss/pages/oss-page/menu-edit-oss.tsx b/rsconcept/frontend/src/features/oss/pages/oss-page/menu-edit-oss.tsx
index 3e757923..0feec476 100644
--- a/rsconcept/frontend/src/features/oss/pages/oss-page/menu-edit-oss.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/oss-page/menu-edit-oss.tsx
@@ -1,8 +1,8 @@
 import { useAuthSuspense } from '@/features/auth';
 
-import { Button } from '@/components/control1';
-import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown1';
-import { IconChild, IconEdit2 } from '@/components/icons1';
+import { Button } from '@/components/control';
+import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown';
+import { IconChild, IconEdit2 } from '@/components/icons';
 import { useDialogsStore } from '@/stores/dialogs';
 
 import { useMutatingOss } from '../../backend/use-mutating-oss';
diff --git a/rsconcept/frontend/src/features/oss/pages/oss-page/menu-main.tsx b/rsconcept/frontend/src/features/oss/pages/oss-page/menu-main.tsx
index ee858a78..d224704c 100644
--- a/rsconcept/frontend/src/features/oss/pages/oss-page/menu-main.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/oss-page/menu-main.tsx
@@ -2,10 +2,10 @@ import { urls, useConceptNavigation } from '@/app';
 import { useAuthSuspense } from '@/features/auth';
 import { useRoleStore, UserRole } from '@/features/users';
 
-import { Divider } from '@/components/container1';
-import { Button } from '@/components/control1';
-import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown1';
-import { IconDestroy, IconLibrary, IconMenu, IconNewItem, IconQR, IconShare } from '@/components/icons1';
+import { Divider } from '@/components/container';
+import { Button } from '@/components/control';
+import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown';
+import { IconDestroy, IconLibrary, IconMenu, IconNewItem, IconQR, IconShare } from '@/components/icons';
 import { useDialogsStore } from '@/stores/dialogs';
 import { generatePageQR, sharePage } from '@/utils/utils';
 
diff --git a/rsconcept/frontend/src/features/oss/pages/oss-page/oss-page.tsx b/rsconcept/frontend/src/features/oss/pages/oss-page/oss-page.tsx
index f668fffe..61fc0a0c 100644
--- a/rsconcept/frontend/src/features/oss/pages/oss-page/oss-page.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/oss-page/oss-page.tsx
@@ -9,7 +9,7 @@ import { urls, useBlockNavigation, useConceptNavigation } from '@/app';
 import { ConstituentaTooltip } from '@/features/rsform/components';
 
 import { isAxiosError } from '@/backend/api-transport';
-import { TextURL } from '@/components/control1';
+import { TextURL } from '@/components/control';
 import { type ErrorData } from '@/components/info-error';
 import { useQueryStrings } from '@/hooks/use-query-strings';
 import { useModificationStore } from '@/stores/modification';
diff --git a/rsconcept/frontend/src/features/oss/pages/oss-page/oss-tabs.tsx b/rsconcept/frontend/src/features/oss/pages/oss-page/oss-tabs.tsx
index 53442903..8fcbe8c2 100644
--- a/rsconcept/frontend/src/features/oss/pages/oss-page/oss-tabs.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/oss-page/oss-tabs.tsx
@@ -4,7 +4,7 @@ import { useLayoutEffect } from 'react';
 
 import { useConceptNavigation } from '@/app/navigation1/navigation-context';
 
-import { TabLabel, TabList, TabPanel, Tabs } from '@/components/tabs1';
+import { TabLabel, TabList, TabPanel, Tabs } from '@/components/tabs';
 import { useAppLayoutStore } from '@/stores/app-layout';
 
 import { EditorOssCard } from './editor-oss-card';
diff --git a/rsconcept/frontend/src/features/rsform/backend/rsform-loader.ts b/rsconcept/frontend/src/features/rsform/backend/rsform-loader.ts
index 96ec98c1..c18f653c 100644
--- a/rsconcept/frontend/src/features/rsform/backend/rsform-loader.ts
+++ b/rsconcept/frontend/src/features/rsform/backend/rsform-loader.ts
@@ -2,7 +2,7 @@
  * Module: RSForm data loading and processing.
  */
 
-import { Graph } from '@/models/graph1';
+import { Graph } from '@/models/graph';
 
 import { type IConstituenta, type IRSForm, type IRSFormStats } from '../models/rsform';
 import { inferClass, inferStatus, inferTemplate, isBaseSet, isFunctional } from '../models/rsform-api';
diff --git a/rsconcept/frontend/src/features/rsform/components/constituenta-tooltip.tsx b/rsconcept/frontend/src/features/rsform/components/constituenta-tooltip.tsx
index 87c6c3ee..0a96ce48 100644
--- a/rsconcept/frontend/src/features/rsform/components/constituenta-tooltip.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/constituenta-tooltip.tsx
@@ -1,4 +1,4 @@
-import { Tooltip } from '@/components/container1';
+import { Tooltip } from '@/components/container';
 import { globalIDs } from '@/utils/constants';
 
 import { useCstTooltipStore } from '../stores/cst-tooltip';
diff --git a/rsconcept/frontend/src/features/rsform/components/icon-cst-match-mode.tsx b/rsconcept/frontend/src/features/rsform/components/icon-cst-match-mode.tsx
index 0c6d786a..1e6e7bcc 100644
--- a/rsconcept/frontend/src/features/rsform/components/icon-cst-match-mode.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/icon-cst-match-mode.tsx
@@ -1,4 +1,4 @@
-import { type DomIconProps, IconAlias, IconFilter, IconFormula, IconTerm, IconText } from '@/components/icons1';
+import { type DomIconProps, IconAlias, IconFilter, IconFormula, IconTerm, IconText } from '@/components/icons';
 
 import { CstMatchMode } from '../stores/cst-search';
 
diff --git a/rsconcept/frontend/src/features/rsform/components/icon-cst-type.tsx b/rsconcept/frontend/src/features/rsform/components/icon-cst-type.tsx
index 1b267898..602abfe8 100644
--- a/rsconcept/frontend/src/features/rsform/components/icon-cst-type.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/icon-cst-type.tsx
@@ -1,4 +1,4 @@
-import { type DomIconProps } from '@/components/icons1';
+import { type DomIconProps } from '@/components/icons';
 import {
   IconCstAxiom,
   IconCstBaseSet,
@@ -8,7 +8,7 @@ import {
   IconCstStructured,
   IconCstTerm,
   IconCstTheorem
-} from '@/components/icons1';
+} from '@/components/icons';
 
 import { CstType } from '../backend/types';
 
diff --git a/rsconcept/frontend/src/features/rsform/components/icon-dependency-mode.tsx b/rsconcept/frontend/src/features/rsform/components/icon-dependency-mode.tsx
index 91785d70..9245a853 100644
--- a/rsconcept/frontend/src/features/rsform/components/icon-dependency-mode.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/icon-dependency-mode.tsx
@@ -5,7 +5,7 @@ import {
   IconGraphInputs,
   IconGraphOutputs,
   IconSettings
-} from '@/components/icons1';
+} from '@/components/icons';
 
 import { DependencyMode } from '../stores/cst-search';
 
diff --git a/rsconcept/frontend/src/features/rsform/components/icon-expression-status.tsx b/rsconcept/frontend/src/features/rsform/components/icon-expression-status.tsx
index 04907aee..eed76fca 100644
--- a/rsconcept/frontend/src/features/rsform/components/icon-expression-status.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/icon-expression-status.tsx
@@ -4,7 +4,7 @@ import {
   IconStatusIncalculable,
   IconStatusOK,
   IconStatusUnknown
-} from '@/components/icons1';
+} from '@/components/icons';
 
 import { ExpressionStatus } from '../models/rsform';
 
diff --git a/rsconcept/frontend/src/features/rsform/components/info-constituenta.tsx b/rsconcept/frontend/src/features/rsform/components/info-constituenta.tsx
index 185b7866..18a64556 100644
--- a/rsconcept/frontend/src/features/rsform/components/info-constituenta.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/info-constituenta.tsx
@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 
-import { IconChild } from '@/components/icons1';
+import { IconChild } from '@/components/icons';
 
 import { labelCstTypification } from '../labels';
 import { type IConstituenta } from '../models/rsform';
diff --git a/rsconcept/frontend/src/features/rsform/components/pick-constituenta.tsx b/rsconcept/frontend/src/features/rsform/components/pick-constituenta.tsx
index 65c31645..b52b9c6d 100644
--- a/rsconcept/frontend/src/features/rsform/components/pick-constituenta.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/pick-constituenta.tsx
@@ -4,9 +4,9 @@ import { useState } from 'react';
 import clsx from 'clsx';
 
 import { createColumnHelper, DataTable, type IConditionalStyle } from '@/components/data-table';
-import { SearchBar } from '@/components/input1';
+import { SearchBar } from '@/components/input';
 import { type Styling } from '@/components/props';
-import { NoData } from '@/components/view1';
+import { NoData } from '@/components/view';
 import { APP_COLORS } from '@/styling/colors';
 
 import { describeConstituenta } from '../labels';
diff --git a/rsconcept/frontend/src/features/rsform/components/pick-multi-constituenta.tsx b/rsconcept/frontend/src/features/rsform/components/pick-multi-constituenta.tsx
index 8e6179e1..4089d7f8 100644
--- a/rsconcept/frontend/src/features/rsform/components/pick-multi-constituenta.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/pick-multi-constituenta.tsx
@@ -4,10 +4,10 @@ import { useState } from 'react';
 import clsx from 'clsx';
 
 import { createColumnHelper, DataTable, type RowSelectionState } from '@/components/data-table';
-import { SearchBar } from '@/components/input1';
+import { SearchBar } from '@/components/input';
 import { type Styling } from '@/components/props';
-import { NoData } from '@/components/view1';
-import { Graph } from '@/models/graph1';
+import { NoData } from '@/components/view';
+import { Graph } from '@/models/graph';
 
 import { describeConstituenta } from '../labels';
 import { type IConstituenta, type IRSForm } from '../models/rsform';
diff --git a/rsconcept/frontend/src/features/rsform/components/pick-substitutions.tsx b/rsconcept/frontend/src/features/rsform/components/pick-substitutions.tsx
index 569fdc2e..54491f7a 100644
--- a/rsconcept/frontend/src/features/rsform/components/pick-substitutions.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/pick-substitutions.tsx
@@ -7,11 +7,11 @@ import clsx from 'clsx';
 import { type ILibraryItem } from '@/features/library';
 import { SelectLibraryItem } from '@/features/library/components';
 
-import { MiniButton } from '@/components/control1';
+import { MiniButton } from '@/components/control';
 import { createColumnHelper, DataTable, type IConditionalStyle } from '@/components/data-table';
-import { IconAccept, IconPageLeft, IconPageRight, IconRemove, IconReplace } from '@/components/icons1';
+import { IconAccept, IconPageLeft, IconPageRight, IconRemove, IconReplace } from '@/components/icons';
 import { type Styling } from '@/components/props';
-import { NoData } from '@/components/view1';
+import { NoData } from '@/components/view';
 import { APP_COLORS } from '@/styling/colors';
 import { errorMsg } from '@/utils/labels';
 
diff --git a/rsconcept/frontend/src/features/rsform/components/refs-input/refs-input.tsx b/rsconcept/frontend/src/features/rsform/components/refs-input/refs-input.tsx
index 95723b7a..6fe3bd4b 100644
--- a/rsconcept/frontend/src/features/rsform/components/refs-input/refs-input.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/refs-input/refs-input.tsx
@@ -12,7 +12,7 @@ import CodeMirror, {
 import clsx from 'clsx';
 import { EditorView } from 'codemirror';
 
-import { Label } from '@/components/input1';
+import { Label } from '@/components/input';
 import { useDialogsStore } from '@/stores/dialogs';
 import { usePreferencesStore } from '@/stores/preferences';
 import { APP_COLORS } from '@/styling/colors';
diff --git a/rsconcept/frontend/src/features/rsform/components/rs-input/rs-input.tsx b/rsconcept/frontend/src/features/rsform/components/rs-input/rs-input.tsx
index a973523e..4f8d7752 100644
--- a/rsconcept/frontend/src/features/rsform/components/rs-input/rs-input.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/rs-input/rs-input.tsx
@@ -12,7 +12,7 @@ import CodeMirror, {
 import clsx from 'clsx';
 import { EditorView } from 'codemirror';
 
-import { Label } from '@/components/input1';
+import { Label } from '@/components/input';
 import { usePreferencesStore } from '@/stores/preferences';
 import { APP_COLORS } from '@/styling/colors';
 
diff --git a/rsconcept/frontend/src/features/rsform/components/select-constituenta.tsx b/rsconcept/frontend/src/features/rsform/components/select-constituenta.tsx
index cabe4896..afd82dbd 100644
--- a/rsconcept/frontend/src/features/rsform/components/select-constituenta.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/select-constituenta.tsx
@@ -2,7 +2,7 @@
 
 import clsx from 'clsx';
 
-import { SelectSingle } from '@/components/input1';
+import { SelectSingle } from '@/components/input';
 import { type Styling } from '@/components/props';
 
 import { describeConstituenta, describeConstituentaTerm } from '../labels';
diff --git a/rsconcept/frontend/src/features/rsform/components/select-cst-type.tsx b/rsconcept/frontend/src/features/rsform/components/select-cst-type.tsx
index 3a0d5af2..44b1d012 100644
--- a/rsconcept/frontend/src/features/rsform/components/select-cst-type.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/select-cst-type.tsx
@@ -1,4 +1,4 @@
-import { SelectSingle } from '@/components/input1';
+import { SelectSingle } from '@/components/input';
 import { type Styling } from '@/components/props';
 
 import { CstType } from '../backend/types';
diff --git a/rsconcept/frontend/src/features/rsform/components/select-multi-grammeme.tsx b/rsconcept/frontend/src/features/rsform/components/select-multi-grammeme.tsx
index d5757120..5fe48a94 100644
--- a/rsconcept/frontend/src/features/rsform/components/select-multi-grammeme.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/select-multi-grammeme.tsx
@@ -1,4 +1,4 @@
-import { SelectMulti, type SelectMultiProps } from '@/components/input1';
+import { SelectMulti, type SelectMultiProps } from '@/components/input';
 import { type Styling } from '@/components/props';
 
 import { Grammeme, type IGrammemeOption } from '../models/language';
diff --git a/rsconcept/frontend/src/features/rsform/components/toolbar-graph-selection.tsx b/rsconcept/frontend/src/features/rsform/components/toolbar-graph-selection.tsx
index 5bdd9444..6fc3f7aa 100644
--- a/rsconcept/frontend/src/features/rsform/components/toolbar-graph-selection.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/toolbar-graph-selection.tsx
@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 
-import { MiniButton } from '@/components/control1';
+import { MiniButton } from '@/components/control';
 import {
   IconGraphCollapse,
   IconGraphCore,
@@ -11,9 +11,9 @@ import {
   IconGraphOutputs,
   IconPredecessor,
   IconReset
-} from '@/components/icons1';
+} from '@/components/icons';
 import { type Styling } from '@/components/props';
-import { type Graph } from '@/models/graph1';
+import { type Graph } from '@/models/graph';
 
 interface ToolbarGraphSelectionProps extends Styling {
   value: number[];
diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-create-cst/dlg-create-cst.tsx b/rsconcept/frontend/src/features/rsform/dialogs/dlg-create-cst/dlg-create-cst.tsx
index 0999da80..7c47c153 100644
--- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-create-cst/dlg-create-cst.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-create-cst/dlg-create-cst.tsx
@@ -3,7 +3,7 @@
 import { FormProvider, useForm, useWatch } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 
-import { ModalForm } from '@/components/modal1';
+import { ModalForm } from '@/components/modal';
 import { useDialogsStore } from '@/stores/dialogs';
 import { errorMsg } from '@/utils/labels';
 
diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-create-cst/form-create-cst.tsx b/rsconcept/frontend/src/features/rsform/dialogs/dlg-create-cst/form-create-cst.tsx
index 420e7714..1d0f1081 100644
--- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-create-cst/form-create-cst.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-create-cst/form-create-cst.tsx
@@ -6,7 +6,7 @@ import { Controller, useFormContext, useWatch } from 'react-hook-form';
 import { HelpTopic } from '@/features/help';
 import { BadgeHelp } from '@/features/help/components';
 
-import { TextArea, TextInput } from '@/components/input1';
+import { TextArea, TextInput } from '@/components/input';
 
 import { CstType, type ICstCreateDTO } from '../../backend/types';
 import { RSInput } from '../../components/rs-input';
diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-cst-template/dlg-cst-template.tsx b/rsconcept/frontend/src/features/rsform/dialogs/dlg-cst-template/dlg-cst-template.tsx
index 955ba9f6..b852e834 100644
--- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-cst-template/dlg-cst-template.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-cst-template/dlg-cst-template.tsx
@@ -6,9 +6,9 @@ import { zodResolver } from '@hookform/resolvers/zod';
 
 import { HelpTopic } from '@/features/help';
 
-import { Loader } from '@/components/loader1';
-import { ModalForm } from '@/components/modal1';
-import { TabLabel, TabList, TabPanel, Tabs } from '@/components/tabs1';
+import { Loader } from '@/components/loader';
+import { ModalForm } from '@/components/modal';
+import { TabLabel, TabList, TabPanel, Tabs } from '@/components/tabs';
 import { useDialogsStore } from '@/stores/dialogs';
 
 import { CstType, type IConstituentaBasicsDTO, type ICstCreateDTO, schemaCstCreate } from '../../backend/types';
diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-cst-template/tab-arguments.tsx b/rsconcept/frontend/src/features/rsform/dialogs/dlg-cst-template/tab-arguments.tsx
index 714d691f..6e4fe5e3 100644
--- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-cst-template/tab-arguments.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-cst-template/tab-arguments.tsx
@@ -4,10 +4,10 @@ import { useState } from 'react';
 import { useFormContext, useWatch } from 'react-hook-form';
 import { createColumnHelper } from '@tanstack/react-table';
 
-import { MiniButton } from '@/components/control1';
+import { MiniButton } from '@/components/control';
 import { DataTable, type IConditionalStyle } from '@/components/data-table';
-import { IconAccept, IconRemove, IconReset } from '@/components/icons1';
-import { NoData } from '@/components/view1';
+import { IconAccept, IconRemove, IconReset } from '@/components/icons';
+import { NoData } from '@/components/view';
 import { useDialogsStore } from '@/stores/dialogs';
 import { APP_COLORS } from '@/styling/colors';
 
diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-cst-template/tab-template.tsx b/rsconcept/frontend/src/features/rsform/dialogs/dlg-cst-template/tab-template.tsx
index fb6296da..591c9247 100644
--- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-cst-template/tab-template.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-cst-template/tab-template.tsx
@@ -2,7 +2,7 @@
 
 import { useTemplatesSuspense } from '@/features/library/backend/use-templates';
 
-import { SelectSingle, TextArea } from '@/components/input1';
+import { SelectSingle, TextArea } from '@/components/input';
 
 import { useRSForm } from '../../backend/use-rsform';
 import { PickConstituenta } from '../../components/pick-constituenta';
diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-delete-cst/dlg-delete-cst.tsx b/rsconcept/frontend/src/features/rsform/dialogs/dlg-delete-cst/dlg-delete-cst.tsx
index 7666d567..d37cf5d3 100644
--- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-delete-cst/dlg-delete-cst.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-delete-cst/dlg-delete-cst.tsx
@@ -2,8 +2,8 @@
 
 import { useState } from 'react';
 
-import { Checkbox } from '@/components/input1';
-import { ModalForm } from '@/components/modal1';
+import { Checkbox } from '@/components/input';
+import { ModalForm } from '@/components/modal';
 import { useDialogsStore } from '@/stores/dialogs';
 import { prefixes } from '@/utils/constants';
 
diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-edit-reference/dlg-edit-reference.tsx b/rsconcept/frontend/src/features/rsform/dialogs/dlg-edit-reference/dlg-edit-reference.tsx
index 813f1f53..9ea0417e 100644
--- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-edit-reference/dlg-edit-reference.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-edit-reference/dlg-edit-reference.tsx
@@ -7,8 +7,8 @@ import { z } from 'zod';
 
 import { HelpTopic } from '@/features/help';
 
-import { ModalForm } from '@/components/modal1';
-import { TabLabel, TabList, TabPanel, Tabs } from '@/components/tabs1';
+import { ModalForm } from '@/components/modal';
+import { TabLabel, TabList, TabPanel, Tabs } from '@/components/tabs';
 import { useDialogsStore } from '@/stores/dialogs';
 
 import { labelReferenceType } from '../../labels';
diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-edit-reference/tab-entity-reference.tsx b/rsconcept/frontend/src/features/rsform/dialogs/dlg-edit-reference/tab-entity-reference.tsx
index 906b11ed..5bac2267 100644
--- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-edit-reference/tab-entity-reference.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-edit-reference/tab-entity-reference.tsx
@@ -2,7 +2,7 @@
 
 import { Controller, useFormContext, useWatch } from 'react-hook-form';
 
-import { Label, TextInput } from '@/components/input1';
+import { Label, TextInput } from '@/components/input';
 import { useDialogsStore } from '@/stores/dialogs';
 
 import { PickConstituenta } from '../../components/pick-constituenta';
diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-edit-reference/tab-syntactic-reference.tsx b/rsconcept/frontend/src/features/rsform/dialogs/dlg-edit-reference/tab-syntactic-reference.tsx
index da41e4fa..42f1eb8c 100644
--- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-edit-reference/tab-syntactic-reference.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-edit-reference/tab-syntactic-reference.tsx
@@ -2,7 +2,7 @@
 
 import { useFormContext, useWatch } from 'react-hook-form';
 
-import { TextInput } from '@/components/input1';
+import { TextInput } from '@/components/input';
 import { useDialogsStore } from '@/stores/dialogs';
 
 import { type DlgEditReferenceProps, type IEditReferenceState } from './dlg-edit-reference';
diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-edit-word-forms/dlg-edit-word-forms.tsx b/rsconcept/frontend/src/features/rsform/dialogs/dlg-edit-word-forms/dlg-edit-word-forms.tsx
index 2e378d04..e54690f4 100644
--- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-edit-word-forms/dlg-edit-word-forms.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-edit-word-forms/dlg-edit-word-forms.tsx
@@ -4,10 +4,10 @@ import { useState } from 'react';
 
 import { HelpTopic } from '@/features/help';
 
-import { MiniButton } from '@/components/control1';
-import { IconAccept, IconMoveDown, IconMoveLeft, IconMoveRight, IconRemove } from '@/components/icons1';
-import { Label, TextArea } from '@/components/input1';
-import { ModalForm } from '@/components/modal1';
+import { MiniButton } from '@/components/control';
+import { IconAccept, IconMoveDown, IconMoveLeft, IconMoveRight, IconRemove } from '@/components/icons';
+import { Label, TextArea } from '@/components/input';
+import { ModalForm } from '@/components/modal';
 import { useDialogsStore } from '@/stores/dialogs';
 import { promptText } from '@/utils/labels';
 
diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-edit-word-forms/table-word-forms.tsx b/rsconcept/frontend/src/features/rsform/dialogs/dlg-edit-word-forms/table-word-forms.tsx
index d906f1c0..ddc922b7 100644
--- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-edit-word-forms/table-word-forms.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-edit-word-forms/table-word-forms.tsx
@@ -1,9 +1,9 @@
 'use client';
 
-import { MiniButton } from '@/components/control1';
+import { MiniButton } from '@/components/control';
 import { createColumnHelper, DataTable } from '@/components/data-table';
-import { IconRemove } from '@/components/icons1';
-import { NoData } from '@/components/view1';
+import { IconRemove } from '@/components/icons';
+import { NoData } from '@/components/view';
 
 import { BadgeWordForm } from '../../components/badge-word-form';
 import { type IWordForm } from '../../models/language';
diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-graph-params.tsx b/rsconcept/frontend/src/features/rsform/dialogs/dlg-graph-params.tsx
index af60329e..727218ad 100644
--- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-graph-params.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-graph-params.tsx
@@ -2,8 +2,8 @@
 
 import { Controller, useForm } from 'react-hook-form';
 
-import { Checkbox } from '@/components/input1';
-import { ModalForm } from '@/components/modal1';
+import { Checkbox } from '@/components/input';
+import { ModalForm } from '@/components/modal';
 
 import { CstType } from '../backend/types';
 import { labelCstType } from '../labels';
diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-inline-synthesis/dlg-inline-synthesis.tsx b/rsconcept/frontend/src/features/rsform/dialogs/dlg-inline-synthesis/dlg-inline-synthesis.tsx
index 9f8cb9c4..823e76d5 100644
--- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-inline-synthesis/dlg-inline-synthesis.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-inline-synthesis/dlg-inline-synthesis.tsx
@@ -4,9 +4,9 @@ import { Suspense, useState } from 'react';
 import { FormProvider, useForm, useWatch } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 
-import { Loader } from '@/components/loader1';
-import { ModalForm } from '@/components/modal1';
-import { TabLabel, TabList, TabPanel, Tabs } from '@/components/tabs1';
+import { Loader } from '@/components/loader';
+import { ModalForm } from '@/components/modal';
+import { TabLabel, TabList, TabPanel, Tabs } from '@/components/tabs';
 import { useDialogsStore } from '@/stores/dialogs';
 
 import { type IInlineSynthesisDTO, schemaInlineSynthesis } from '../../backend/types';
diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-inline-synthesis/tab-source.tsx b/rsconcept/frontend/src/features/rsform/dialogs/dlg-inline-synthesis/tab-source.tsx
index 599f0459..c58e17b9 100644
--- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-inline-synthesis/tab-source.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-inline-synthesis/tab-source.tsx
@@ -6,7 +6,7 @@ import { LibraryItemType } from '@/features/library';
 import { useLibrary } from '@/features/library/backend/use-library';
 import { PickSchema } from '@/features/library/components';
 
-import { TextInput } from '@/components/input1';
+import { TextInput } from '@/components/input';
 import { useDialogsStore } from '@/stores/dialogs';
 
 import { type IInlineSynthesisDTO } from '../../backend/types';
diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-rename-cst.tsx b/rsconcept/frontend/src/features/rsform/dialogs/dlg-rename-cst.tsx
index 1669ab49..495d45cc 100644
--- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-rename-cst.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-rename-cst.tsx
@@ -5,8 +5,8 @@ import { zodResolver } from '@hookform/resolvers/zod';
 
 import { HelpTopic } from '@/features/help';
 
-import { TextInput } from '@/components/input1';
-import { ModalForm } from '@/components/modal1';
+import { TextInput } from '@/components/input';
+import { ModalForm } from '@/components/modal';
 import { useDialogsStore } from '@/stores/dialogs';
 
 import { type CstType, type ICstRenameDTO, schemaCstRename } from '../backend/types';
diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-show-ast/dlg-show-ast.tsx b/rsconcept/frontend/src/features/rsform/dialogs/dlg-show-ast/dlg-show-ast.tsx
index d149dbfa..636071d6 100644
--- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-show-ast/dlg-show-ast.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-show-ast/dlg-show-ast.tsx
@@ -6,7 +6,7 @@ import clsx from 'clsx';
 
 import { HelpTopic } from '@/features/help';
 
-import { ModalView } from '@/components/modal1';
+import { ModalView } from '@/components/modal';
 import { useDialogsStore } from '@/stores/dialogs';
 
 import { type SyntaxTree } from '../../models/rslang';
diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-show-ast/graph/ast-edge-types.ts b/rsconcept/frontend/src/features/rsform/dialogs/dlg-show-ast/graph/ast-edge-types.ts
index 487e215d..86b1ef3e 100644
--- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-show-ast/graph/ast-edge-types.ts
+++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-show-ast/graph/ast-edge-types.ts
@@ -1,6 +1,6 @@
 import { type EdgeTypes } from 'reactflow';
 
-import { DynamicEdge } from '@/components/flow1/dynamic-edge';
+import { DynamicEdge } from '@/components/flow/dynamic-edge';
 
 export const ASTEdgeTypes: EdgeTypes = {
   dynamic: DynamicEdge
diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-show-qr.tsx b/rsconcept/frontend/src/features/rsform/dialogs/dlg-show-qr.tsx
index 7cc71f6a..e0e51154 100644
--- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-show-qr.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-show-qr.tsx
@@ -2,7 +2,7 @@
 
 import { QRCodeSVG } from 'qrcode.react';
 
-import { ModalView } from '@/components/modal1';
+import { ModalView } from '@/components/modal';
 import { useDialogsStore } from '@/stores/dialogs';
 
 export interface DlgShowQRProps {
diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-show-type-graph/dlg-show-type-graph.tsx b/rsconcept/frontend/src/features/rsform/dialogs/dlg-show-type-graph/dlg-show-type-graph.tsx
index 90b598d6..6544f689 100644
--- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-show-type-graph/dlg-show-type-graph.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-show-type-graph/dlg-show-type-graph.tsx
@@ -5,7 +5,7 @@ import { ReactFlowProvider } from 'reactflow';
 
 import { HelpTopic } from '@/features/help';
 
-import { ModalView } from '@/components/modal1';
+import { ModalView } from '@/components/modal';
 import { useDialogsStore } from '@/stores/dialogs';
 import { errorMsg } from '@/utils/labels';
 
diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-substitute-cst.tsx b/rsconcept/frontend/src/features/rsform/dialogs/dlg-substitute-cst.tsx
index f0f5526a..a43b27d5 100644
--- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-substitute-cst.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-substitute-cst.tsx
@@ -5,8 +5,8 @@ import { zodResolver } from '@hookform/resolvers/zod';
 
 import { HelpTopic } from '@/features/help';
 
-import { ErrorField } from '@/components/input1';
-import { ModalForm } from '@/components/modal1';
+import { ErrorField } from '@/components/input';
+import { ModalForm } from '@/components/modal';
 import { useDialogsStore } from '@/stores/dialogs';
 
 import { type ICstSubstitutionsDTO, schemaCstSubstitutions } from '../backend/types';
diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-upload-rsform.tsx b/rsconcept/frontend/src/features/rsform/dialogs/dlg-upload-rsform.tsx
index 266bc978..4c6f3ae5 100644
--- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-upload-rsform.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-upload-rsform.tsx
@@ -2,8 +2,8 @@
 
 import { useState } from 'react';
 
-import { Checkbox, FileInput } from '@/components/input1';
-import { ModalForm } from '@/components/modal1';
+import { Checkbox, FileInput } from '@/components/input';
+import { ModalForm } from '@/components/modal';
 import { useDialogsStore } from '@/stores/dialogs';
 import { EXTEOR_TRS_FILE } from '@/utils/constants';
 
diff --git a/rsconcept/frontend/src/features/rsform/models/rsform.ts b/rsconcept/frontend/src/features/rsform/models/rsform.ts
index 9a9f0de4..e3923927 100644
--- a/rsconcept/frontend/src/features/rsform/models/rsform.ts
+++ b/rsconcept/frontend/src/features/rsform/models/rsform.ts
@@ -5,7 +5,7 @@
 import { type ILibraryItemData, type IVersionInfo } from '@/features/library/backend/types';
 import { type CurrentVersion, type ILibraryItemReference } from '@/features/library/models/library';
 
-import { type Graph } from '@/models/graph1';
+import { type Graph } from '@/models/graph';
 
 import { CstType, type ParsingStatus, type ValueClass } from '../backend/types';
 
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-constituenta/form-constituenta.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-constituenta/form-constituenta.tsx
index 93d12e8b..bbdf9b6a 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-constituenta/form-constituenta.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-constituenta/form-constituenta.tsx
@@ -6,10 +6,10 @@ import { Controller, useForm } from 'react-hook-form';
 import { toast } from 'react-toastify';
 import { zodResolver } from '@hookform/resolvers/zod';
 
-import { MiniButton, SubmitButton } from '@/components/control1';
-import { IconChild, IconEdit, IconPredecessor, IconSave } from '@/components/icons1';
-import { TextArea } from '@/components/input1';
-import { Indicator } from '@/components/view1';
+import { MiniButton, SubmitButton } from '@/components/control';
+import { IconChild, IconEdit, IconPredecessor, IconSave } from '@/components/icons';
+import { TextArea } from '@/components/input';
+import { Indicator } from '@/components/view';
 import { useDialogsStore } from '@/stores/dialogs';
 import { useModificationStore } from '@/stores/modification';
 import { errorMsg, tooltipText } from '@/utils/labels';
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-constituenta/toolbar-constituenta.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-constituenta/toolbar-constituenta.tsx
index 2e36a2a3..5ec879e2 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-constituenta/toolbar-constituenta.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-constituenta/toolbar-constituenta.tsx
@@ -8,7 +8,7 @@ import { BadgeHelp } from '@/features/help/components';
 import { MiniSelectorOSS } from '@/features/library/components';
 import { useFindPredecessor } from '@/features/oss/backend/use-find-predecessor';
 
-import { MiniButton } from '@/components/control1';
+import { MiniButton } from '@/components/control';
 import {
   IconClone,
   IconDestroy,
@@ -20,7 +20,7 @@ import {
   IconPredecessor,
   IconReset,
   IconSave
-} from '@/components/icons1';
+} from '@/components/icons';
 import { useModificationStore } from '@/stores/modification';
 import { usePreferencesStore } from '@/stores/preferences';
 import { tooltipText } from '@/utils/labels';
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsexpression/status-bar.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsexpression/status-bar.tsx
index 916b2904..0d2ee8c8 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsexpression/status-bar.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsexpression/status-bar.tsx
@@ -5,7 +5,7 @@ import clsx from 'clsx';
 import { HelpTopic } from '@/features/help';
 import { BadgeHelp } from '@/features/help/components';
 
-import { Loader } from '@/components/loader1';
+import { Loader } from '@/components/loader';
 import { APP_COLORS } from '@/styling/colors';
 import { globalIDs } from '@/utils/constants';
 import { prepareTooltip } from '@/utils/utils';
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsexpression/toolbar-rsexpression.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsexpression/toolbar-rsexpression.tsx
index 9c85ca3c..148d4089 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsexpression/toolbar-rsexpression.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsexpression/toolbar-rsexpression.tsx
@@ -1,7 +1,7 @@
 import clsx from 'clsx';
 
-import { MiniButton } from '@/components/control1';
-import { IconControls, IconTree, IconTypeGraph } from '@/components/icons1';
+import { MiniButton } from '@/components/control';
+import { IconControls, IconTree, IconTypeGraph } from '@/components/icons';
 import { usePreferencesStore } from '@/stores/preferences';
 
 import { useMutatingRSForm } from '../../../backend/use-mutating-rsform';
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/form-rsform.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/form-rsform.tsx
index 899db5d3..c3e97058 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/form-rsform.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/form-rsform.tsx
@@ -15,9 +15,9 @@ import {
 import { useUpdateItem } from '@/features/library/backend/use-update-item';
 import { SelectVersion, ToolbarItemAccess } from '@/features/library/components';
 
-import { SubmitButton } from '@/components/control1';
-import { IconSave } from '@/components/icons1';
-import { Label, TextArea, TextInput } from '@/components/input1';
+import { SubmitButton } from '@/components/control';
+import { IconSave } from '@/components/icons';
+import { Label, TextArea, TextInput } from '@/components/input';
 import { useModificationStore } from '@/stores/modification';
 import { globalIDs } from '@/utils/constants';
 
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/rsform-stats.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/rsform-stats.tsx
index 7031a6da..f8fe13b8 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/rsform-stats.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/rsform-stats.tsx
@@ -18,8 +18,8 @@ import {
   IconStatusOK,
   IconStatusProperty,
   IconTerminology
-} from '@/components/icons1';
-import { ValueStats } from '@/components/view1';
+} from '@/components/icons';
+import { ValueStats } from '@/components/view';
 
 import { type IRSFormStats } from '../../../models/rsform';
 
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/toolbar-versioning.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/toolbar-versioning.tsx
index 396bf1b4..0e9a586c 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/toolbar-versioning.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/toolbar-versioning.tsx
@@ -6,8 +6,8 @@ import { HelpTopic } from '@/features/help';
 import { BadgeHelp } from '@/features/help/components';
 import { useVersionRestore } from '@/features/library/backend/use-version-restore';
 
-import { MiniButton } from '@/components/control1';
-import { IconNewVersion, IconUpload, IconVersions } from '@/components/icons1';
+import { MiniButton } from '@/components/control';
+import { IconNewVersion, IconUpload, IconVersions } from '@/components/icons';
 import { useDialogsStore } from '@/stores/dialogs';
 import { useModificationStore } from '@/stores/modification';
 import { promptText } from '@/utils/labels';
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rslist/editor-rslist.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rslist/editor-rslist.tsx
index 7975a1ec..f6a716a0 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rslist/editor-rslist.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rslist/editor-rslist.tsx
@@ -4,10 +4,10 @@ import { useState } from 'react';
 import { toast } from 'react-toastify';
 import fileDownload from 'js-file-download';
 
-import { MiniButton } from '@/components/control1';
+import { MiniButton } from '@/components/control';
 import { type RowSelectionState } from '@/components/data-table';
-import { IconCSV } from '@/components/icons1';
-import { SearchBar } from '@/components/input1';
+import { IconCSV } from '@/components/icons';
+import { SearchBar } from '@/components/input';
 import { useFitHeight } from '@/stores/app-layout';
 import { infoMsg } from '@/utils/labels';
 import { convertToCSV } from '@/utils/utils';
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rslist/table-rslist.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rslist/table-rslist.tsx
index e39c8433..f9b637a7 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rslist/table-rslist.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rslist/table-rslist.tsx
@@ -1,8 +1,8 @@
 'use client';
 
-import { TextURL } from '@/components/control1';
+import { TextURL } from '@/components/control';
 import { createColumnHelper, DataTable, type RowSelectionState, type VisibilityState } from '@/components/data-table';
-import { NoData, TextContent } from '@/components/view1';
+import { NoData, TextContent } from '@/components/view';
 import { useWindowSize } from '@/hooks/use-window-size';
 import { prefixes } from '@/utils/constants';
 import { truncateToSymbol } from '@/utils/utils';
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rslist/toolbar-rslist.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rslist/toolbar-rslist.tsx
index 5c9c0fcf..48864d50 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rslist/toolbar-rslist.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rslist/toolbar-rslist.tsx
@@ -5,8 +5,8 @@ import { BadgeHelp } from '@/features/help/components';
 import { MiniSelectorOSS } from '@/features/library/components';
 import { CstType } from '@/features/rsform';
 
-import { MiniButton } from '@/components/control1';
-import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown1';
+import { MiniButton } from '@/components/control';
+import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown';
 import {
   IconClone,
   IconDestroy,
@@ -15,7 +15,7 @@ import {
   IconNewItem,
   IconOpenList,
   IconReset
-} from '@/components/icons1';
+} from '@/components/icons';
 import { prefixes } from '@/utils/constants';
 import { prepareTooltip } from '@/utils/utils';
 
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/graph-selectors.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/graph-selectors.tsx
index 60bc2a35..09e050ea 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/graph-selectors.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/graph-selectors.tsx
@@ -1,7 +1,7 @@
 import { HelpTopic } from '@/features/help';
 import { BadgeHelp } from '@/features/help/components';
 
-import { SelectSingle } from '@/components/input1';
+import { SelectSingle } from '@/components/input';
 
 import { mapLabelColoring } from '../../../labels';
 import { type GraphColoring, useTermGraphStore } from '../../../stores/term-graph';
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/graph/tg-edge-types.ts b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/graph/tg-edge-types.ts
index faa421db..f2a8117f 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/graph/tg-edge-types.ts
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/graph/tg-edge-types.ts
@@ -1,6 +1,6 @@
 import { type EdgeTypes } from 'reactflow';
 
-import { DynamicEdge } from '@/components/flow1/dynamic-edge';
+import { DynamicEdge } from '@/components/flow/dynamic-edge';
 
 export const TGEdgeTypes: EdgeTypes = {
   termEdge: DynamicEdge
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/schemas-guide.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/schemas-guide.tsx
index fc49a076..fadb4012 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/schemas-guide.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/schemas-guide.tsx
@@ -1,7 +1,7 @@
 import { useLibrary } from '@/features/library/backend/use-library';
 
-import { Tooltip } from '@/components/container1';
-import { IconHelp } from '@/components/icons1';
+import { Tooltip } from '@/components/container';
+import { IconHelp } from '@/components/icons';
 import { globalIDs, prefixes } from '@/utils/constants';
 
 import { colorBgSchemas } from '../../../colors';
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/toolbar-focused-cst.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/toolbar-focused-cst.tsx
index 630ea902..90337771 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/toolbar-focused-cst.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/toolbar-focused-cst.tsx
@@ -1,7 +1,7 @@
 'use client';
 
-import { MiniButton } from '@/components/control1';
-import { IconGraphInputs, IconGraphOutputs, IconReset } from '@/components/icons1';
+import { MiniButton } from '@/components/control';
+import { IconGraphInputs, IconGraphOutputs, IconReset } from '@/components/icons';
 import { APP_COLORS } from '@/styling/colors';
 
 import { useTermGraphStore } from '../../../stores/term-graph';
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/toolbar-term-graph.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/toolbar-term-graph.tsx
index a36f9d65..78ed3470 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/toolbar-term-graph.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/toolbar-term-graph.tsx
@@ -4,7 +4,7 @@ import { HelpTopic } from '@/features/help';
 import { BadgeHelp } from '@/features/help/components';
 import { MiniSelectorOSS } from '@/features/library/components';
 
-import { MiniButton } from '@/components/control1';
+import { MiniButton } from '@/components/control';
 import {
   IconClustering,
   IconClusteringOff,
@@ -15,7 +15,7 @@ import {
   IconText,
   IconTextOff,
   IconTypeGraph
-} from '@/components/icons1';
+} from '@/components/icons';
 import { useDialogsStore } from '@/stores/dialogs';
 import { PARAMETER } from '@/utils/constants';
 
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/view-hidden.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/view-hidden.tsx
index b72f4464..e779487d 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/view-hidden.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/view-hidden.tsx
@@ -2,8 +2,8 @@
 
 import clsx from 'clsx';
 
-import { MiniButton } from '@/components/control1';
-import { IconDropArrow, IconDropArrowUp } from '@/components/icons1';
+import { MiniButton } from '@/components/control';
+import { IconDropArrow, IconDropArrowUp } from '@/components/icons';
 import { useWindowSize } from '@/hooks/use-window-size';
 import { useFitHeight } from '@/stores/app-layout';
 import { APP_COLORS } from '@/styling/colors';
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/menu-edit-schema.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/menu-edit-schema.tsx
index eac288c6..4f6fd375 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/menu-edit-schema.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/menu-edit-schema.tsx
@@ -1,9 +1,9 @@
 import { urls, useConceptNavigation } from '@/app';
 import { useAuthSuspense } from '@/features/auth';
 
-import { Divider } from '@/components/container1';
-import { Button } from '@/components/control1';
-import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown1';
+import { Divider } from '@/components/container';
+import { Button } from '@/components/control';
+import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown';
 import {
   IconArchive,
   IconEdit2,
@@ -13,7 +13,7 @@ import {
   IconReplace,
   IconSortList,
   IconTemplates
-} from '@/components/icons1';
+} from '@/components/icons';
 import { useDialogsStore } from '@/stores/dialogs';
 import { useModificationStore } from '@/stores/modification';
 import { promptUnsaved } from '@/utils/utils';
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/menu-main.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/menu-main.tsx
index a3c20661..56ae3e24 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/menu-main.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/menu-main.tsx
@@ -5,9 +5,9 @@ import { useAuthSuspense } from '@/features/auth';
 import { AccessPolicy, LocationHead } from '@/features/library';
 import { useRoleStore, UserRole } from '@/features/users';
 
-import { Divider } from '@/components/container1';
-import { Button } from '@/components/control1';
-import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown1';
+import { Divider } from '@/components/container';
+import { Button } from '@/components/control';
+import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown';
 import {
   IconClone,
   IconDestroy,
@@ -19,7 +19,7 @@ import {
   IconQR,
   IconShare,
   IconUpload
-} from '@/components/icons1';
+} from '@/components/icons';
 import { useDialogsStore } from '@/stores/dialogs';
 import { useModificationStore } from '@/stores/modification';
 import { EXTEOR_TRS_FILE } from '@/utils/constants';
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/rsform-page.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/rsform-page.tsx
index f851ad4f..b9db2ae5 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/rsform-page.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/rsform-page.tsx
@@ -8,8 +8,8 @@ import { z } from 'zod';
 import { urls, useBlockNavigation, useConceptNavigation } from '@/app';
 
 import { isAxiosError } from '@/backend/api-transport';
-import { Divider } from '@/components/container1';
-import { TextURL } from '@/components/control1';
+import { Divider } from '@/components/container';
+import { TextURL } from '@/components/control';
 import { type ErrorData } from '@/components/info-error';
 import { useQueryStrings } from '@/hooks/use-query-strings';
 import { useModificationStore } from '@/stores/modification';
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/rstabs1.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/rstabs1.tsx
index 328b60b3..a62d085c 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/rstabs1.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/rstabs1.tsx
@@ -4,7 +4,7 @@ import { useLayoutEffect } from 'react';
 
 import { useConceptNavigation } from '@/app/navigation1/navigation-context';
 
-import { TabLabel, TabList, TabPanel, Tabs } from '@/components/tabs1';
+import { TabLabel, TabList, TabPanel, Tabs } from '@/components/tabs';
 import { useAppLayoutStore } from '@/stores/app-layout';
 import { useModificationStore } from '@/stores/modification';
 
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/view-constituents/constituents-search.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/view-constituents/constituents-search.tsx
index a8cce21f..3e84aa2f 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/view-constituents/constituents-search.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/view-constituents/constituents-search.tsx
@@ -1,8 +1,8 @@
 'use client';
 
-import { MiniButton } from '@/components/control1';
-import { IconChild } from '@/components/icons1';
-import { SearchBar } from '@/components/input1';
+import { MiniButton } from '@/components/control';
+import { IconChild } from '@/components/icons';
+import { SearchBar } from '@/components/input';
 
 import { SelectMatchMode } from './select-match-mode';
 import { useCstSearchStore } from '../../../stores/cst-search';
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/view-constituents/select-graph-filter.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/view-constituents/select-graph-filter.tsx
index 311163c7..96fe6845 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/view-constituents/select-graph-filter.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/view-constituents/select-graph-filter.tsx
@@ -2,8 +2,8 @@
 
 import clsx from 'clsx';
 
-import { SelectorButton } from '@/components/control1';
-import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown1';
+import { SelectorButton } from '@/components/control';
+import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown';
 import { type Styling } from '@/components/props';
 import { useWindowSize } from '@/hooks/use-window-size';
 import { prefixes } from '@/utils/constants';
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/view-constituents/select-match-mode.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/view-constituents/select-match-mode.tsx
index 609a41b5..f90dd62f 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/view-constituents/select-match-mode.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/view-constituents/select-match-mode.tsx
@@ -2,8 +2,8 @@
 
 import clsx from 'clsx';
 
-import { SelectorButton } from '@/components/control1';
-import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown1';
+import { SelectorButton } from '@/components/control';
+import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown';
 import { type Styling } from '@/components/props';
 import { useWindowSize } from '@/hooks/use-window-size';
 import { prefixes } from '@/utils/constants';
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/view-constituents/table-side-constituents.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/view-constituents/table-side-constituents.tsx
index 646abb02..3dcf40d6 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/view-constituents/table-side-constituents.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/view-constituents/table-side-constituents.tsx
@@ -3,7 +3,7 @@
 import { useEffect } from 'react';
 
 import { createColumnHelper, DataTable, type IConditionalStyle } from '@/components/data-table';
-import { NoData, TextContent } from '@/components/view1';
+import { NoData, TextContent } from '@/components/view';
 import { APP_COLORS } from '@/styling/colors';
 import { PARAMETER, prefixes } from '@/utils/constants';
 
diff --git a/rsconcept/frontend/src/features/users/components/select-user.tsx b/rsconcept/frontend/src/features/users/components/select-user.tsx
index 3b75f54f..6abb3a28 100644
--- a/rsconcept/frontend/src/features/users/components/select-user.tsx
+++ b/rsconcept/frontend/src/features/users/components/select-user.tsx
@@ -2,7 +2,7 @@
 
 import clsx from 'clsx';
 
-import { SelectSingle } from '@/components/input1';
+import { SelectSingle } from '@/components/input';
 import { type Styling } from '@/components/props';
 
 import { useLabelUser } from '../backend/use-label-user';
diff --git a/rsconcept/frontend/src/features/users/components/table-users.tsx b/rsconcept/frontend/src/features/users/components/table-users.tsx
index 3a36dda8..94fc2519 100644
--- a/rsconcept/frontend/src/features/users/components/table-users.tsx
+++ b/rsconcept/frontend/src/features/users/components/table-users.tsx
@@ -1,8 +1,8 @@
 'use client';
 
-import { MiniButton } from '@/components/control1';
+import { MiniButton } from '@/components/control';
 import { createColumnHelper, DataTable } from '@/components/data-table';
-import { IconRemove } from '@/components/icons1';
+import { IconRemove } from '@/components/icons';
 
 import { type IUserInfo } from '../backend/types';
 
diff --git a/rsconcept/frontend/src/features/users/pages/register-page/form-signup.tsx b/rsconcept/frontend/src/features/users/pages/register-page/form-signup.tsx
index 24e75780..eccce706 100644
--- a/rsconcept/frontend/src/features/users/pages/register-page/form-signup.tsx
+++ b/rsconcept/frontend/src/features/users/pages/register-page/form-signup.tsx
@@ -8,12 +8,12 @@ import { urls, useConceptNavigation } from '@/app';
 import { HelpTopic } from '@/features/help';
 
 import { isAxiosError } from '@/backend/api-transport';
-import { Tooltip } from '@/components/container1';
-import { Button, SubmitButton, TextURL } from '@/components/control1';
-import { IconHelp } from '@/components/icons1';
+import { Tooltip } from '@/components/container';
+import { Button, SubmitButton, TextURL } from '@/components/control';
+import { IconHelp } from '@/components/icons';
 import { type ErrorData } from '@/components/info-error';
-import { Checkbox, TextInput } from '@/components/input1';
-import { PrettyJson } from '@/components/view1';
+import { Checkbox, TextInput } from '@/components/input';
+import { PrettyJson } from '@/components/view';
 import { globalIDs, patterns } from '@/utils/constants';
 
 import { type IUserSignupDTO, schemaUserSignup } from '../../backend/types';
diff --git a/rsconcept/frontend/src/features/users/pages/user-profile-page/editor-password.tsx b/rsconcept/frontend/src/features/users/pages/user-profile-page/editor-password.tsx
index c350f052..147d40d2 100644
--- a/rsconcept/frontend/src/features/users/pages/user-profile-page/editor-password.tsx
+++ b/rsconcept/frontend/src/features/users/pages/user-profile-page/editor-password.tsx
@@ -8,9 +8,9 @@ import { type IChangePasswordDTO, schemaChangePassword } from '@/features/auth';
 import { useChangePassword } from '@/features/auth/backend/use-change-password';
 
 import { isAxiosError } from '@/backend/api-transport';
-import { SubmitButton } from '@/components/control1';
+import { SubmitButton } from '@/components/control';
 import { type ErrorData } from '@/components/info-error';
-import { TextInput } from '@/components/input1';
+import { TextInput } from '@/components/input';
 
 export function EditorPassword() {
   const router = useConceptNavigation();
diff --git a/rsconcept/frontend/src/features/users/pages/user-profile-page/editor-profile.tsx b/rsconcept/frontend/src/features/users/pages/user-profile-page/editor-profile.tsx
index 0592118f..8ca2a9dc 100644
--- a/rsconcept/frontend/src/features/users/pages/user-profile-page/editor-profile.tsx
+++ b/rsconcept/frontend/src/features/users/pages/user-profile-page/editor-profile.tsx
@@ -6,9 +6,9 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { useBlockNavigation } from '@/app';
 
 import { isAxiosError } from '@/backend/api-transport';
-import { SubmitButton } from '@/components/control1';
+import { SubmitButton } from '@/components/control';
 import { type ErrorData } from '@/components/info-error';
-import { TextInput } from '@/components/input1';
+import { TextInput } from '@/components/input';
 
 import { type IUpdateProfileDTO, schemaUpdateProfile } from '../../backend/types';
 import { useProfileSuspense } from '../../backend/use-profile';
diff --git a/rsconcept/frontend/src/models/graph1.test.ts b/rsconcept/frontend/src/models/graph.test.ts
similarity index 99%
rename from rsconcept/frontend/src/models/graph1.test.ts
rename to rsconcept/frontend/src/models/graph.test.ts
index 4e7f93b9..1f0cd8f7 100644
--- a/rsconcept/frontend/src/models/graph1.test.ts
+++ b/rsconcept/frontend/src/models/graph.test.ts
@@ -1,4 +1,4 @@
-import { Graph } from './graph1';
+import { Graph } from './graph';
 
 describe('Testing Graph construction', () => {
   test('empty Graph should be empty', () => {
diff --git a/rsconcept/frontend/src/models/graph1.ts b/rsconcept/frontend/src/models/graph.ts
similarity index 100%
rename from rsconcept/frontend/src/models/graph1.ts
rename to rsconcept/frontend/src/models/graph.ts