diff --git a/rsconcept/frontend/src/app/ApplicationLayout.tsx b/rsconcept/frontend/src/app/ApplicationLayout.tsx
index 9385b2fa..609d1ee5 100644
--- a/rsconcept/frontend/src/app/ApplicationLayout.tsx
+++ b/rsconcept/frontend/src/app/ApplicationLayout.tsx
@@ -1,16 +1,16 @@
 import { Suspense } from 'react';
 import { Outlet } from 'react-router';
 
-import ConceptToaster from '@/app/ConceptToaster';
-import Footer from '@/app/Footer';
-import Navigation from '@/app/Navigation';
-import Loader from '@/components/ui/Loader';
-import { ModalLoader } from '@/components/ui/Modal';
+import { Loader } from '@/components/Loader';
+import { ModalLoader } from '@/components/Modal';
 import { useAppLayoutStore, useMainHeight, useViewportHeight } from '@/stores/appLayout';
 import { globals } from '@/utils/constants';
 
+import { Footer } from './Footer';
 import { GlobalDialogs } from './GlobalDialogs';
+import ConceptToaster from './GlobalToaster';
 import { GlobalTooltips } from './GlobalTooltips';
+import { Navigation } from './Navigation';
 import { NavigationState } from './Navigation/NavigationContext';
 
 function ApplicationLayout() {
diff --git a/rsconcept/frontend/src/app/ErrorFallback.tsx b/rsconcept/frontend/src/app/ErrorFallback.tsx
index d25ec65b..e701cd5b 100644
--- a/rsconcept/frontend/src/app/ErrorFallback.tsx
+++ b/rsconcept/frontend/src/app/ErrorFallback.tsx
@@ -1,9 +1,9 @@
 import { useNavigate, useRouteError } from 'react-router';
 
-import InfoError from '@/components/info/InfoError';
-import { Button } from '@/components/ui/Control';
+import { Button } from '@/components/Control';
+import { InfoError } from '@/components/InfoError';
 
-function ErrorFallback() {
+export function ErrorFallback() {
   const error = useRouteError();
   const router = useNavigate();
 
@@ -18,5 +18,3 @@ function ErrorFallback() {
     </div>
   );
 }
-
-export default ErrorFallback;
diff --git a/rsconcept/frontend/src/app/Footer.tsx b/rsconcept/frontend/src/app/Footer.tsx
index 46fd852d..d0069c82 100644
--- a/rsconcept/frontend/src/app/Footer.tsx
+++ b/rsconcept/frontend/src/app/Footer.tsx
@@ -1,9 +1,9 @@
 import clsx from 'clsx';
 
-import { TextURL } from '@/components/ui/Control';
+import { TextURL } from '@/components/Control';
 import { external_urls } from '@/utils/constants';
 
-function Footer() {
+export function Footer() {
   return (
     <footer
       className={clsx(
@@ -25,5 +25,3 @@ function Footer() {
     </footer>
   );
 }
-
-export default Footer;
diff --git a/rsconcept/frontend/src/app/GlobalDialogs.tsx b/rsconcept/frontend/src/app/GlobalDialogs.tsx
index 2ff1fcde..b7d99df9 100644
--- a/rsconcept/frontend/src/app/GlobalDialogs.tsx
+++ b/rsconcept/frontend/src/app/GlobalDialogs.tsx
@@ -2,32 +2,31 @@
 
 import React from 'react';
 
-import { DialogType } from '@/models/miscellaneous';
-import { useDialogsStore } from '@/stores/dialogs';
+import { DialogType, useDialogsStore } from '@/stores/dialogs';
 
-const DlgChangeInputSchema = React.lazy(() => import('@/dialogs/DlgChangeInputSchema'));
-const DlgChangeLocation = React.lazy(() => import('@/dialogs/DlgChangeLocation'));
-const DlgCloneLibraryItem = React.lazy(() => import('@/dialogs/DlgCloneLibraryItem'));
-const DlgCreateCst = React.lazy(() => import('@/dialogs/DlgCreateCst'));
-const DlgCreateOperation = React.lazy(() => import('@/dialogs/DlgCreateOperation'));
-const DlgCreateVersion = React.lazy(() => import('@/dialogs/DlgCreateVersion'));
-const DlgCstTemplate = React.lazy(() => import('@/dialogs/DlgCstTemplate'));
-const DlgDeleteCst = React.lazy(() => import('@/dialogs/DlgDeleteCst'));
-const DlgDeleteOperation = React.lazy(() => import('@/dialogs/DlgDeleteOperation'));
-const DlgEditEditors = React.lazy(() => import('@/dialogs/DlgEditEditors'));
-const DlgEditOperation = React.lazy(() => import('@/dialogs/DlgEditOperation'));
-const DlgEditReference = React.lazy(() => import('@/dialogs/DlgEditReference'));
-const DlgEditVersions = React.lazy(() => import('@/dialogs/DlgEditVersions'));
-const DlgEditWordForms = React.lazy(() => import('@/dialogs/DlgEditWordForms'));
-const DlgGraphParams = React.lazy(() => import('@/dialogs/DlgGraphParams'));
-const DlgInlineSynthesis = React.lazy(() => import('@/dialogs/DlgInlineSynthesis'));
-const DlgRelocateConstituents = React.lazy(() => import('@/dialogs/DlgRelocateConstituents'));
-const DlgRenameCst = React.lazy(() => import('@/dialogs/DlgRenameCst'));
-const DlgShowAST = React.lazy(() => import('@/dialogs/DlgShowAST'));
-const DlgShowQR = React.lazy(() => import('@/dialogs/DlgShowQR'));
-const DlgShowTypeGraph = React.lazy(() => import('@/dialogs/DlgShowTypeGraph'));
-const DlgSubstituteCst = React.lazy(() => import('@/dialogs/DlgSubstituteCst'));
-const DlgUploadRSForm = React.lazy(() => import('@/dialogs/DlgUploadRSForm'));
+const DlgChangeInputSchema = React.lazy(() => import('@/features/oss/dialogs/DlgChangeInputSchema'));
+const DlgChangeLocation = React.lazy(() => import('@/features/library/dialogs/DlgChangeLocation'));
+const DlgCloneLibraryItem = React.lazy(() => import('@/features/rsform/dialogs/DlgCloneLibraryItem'));
+const DlgCreateCst = React.lazy(() => import('@/features/rsform/dialogs/DlgCreateCst'));
+const DlgCreateOperation = React.lazy(() => import('@/features/oss/dialogs/DlgCreateOperation'));
+const DlgCreateVersion = React.lazy(() => import('@/features/rsform/dialogs/DlgCreateVersion'));
+const DlgCstTemplate = React.lazy(() => import('@/features/rsform/dialogs/DlgCstTemplate'));
+const DlgDeleteCst = React.lazy(() => import('@/features/rsform/dialogs/DlgDeleteCst'));
+const DlgDeleteOperation = React.lazy(() => import('@/features/oss/dialogs/DlgDeleteOperation'));
+const DlgEditEditors = React.lazy(() => import('@/features/rsform/dialogs/DlgEditEditors'));
+const DlgEditOperation = React.lazy(() => import('@/features/oss/dialogs/DlgEditOperation'));
+const DlgEditReference = React.lazy(() => import('@/features/rsform/dialogs/DlgEditReference'));
+const DlgEditVersions = React.lazy(() => import('@/features/rsform/dialogs/DlgEditVersions'));
+const DlgEditWordForms = React.lazy(() => import('@/features/rsform/dialogs/DlgEditWordForms'));
+const DlgGraphParams = React.lazy(() => import('@/features/rsform/dialogs/DlgGraphParams'));
+const DlgInlineSynthesis = React.lazy(() => import('@/features/rsform/dialogs/DlgInlineSynthesis'));
+const DlgRelocateConstituents = React.lazy(() => import('@/features/oss/dialogs/DlgRelocateConstituents'));
+const DlgRenameCst = React.lazy(() => import('@/features/rsform/dialogs/DlgRenameCst'));
+const DlgShowAST = React.lazy(() => import('@/features/rsform/dialogs/DlgShowAST'));
+const DlgShowQR = React.lazy(() => import('@/features/rsform/dialogs/DlgShowQR'));
+const DlgShowTypeGraph = React.lazy(() => import('@/features/rsform/dialogs/DlgShowTypeGraph'));
+const DlgSubstituteCst = React.lazy(() => import('@/features/rsform/dialogs/DlgSubstituteCst'));
+const DlgUploadRSForm = React.lazy(() => import('@/features/rsform/dialogs/DlgUploadRSForm'));
 
 export const GlobalDialogs = () => {
   const active = useDialogsStore(state => state.active);
diff --git a/rsconcept/frontend/src/app/ConceptToaster.tsx b/rsconcept/frontend/src/app/GlobalToaster.tsx
similarity index 99%
rename from rsconcept/frontend/src/app/ConceptToaster.tsx
rename to rsconcept/frontend/src/app/GlobalToaster.tsx
index 8ee8d170..8299047f 100644
--- a/rsconcept/frontend/src/app/ConceptToaster.tsx
+++ b/rsconcept/frontend/src/app/GlobalToaster.tsx
@@ -6,7 +6,6 @@ interface ToasterThemedProps extends Omit<ToastContainerProps, 'theme'> {}
 
 function ToasterThemed(props: ToasterThemedProps) {
   const darkMode = usePreferencesStore(state => state.darkMode);
-
   return <ToastContainer theme={darkMode ? 'dark' : 'light'} {...props} />;
 }
 
diff --git a/rsconcept/frontend/src/app/GlobalTooltips.tsx b/rsconcept/frontend/src/app/GlobalTooltips.tsx
index 74311144..23076de8 100644
--- a/rsconcept/frontend/src/app/GlobalTooltips.tsx
+++ b/rsconcept/frontend/src/app/GlobalTooltips.tsx
@@ -1,8 +1,8 @@
 'use client';
 
-import InfoConstituenta from '@/components/info/InfoConstituenta';
-import { Tooltip } from '@/components/ui/Container';
-import Loader from '@/components/ui/Loader';
+import { Tooltip } from '@/components/Container';
+import { Loader } from '@/components/Loader';
+import InfoConstituenta from '@/features/rsform/components/InfoConstituenta';
 import { useTooltipsStore } from '@/stores/tooltips';
 import { globals } from '@/utils/constants';
 
diff --git a/rsconcept/frontend/src/app/Navigation/Navigation.tsx b/rsconcept/frontend/src/app/Navigation/Navigation.tsx
index 69f1fe28..027bca07 100644
--- a/rsconcept/frontend/src/app/Navigation/Navigation.tsx
+++ b/rsconcept/frontend/src/app/Navigation/Navigation.tsx
@@ -1,6 +1,5 @@
 import clsx from 'clsx';
 
-import { useConceptNavigation } from '@/app/Navigation/NavigationContext';
 import { IconLibrary2, IconManuals, IconNewItem2 } from '@/components/Icons';
 import { CProps } from '@/components/props';
 import useWindowSize from '@/hooks/useWindowSize';
@@ -10,10 +9,11 @@ import { PARAMETER } from '@/utils/constants';
 import { urls } from '../urls';
 import Logo from './Logo';
 import NavigationButton from './NavigationButton';
+import { useConceptNavigation } from './NavigationContext';
 import ToggleNavigation from './ToggleNavigation';
 import UserMenu from './UserMenu';
 
-function Navigation() {
+export function Navigation() {
   const router = useConceptNavigation();
   const size = useWindowSize();
   const noNavigationAnimation = useAppLayoutStore(state => state.noNavigationAnimation);
@@ -65,5 +65,3 @@ function Navigation() {
     </nav>
   );
 }
-
-export default Navigation;
diff --git a/rsconcept/frontend/src/app/Navigation/UserButton.tsx b/rsconcept/frontend/src/app/Navigation/UserButton.tsx
index bd00f10e..f56574da 100644
--- a/rsconcept/frontend/src/app/Navigation/UserButton.tsx
+++ b/rsconcept/frontend/src/app/Navigation/UserButton.tsx
@@ -1,5 +1,5 @@
-import { useAuthSuspense } from '@/backend/auth/useAuth';
 import { IconLogin, IconUser2 } from '@/components/Icons';
+import { useAuthSuspense } from '@/features/auth/backend/useAuth';
 import { usePreferencesStore } from '@/stores/preferences';
 
 import NavigationButton from './NavigationButton';
diff --git a/rsconcept/frontend/src/app/Navigation/UserDropdown.tsx b/rsconcept/frontend/src/app/Navigation/UserDropdown.tsx
index 3b705eda..af489c97 100644
--- a/rsconcept/frontend/src/app/Navigation/UserDropdown.tsx
+++ b/rsconcept/frontend/src/app/Navigation/UserDropdown.tsx
@@ -1,6 +1,4 @@
-import { useConceptNavigation } from '@/app/Navigation/NavigationContext';
-import { useAuthSuspense } from '@/backend/auth/useAuth';
-import { useLogout } from '@/backend/auth/useLogout';
+import { Dropdown, DropdownButton } from '@/components/Dropdown';
 import {
   IconAdmin,
   IconAdminOff,
@@ -16,10 +14,12 @@ import {
   IconUser
 } from '@/components/Icons';
 import { CProps } from '@/components/props';
-import { Dropdown, DropdownButton } from '@/components/ui/Dropdown';
+import { useAuthSuspense } from '@/features/auth/backend/useAuth';
+import { useLogout } from '@/features/auth/backend/useLogout';
 import { usePreferencesStore } from '@/stores/preferences';
 
 import { urls } from '../urls';
+import { useConceptNavigation } from './NavigationContext';
 
 interface UserDropdownProps {
   isOpen: boolean;
diff --git a/rsconcept/frontend/src/app/Navigation/UserMenu.tsx b/rsconcept/frontend/src/app/Navigation/UserMenu.tsx
index 653cd80e..24ffc9eb 100644
--- a/rsconcept/frontend/src/app/Navigation/UserMenu.tsx
+++ b/rsconcept/frontend/src/app/Navigation/UserMenu.tsx
@@ -1,10 +1,10 @@
 import { Suspense } from 'react';
 
-import { useConceptNavigation } from '@/app/Navigation/NavigationContext';
-import { useDropdown } from '@/components/ui/Dropdown';
-import Loader from '@/components/ui/Loader';
+import { useDropdown } from '@/components/Dropdown';
+import { Loader } from '@/components/Loader';
 
 import { urls } from '../urls';
+import { useConceptNavigation } from './NavigationContext';
 import UserButton from './UserButton';
 import UserDropdown from './UserDropdown';
 
diff --git a/rsconcept/frontend/src/app/Navigation/index.tsx b/rsconcept/frontend/src/app/Navigation/index.tsx
index 7bc6dc0e..61f39d15 100644
--- a/rsconcept/frontend/src/app/Navigation/index.tsx
+++ b/rsconcept/frontend/src/app/Navigation/index.tsx
@@ -1 +1 @@
-export { default } from './Navigation';
+export { Navigation } from './Navigation';
diff --git a/rsconcept/frontend/src/app/Router.tsx b/rsconcept/frontend/src/app/Router.tsx
index c74ab5b3..11705362 100644
--- a/rsconcept/frontend/src/app/Router.tsx
+++ b/rsconcept/frontend/src/app/Router.tsx
@@ -1,19 +1,19 @@
 import { createBrowserRouter } from 'react-router';
 
-import { prefetchAuth } from '@/backend/auth/useAuth';
-import { prefetchLibrary } from '@/backend/library/useLibrary';
-import { prefetchOSS } from '@/backend/oss/useOSS';
-import { prefetchRSForm } from '@/backend/rsform/useRSForm';
-import { prefetchProfile } from '@/backend/users/useProfile';
-import { prefetchUsers } from '@/backend/users/useUsers';
-import Loader from '@/components/ui/Loader';
-import CreateItemPage from '@/pages/CreateItemPage';
-import HomePage from '@/pages/HomePage';
-import LoginPage from '@/pages/LoginPage';
-import NotFoundPage from '@/pages/NotFoundPage';
+import { Loader } from '@/components/Loader';
+import { prefetchAuth } from '@/features/auth/backend/useAuth';
+import LoginPage from '@/features/auth/pages/LoginPage';
+import HomePage from '@/features/home/HomePage';
+import NotFoundPage from '@/features/home/NotFoundPage';
+import { prefetchLibrary } from '@/features/library/backend/useLibrary';
+import CreateItemPage from '@/features/library/pages/CreateItemPage';
+import { prefetchOSS } from '@/features/oss/backend/useOSS';
+import { prefetchRSForm } from '@/features/rsform/backend/useRSForm';
+import { prefetchProfile } from '@/features/users/backend/useProfile';
+import { prefetchUsers } from '@/features/users/backend/useUsers';
 
 import ApplicationLayout from './ApplicationLayout';
-import ErrorFallback from './ErrorFallback';
+import { ErrorFallback } from './ErrorFallback';
 import { routes } from './urls';
 
 export const Router = createBrowserRouter([
@@ -38,25 +38,25 @@ export const Router = createBrowserRouter([
       },
       {
         path: routes.signup,
-        lazy: () => import('@/pages/RegisterPage')
+        lazy: () => import('@/features/users/pages/RegisterPage')
       },
       {
         path: routes.profile,
         loader: prefetchProfile,
-        lazy: () => import('@/pages/UserProfilePage')
+        lazy: () => import('@/features/users/pages/UserProfilePage')
       },
       {
         path: routes.restore_password,
-        lazy: () => import('@/pages/RestorePasswordPage')
+        lazy: () => import('@/features/auth/pages/RestorePasswordPage')
       },
       {
         path: routes.password_change,
-        lazy: () => import('@/pages/PasswordChangePage')
+        lazy: () => import('@/features/auth/pages/PasswordChangePage')
       },
       {
         path: routes.library,
         loader: () => Promise.allSettled([prefetchLibrary(), prefetchUsers()]),
-        lazy: () => import('@/pages/LibraryPage')
+        lazy: () => import('@/features/library/pages/LibraryPage')
       },
       {
         path: routes.create_schema,
@@ -65,24 +65,24 @@ export const Router = createBrowserRouter([
       {
         path: `${routes.rsforms}/:id`,
         loader: data => prefetchRSForm(parseRSFormURL(data.params.id, data.request.url)),
-        lazy: () => import('@/pages/RSFormPage')
+        lazy: () => import('@/features/rsform/pages/RSFormPage')
       },
       {
         path: `${routes.oss}/:id`,
         loader: data => prefetchOSS(parseOssURL(data.params.id)),
-        lazy: () => import('@/pages/OssPage')
+        lazy: () => import('@/features/oss/pages/OssPage')
       },
       {
         path: routes.manuals,
-        lazy: () => import('@/pages/ManualsPage')
+        lazy: () => import('@/features/help/pages/ManualsPage')
       },
       {
         path: `${routes.icons}`,
-        lazy: () => import('@/pages/IconsPage')
+        lazy: () => import('@/features/home/IconsPage')
       },
       {
         path: `${routes.database_schema}`,
-        lazy: () => import('@/pages/DatabaseSchemaPage')
+        lazy: () => import('@/features/home/DatabaseSchemaPage')
       }
     ]
   }
diff --git a/rsconcept/frontend/src/app/index.tsx b/rsconcept/frontend/src/app/index.tsx
index 94c2fb3e..899e2cf3 100644
--- a/rsconcept/frontend/src/app/index.tsx
+++ b/rsconcept/frontend/src/app/index.tsx
@@ -1,3 +1,6 @@
+export { useConceptNavigation } from './Navigation/NavigationContext';
+export { useBlockNavigation } from './Navigation/NavigationContext';
+export { urls } from './urls';
 import { RouterProvider } from 'react-router';
 
 import { Router } from './Router';
diff --git a/rsconcept/frontend/src/backend/apiTransport.ts b/rsconcept/frontend/src/backend/apiTransport.ts
index 122c29fb..de256c10 100644
--- a/rsconcept/frontend/src/backend/apiTransport.ts
+++ b/rsconcept/frontend/src/backend/apiTransport.ts
@@ -1,13 +1,15 @@
 /**
  * Module: generic API for backend REST communications using axios library.
  */
-import axios from 'axios';
-import { AxiosError, AxiosRequestConfig } from 'axios';
+import axios, { AxiosError, AxiosRequestConfig } from 'axios';
 import { toast } from 'react-toastify';
 
 import { buildConstants } from '@/utils/buildConstants';
 import { extractErrorMessage } from '@/utils/utils';
 
+export { AxiosError } from 'axios';
+export const isAxiosError = axios.isAxiosError;
+
 const defaultOptions = {
   xsrfCookieName: 'csrftoken',
   xsrfHeaderName: 'x-csrftoken',
diff --git a/rsconcept/frontend/src/backend/queryClient.ts b/rsconcept/frontend/src/backend/queryClient.ts
index 059b7f25..ea8d9e15 100644
--- a/rsconcept/frontend/src/backend/queryClient.ts
+++ b/rsconcept/frontend/src/backend/queryClient.ts
@@ -1,6 +1,6 @@
 import { QueryClient } from '@tanstack/react-query';
-import { AxiosError } from 'axios';
 
+import { AxiosError } from './apiTransport';
 import { DELAYS } from './configuration';
 
 declare module '@tanstack/react-query' {
diff --git a/rsconcept/frontend/src/components/ui/Container/Divider.tsx b/rsconcept/frontend/src/components/Container/Divider.tsx
similarity index 93%
rename from rsconcept/frontend/src/components/ui/Container/Divider.tsx
rename to rsconcept/frontend/src/components/Container/Divider.tsx
index 55aca7ba..55b5b85d 100644
--- a/rsconcept/frontend/src/components/ui/Container/Divider.tsx
+++ b/rsconcept/frontend/src/components/Container/Divider.tsx
@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 
-import { CProps } from '@/components/props';
+import { CProps } from '../props';
 
 interface DividerProps extends CProps.Styling {
   /** Indicates whether the divider is vertical. */
diff --git a/rsconcept/frontend/src/components/ui/Container/FlexColumn.tsx b/rsconcept/frontend/src/components/Container/FlexColumn.tsx
similarity index 87%
rename from rsconcept/frontend/src/components/ui/Container/FlexColumn.tsx
rename to rsconcept/frontend/src/components/Container/FlexColumn.tsx
index 7d83dc65..d80c3873 100644
--- a/rsconcept/frontend/src/components/ui/Container/FlexColumn.tsx
+++ b/rsconcept/frontend/src/components/Container/FlexColumn.tsx
@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 
-import { CProps } from '@/components/props';
+import { CProps } from '../props';
 
 /**
  * `flex` column container.
diff --git a/rsconcept/frontend/src/components/ui/Container/Overlay.tsx b/rsconcept/frontend/src/components/Container/Overlay.tsx
similarity index 93%
rename from rsconcept/frontend/src/components/ui/Container/Overlay.tsx
rename to rsconcept/frontend/src/components/Container/Overlay.tsx
index f83c45de..2b919356 100644
--- a/rsconcept/frontend/src/components/ui/Container/Overlay.tsx
+++ b/rsconcept/frontend/src/components/Container/Overlay.tsx
@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 
-import { CProps } from '@/components/props';
+import { CProps } from '../props';
 
 interface OverlayProps extends CProps.Styling {
   /** Id of the overlay. */
diff --git a/rsconcept/frontend/src/components/ui/Container/Tooltip.tsx b/rsconcept/frontend/src/components/Container/Tooltip.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/ui/Container/Tooltip.tsx
rename to rsconcept/frontend/src/components/Container/Tooltip.tsx
diff --git a/rsconcept/frontend/src/components/ui/Container/index.tsx b/rsconcept/frontend/src/components/Container/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/ui/Container/index.tsx
rename to rsconcept/frontend/src/components/Container/index.tsx
diff --git a/rsconcept/frontend/src/components/ui/Control/Button.tsx b/rsconcept/frontend/src/components/Control/Button.tsx
similarity index 97%
rename from rsconcept/frontend/src/components/ui/Control/Button.tsx
rename to rsconcept/frontend/src/components/Control/Button.tsx
index 0ac1e812..cd201a1d 100644
--- a/rsconcept/frontend/src/components/ui/Control/Button.tsx
+++ b/rsconcept/frontend/src/components/Control/Button.tsx
@@ -1,8 +1,9 @@
 import clsx from 'clsx';
 
-import { CProps } from '@/components/props';
 import { globals } from '@/utils/constants';
 
+import { CProps } from '../props';
+
 interface ButtonProps extends CProps.Control, CProps.Colors, CProps.Button {
   /** Icon to display first. */
   icon?: React.ReactNode;
diff --git a/rsconcept/frontend/src/components/ui/Control/MiniButton.tsx b/rsconcept/frontend/src/components/Control/MiniButton.tsx
similarity index 96%
rename from rsconcept/frontend/src/components/ui/Control/MiniButton.tsx
rename to rsconcept/frontend/src/components/Control/MiniButton.tsx
index 4721c64d..faaddaff 100644
--- a/rsconcept/frontend/src/components/ui/Control/MiniButton.tsx
+++ b/rsconcept/frontend/src/components/Control/MiniButton.tsx
@@ -1,8 +1,9 @@
 import clsx from 'clsx';
 
-import { CProps } from '@/components/props';
 import { globals } from '@/utils/constants';
 
+import { CProps } from '../props';
+
 interface MiniButtonProps extends CProps.Button {
   /** Button type. */
   type?: 'button' | 'submit';
diff --git a/rsconcept/frontend/src/components/ui/Control/SelectorButton.tsx b/rsconcept/frontend/src/components/Control/SelectorButton.tsx
similarity index 96%
rename from rsconcept/frontend/src/components/ui/Control/SelectorButton.tsx
rename to rsconcept/frontend/src/components/Control/SelectorButton.tsx
index 9c80f36e..7ea1dd1d 100644
--- a/rsconcept/frontend/src/components/ui/Control/SelectorButton.tsx
+++ b/rsconcept/frontend/src/components/Control/SelectorButton.tsx
@@ -1,8 +1,9 @@
 import clsx from 'clsx';
 
-import { CProps } from '@/components/props';
 import { globals } from '@/utils/constants';
 
+import { CProps } from '../props';
+
 interface SelectorButtonProps extends CProps.Button {
   /** Text to display in the button. */
   text?: string;
diff --git a/rsconcept/frontend/src/components/ui/Control/SubmitButton.tsx b/rsconcept/frontend/src/components/Control/SubmitButton.tsx
similarity index 95%
rename from rsconcept/frontend/src/components/ui/Control/SubmitButton.tsx
rename to rsconcept/frontend/src/components/Control/SubmitButton.tsx
index 2eb2c16a..02fac661 100644
--- a/rsconcept/frontend/src/components/ui/Control/SubmitButton.tsx
+++ b/rsconcept/frontend/src/components/Control/SubmitButton.tsx
@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 
-import { CProps } from '@/components/props';
+import { CProps } from '../props';
 
 interface SubmitButtonProps extends CProps.Button {
   /** Text to display in the button. */
diff --git a/rsconcept/frontend/src/components/ui/Control/TextURL.tsx b/rsconcept/frontend/src/components/Control/TextURL.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/ui/Control/TextURL.tsx
rename to rsconcept/frontend/src/components/Control/TextURL.tsx
diff --git a/rsconcept/frontend/src/components/ui/Control/index.tsx b/rsconcept/frontend/src/components/Control/index.tsx
similarity index 83%
rename from rsconcept/frontend/src/components/ui/Control/index.tsx
rename to rsconcept/frontend/src/components/Control/index.tsx
index 8655c777..fcc48974 100644
--- a/rsconcept/frontend/src/components/ui/Control/index.tsx
+++ b/rsconcept/frontend/src/components/Control/index.tsx
@@ -1,5 +1,4 @@
 export { Button } from './Button';
-export { LinkTopic } from './LinkTopic';
 export { MiniButton } from './MiniButton';
 export { SelectorButton } from './SelectorButton';
 export { SubmitButton } from './SubmitButton';
diff --git a/rsconcept/frontend/src/components/ui/DataTable/DataTable.tsx b/rsconcept/frontend/src/components/DataTable/DataTable.tsx
similarity index 99%
rename from rsconcept/frontend/src/components/ui/DataTable/DataTable.tsx
rename to rsconcept/frontend/src/components/DataTable/DataTable.tsx
index 67898457..a167de43 100644
--- a/rsconcept/frontend/src/components/ui/DataTable/DataTable.tsx
+++ b/rsconcept/frontend/src/components/DataTable/DataTable.tsx
@@ -17,8 +17,7 @@ import {
 } from '@tanstack/react-table';
 import { useMemo, useState } from 'react';
 
-import { CProps } from '@/components/props';
-
+import { CProps } from '../props';
 import DefaultNoData from './DefaultNoData';
 import PaginationTools from './PaginationTools';
 import TableBody from './TableBody';
diff --git a/rsconcept/frontend/src/components/ui/DataTable/DefaultNoData.tsx b/rsconcept/frontend/src/components/DataTable/DefaultNoData.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/ui/DataTable/DefaultNoData.tsx
rename to rsconcept/frontend/src/components/DataTable/DefaultNoData.tsx
diff --git a/rsconcept/frontend/src/components/ui/DataTable/PaginationTools.tsx b/rsconcept/frontend/src/components/DataTable/PaginationTools.tsx
similarity index 99%
rename from rsconcept/frontend/src/components/ui/DataTable/PaginationTools.tsx
rename to rsconcept/frontend/src/components/DataTable/PaginationTools.tsx
index 454ed33c..d0af5820 100644
--- a/rsconcept/frontend/src/components/ui/DataTable/PaginationTools.tsx
+++ b/rsconcept/frontend/src/components/DataTable/PaginationTools.tsx
@@ -5,9 +5,10 @@ import { Table } from '@tanstack/react-table';
 import clsx from 'clsx';
 import { useCallback } from 'react';
 
-import { IconPageFirst, IconPageLast, IconPageLeft, IconPageRight } from '@/components/Icons';
 import { prefixes } from '@/utils/constants';
 
+import { IconPageFirst, IconPageLast, IconPageLeft, IconPageRight } from '../Icons';
+
 interface PaginationToolsProps<TData> {
   id?: string;
   table: Table<TData>;
diff --git a/rsconcept/frontend/src/components/ui/DataTable/SelectAll.tsx b/rsconcept/frontend/src/components/DataTable/SelectAll.tsx
similarity index 92%
rename from rsconcept/frontend/src/components/ui/DataTable/SelectAll.tsx
rename to rsconcept/frontend/src/components/DataTable/SelectAll.tsx
index 054cc7e7..256de3f8 100644
--- a/rsconcept/frontend/src/components/ui/DataTable/SelectAll.tsx
+++ b/rsconcept/frontend/src/components/DataTable/SelectAll.tsx
@@ -2,7 +2,7 @@
 
 import { Table } from '@tanstack/react-table';
 
-import { CheckboxTristate } from '@/components/ui/Input';
+import { CheckboxTristate } from '../Input';
 
 interface SelectAllProps<TData> {
   table: Table<TData>;
diff --git a/rsconcept/frontend/src/components/ui/DataTable/SelectRow.tsx b/rsconcept/frontend/src/components/DataTable/SelectRow.tsx
similarity index 90%
rename from rsconcept/frontend/src/components/ui/DataTable/SelectRow.tsx
rename to rsconcept/frontend/src/components/DataTable/SelectRow.tsx
index 9af05c1c..ba9bd2ef 100644
--- a/rsconcept/frontend/src/components/ui/DataTable/SelectRow.tsx
+++ b/rsconcept/frontend/src/components/DataTable/SelectRow.tsx
@@ -2,7 +2,7 @@
 
 import { Row } from '@tanstack/react-table';
 
-import { Checkbox } from '@/components/ui/Input';
+import { Checkbox } from '../Input';
 
 interface SelectRowProps<TData> {
   row: Row<TData>;
diff --git a/rsconcept/frontend/src/components/ui/DataTable/SortingIcon.tsx b/rsconcept/frontend/src/components/DataTable/SortingIcon.tsx
similarity index 87%
rename from rsconcept/frontend/src/components/ui/DataTable/SortingIcon.tsx
rename to rsconcept/frontend/src/components/DataTable/SortingIcon.tsx
index deb3c09e..12e1d3a5 100644
--- a/rsconcept/frontend/src/components/ui/DataTable/SortingIcon.tsx
+++ b/rsconcept/frontend/src/components/DataTable/SortingIcon.tsx
@@ -2,7 +2,7 @@
 
 import { Column } from '@tanstack/react-table';
 
-import { IconSortAsc, IconSortDesc } from '@/components/Icons';
+import { IconSortAsc, IconSortDesc } from '../Icons';
 
 interface SortingIconProps<TData> {
   column: Column<TData>;
diff --git a/rsconcept/frontend/src/components/ui/DataTable/TableBody.tsx b/rsconcept/frontend/src/components/DataTable/TableBody.tsx
similarity index 98%
rename from rsconcept/frontend/src/components/ui/DataTable/TableBody.tsx
rename to rsconcept/frontend/src/components/DataTable/TableBody.tsx
index 34938b30..052b1ca2 100644
--- a/rsconcept/frontend/src/components/ui/DataTable/TableBody.tsx
+++ b/rsconcept/frontend/src/components/DataTable/TableBody.tsx
@@ -3,8 +3,7 @@
 import { Cell, flexRender, Row, Table } from '@tanstack/react-table';
 import clsx from 'clsx';
 
-import { CProps } from '@/components/props';
-
+import { CProps } from '../props';
 import { IConditionalStyle } from '.';
 import SelectRow from './SelectRow';
 
diff --git a/rsconcept/frontend/src/components/ui/DataTable/TableFooter.tsx b/rsconcept/frontend/src/components/DataTable/TableFooter.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/ui/DataTable/TableFooter.tsx
rename to rsconcept/frontend/src/components/DataTable/TableFooter.tsx
diff --git a/rsconcept/frontend/src/components/ui/DataTable/TableHeader.tsx b/rsconcept/frontend/src/components/DataTable/TableHeader.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/ui/DataTable/TableHeader.tsx
rename to rsconcept/frontend/src/components/DataTable/TableHeader.tsx
diff --git a/rsconcept/frontend/src/components/ui/DataTable/index.tsx b/rsconcept/frontend/src/components/DataTable/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/ui/DataTable/index.tsx
rename to rsconcept/frontend/src/components/DataTable/index.tsx
diff --git a/rsconcept/frontend/src/components/DomainIcons.tsx b/rsconcept/frontend/src/components/DomainIcons.tsx
index a011798d..3c22ffd6 100644
--- a/rsconcept/frontend/src/components/DomainIcons.tsx
+++ b/rsconcept/frontend/src/components/DomainIcons.tsx
@@ -1,6 +1,6 @@
-import { AccessPolicy, LibraryItemType, LocationHead } from '@/models/library';
-import { CstMatchMode, DependencyMode } from '@/models/miscellaneous';
-import { CstType, ExpressionStatus } from '@/models/rsform';
+import { AccessPolicy, LibraryItemType, LocationHead } from '@/features/library/models/library';
+import { CstType, ExpressionStatus } from '@/features/rsform/models/rsform';
+import { CstMatchMode, DependencyMode } from '@/features/rsform/stores/cstSearch';
 
 import {
   IconAlias,
diff --git a/rsconcept/frontend/src/components/ui/Dropdown/Dropdown.tsx b/rsconcept/frontend/src/components/Dropdown/Dropdown.tsx
similarity index 97%
rename from rsconcept/frontend/src/components/ui/Dropdown/Dropdown.tsx
rename to rsconcept/frontend/src/components/Dropdown/Dropdown.tsx
index 459d3c81..42d4958a 100644
--- a/rsconcept/frontend/src/components/ui/Dropdown/Dropdown.tsx
+++ b/rsconcept/frontend/src/components/Dropdown/Dropdown.tsx
@@ -1,8 +1,9 @@
 import clsx from 'clsx';
 
-import { CProps } from '@/components/props';
 import { PARAMETER } from '@/utils/constants';
 
+import { CProps } from '../props';
+
 interface DropdownProps extends CProps.Styling {
   /** Indicates whether the dropdown should stretch to the left. */
   stretchLeft?: boolean;
diff --git a/rsconcept/frontend/src/components/ui/Dropdown/DropdownButton.tsx b/rsconcept/frontend/src/components/Dropdown/DropdownButton.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/ui/Dropdown/DropdownButton.tsx
rename to rsconcept/frontend/src/components/Dropdown/DropdownButton.tsx
diff --git a/rsconcept/frontend/src/components/ui/Dropdown/DropdownCheckbox.tsx b/rsconcept/frontend/src/components/Dropdown/DropdownCheckbox.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/ui/Dropdown/DropdownCheckbox.tsx
rename to rsconcept/frontend/src/components/Dropdown/DropdownCheckbox.tsx
diff --git a/rsconcept/frontend/src/components/ui/Dropdown/index.tsx b/rsconcept/frontend/src/components/Dropdown/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/ui/Dropdown/index.tsx
rename to rsconcept/frontend/src/components/Dropdown/index.tsx
diff --git a/rsconcept/frontend/src/components/ui/Dropdown/useDropdown.ts b/rsconcept/frontend/src/components/Dropdown/useDropdown.ts
similarity index 100%
rename from rsconcept/frontend/src/components/ui/Dropdown/useDropdown.ts
rename to rsconcept/frontend/src/components/Dropdown/useDropdown.ts
diff --git a/rsconcept/frontend/src/components/graph/DynamicEdge.tsx b/rsconcept/frontend/src/components/Flow/DynamicEdge.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/graph/DynamicEdge.tsx
rename to rsconcept/frontend/src/components/Flow/DynamicEdge.tsx
diff --git a/rsconcept/frontend/src/components/info/InfoError.tsx b/rsconcept/frontend/src/components/InfoError.tsx
similarity index 92%
rename from rsconcept/frontend/src/components/info/InfoError.tsx
rename to rsconcept/frontend/src/components/InfoError.tsx
index 802a6cf3..8f3f007c 100644
--- a/rsconcept/frontend/src/components/info/InfoError.tsx
+++ b/rsconcept/frontend/src/components/InfoError.tsx
@@ -1,9 +1,10 @@
-import axios, { type AxiosError } from 'axios';
 import clsx from 'clsx';
 
-import { PrettyJson } from '@/components/ui/View';
+import { AxiosError, isAxiosError } from '@/backend/apiTransport';
 import { isResponseHtml } from '@/utils/utils';
 
+import { PrettyJson } from './View';
+
 export type ErrorData = string | Error | AxiosError | undefined | null;
 
 interface InfoErrorProps {
@@ -15,7 +16,7 @@ function DescribeError({ error }: { error: ErrorData }) {
     return <p>Ошибки отсутствуют</p>;
   } else if (typeof error === 'string') {
     return <p>{error}</p>;
-  } else if (!axios.isAxiosError(error)) {
+  } else if (!isAxiosError(error)) {
     return (
       <div className='mt-6'>
         <p>
@@ -76,7 +77,7 @@ function DescribeError({ error }: { error: ErrorData }) {
   );
 }
 
-function InfoError({ error }: InfoErrorProps) {
+export function InfoError({ error }: InfoErrorProps) {
   return (
     <div
       className={clsx(
@@ -97,5 +98,3 @@ function InfoError({ error }: InfoErrorProps) {
     </div>
   );
 }
-
-export default InfoError;
diff --git a/rsconcept/frontend/src/components/ui/Input/Checkbox.tsx b/rsconcept/frontend/src/components/Input/Checkbox.tsx
similarity index 95%
rename from rsconcept/frontend/src/components/ui/Input/Checkbox.tsx
rename to rsconcept/frontend/src/components/Input/Checkbox.tsx
index ce05be9b..feda4cbf 100644
--- a/rsconcept/frontend/src/components/ui/Input/Checkbox.tsx
+++ b/rsconcept/frontend/src/components/Input/Checkbox.tsx
@@ -1,9 +1,10 @@
 import clsx from 'clsx';
 
-import { CheckboxChecked } from '@/components/Icons';
-import { CProps } from '@/components/props';
 import { globals } from '@/utils/constants';
 
+import { CheckboxChecked } from '../Icons';
+import { CProps } from '../props';
+
 export interface CheckboxProps extends Omit<CProps.Button, 'value' | 'onClick' | 'onChange'> {
   /** Label to display next to the checkbox. */
   label?: string;
diff --git a/rsconcept/frontend/src/components/ui/Input/CheckboxTristate.tsx b/rsconcept/frontend/src/components/Input/CheckboxTristate.tsx
similarity index 94%
rename from rsconcept/frontend/src/components/ui/Input/CheckboxTristate.tsx
rename to rsconcept/frontend/src/components/Input/CheckboxTristate.tsx
index 7750e817..6686e22d 100644
--- a/rsconcept/frontend/src/components/ui/Input/CheckboxTristate.tsx
+++ b/rsconcept/frontend/src/components/Input/CheckboxTristate.tsx
@@ -1,9 +1,9 @@
 import clsx from 'clsx';
 
-import { CheckboxChecked, CheckboxNull } from '@/components/Icons';
-import { CProps } from '@/components/props';
 import { globals } from '@/utils/constants';
 
+import { CheckboxChecked, CheckboxNull } from '../Icons';
+import { CProps } from '../props';
 import { CheckboxProps } from './Checkbox';
 
 export interface CheckboxTristateProps extends Omit<CheckboxProps, 'value' | 'onChange'> {
diff --git a/rsconcept/frontend/src/components/ui/Input/ErrorField.tsx b/rsconcept/frontend/src/components/Input/ErrorField.tsx
similarity index 91%
rename from rsconcept/frontend/src/components/ui/Input/ErrorField.tsx
rename to rsconcept/frontend/src/components/Input/ErrorField.tsx
index a1524ca5..98900c60 100644
--- a/rsconcept/frontend/src/components/ui/Input/ErrorField.tsx
+++ b/rsconcept/frontend/src/components/Input/ErrorField.tsx
@@ -1,7 +1,7 @@
 import clsx from 'clsx';
 import { FieldError, GlobalError } from 'react-hook-form';
 
-import { CProps } from '@/components/props';
+import { CProps } from '../props';
 
 interface ErrorFieldProps extends CProps.Styling {
   error?: FieldError | GlobalError;
diff --git a/rsconcept/frontend/src/components/ui/Input/FileInput.tsx b/rsconcept/frontend/src/components/Input/FileInput.tsx
similarity index 94%
rename from rsconcept/frontend/src/components/ui/Input/FileInput.tsx
rename to rsconcept/frontend/src/components/Input/FileInput.tsx
index 4496b36e..2b993cf9 100644
--- a/rsconcept/frontend/src/components/ui/Input/FileInput.tsx
+++ b/rsconcept/frontend/src/components/Input/FileInput.tsx
@@ -3,10 +3,9 @@
 import clsx from 'clsx';
 import { useRef, useState } from 'react';
 
-import { IconUpload } from '@/components/Icons';
-import { CProps } from '@/components/props';
-
 import { Button } from '../Control';
+import { IconUpload } from '../Icons';
+import { CProps } from '../props';
 import { Label } from './Label';
 
 interface FileInputProps extends Omit<CProps.Input, 'accept' | 'type'> {
diff --git a/rsconcept/frontend/src/components/ui/Input/Label.tsx b/rsconcept/frontend/src/components/Input/Label.tsx
similarity index 93%
rename from rsconcept/frontend/src/components/ui/Input/Label.tsx
rename to rsconcept/frontend/src/components/Input/Label.tsx
index 4f9de845..a94a8674 100644
--- a/rsconcept/frontend/src/components/ui/Input/Label.tsx
+++ b/rsconcept/frontend/src/components/Input/Label.tsx
@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 
-import { CProps } from '@/components/props';
+import { CProps } from '../props';
 
 interface LabelProps extends CProps.Label {
   /** Text to display. */
diff --git a/rsconcept/frontend/src/components/ui/Input/SelectMulti.tsx b/rsconcept/frontend/src/components/Input/SelectMulti.tsx
similarity index 97%
rename from rsconcept/frontend/src/components/ui/Input/SelectMulti.tsx
rename to rsconcept/frontend/src/components/Input/SelectMulti.tsx
index fe46ae26..810679d9 100644
--- a/rsconcept/frontend/src/components/ui/Input/SelectMulti.tsx
+++ b/rsconcept/frontend/src/components/Input/SelectMulti.tsx
@@ -9,10 +9,11 @@ import Select, {
   StylesConfig
 } from 'react-select';
 
-import { IconClose, IconDropArrow, IconDropArrowUp } from '@/components/Icons';
 import useWindowSize from '@/hooks/useWindowSize';
 import { APP_COLORS, SELECT_THEME } from '@/styling/color';
 
+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/ui/Input/SelectSingle.tsx b/rsconcept/frontend/src/components/Input/SelectSingle.tsx
similarity index 97%
rename from rsconcept/frontend/src/components/ui/Input/SelectSingle.tsx
rename to rsconcept/frontend/src/components/Input/SelectSingle.tsx
index ca225330..ade9a245 100644
--- a/rsconcept/frontend/src/components/ui/Input/SelectSingle.tsx
+++ b/rsconcept/frontend/src/components/Input/SelectSingle.tsx
@@ -9,10 +9,11 @@ import Select, {
   StylesConfig
 } from 'react-select';
 
-import { IconClose, IconDropArrow, IconDropArrowUp } from '@/components/Icons';
 import useWindowSize from '@/hooks/useWindowSize';
 import { APP_COLORS, SELECT_THEME } from '@/styling/color';
 
+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/ui/Input/SelectTree.tsx b/rsconcept/frontend/src/components/Input/SelectTree.tsx
similarity index 97%
rename from rsconcept/frontend/src/components/ui/Input/SelectTree.tsx
rename to rsconcept/frontend/src/components/Input/SelectTree.tsx
index b1a34179..966f0508 100644
--- a/rsconcept/frontend/src/components/ui/Input/SelectTree.tsx
+++ b/rsconcept/frontend/src/components/Input/SelectTree.tsx
@@ -1,12 +1,12 @@
 import clsx from 'clsx';
 import { useEffect, useState } from 'react';
 
-import { IconDropArrow, IconPageRight } from '@/components/Icons';
-import { CProps } from '@/components/props';
 import { globals, PARAMETER } from '@/utils/constants';
 
 import { Overlay } from '../Container';
 import { MiniButton } from '../Control';
+import { IconDropArrow, IconPageRight } from '../Icons';
+import { CProps } from '../props';
 
 interface SelectTreeProps<ItemType> extends CProps.Styling {
   /** Current value. */
diff --git a/rsconcept/frontend/src/components/ui/Input/TextArea.tsx b/rsconcept/frontend/src/components/Input/TextArea.tsx
similarity index 93%
rename from rsconcept/frontend/src/components/ui/Input/TextArea.tsx
rename to rsconcept/frontend/src/components/Input/TextArea.tsx
index 65cd8879..8ed54bdb 100644
--- a/rsconcept/frontend/src/components/ui/Input/TextArea.tsx
+++ b/rsconcept/frontend/src/components/Input/TextArea.tsx
@@ -1,8 +1,7 @@
 import clsx from 'clsx';
 
-import { CProps } from '@/components/props';
-import { Label } from '@/components/ui/Input/Label';
-
+import { Label } from '../Input/Label';
+import { CProps } from '../props';
 import { ErrorField } from './ErrorField';
 
 export interface TextAreaProps extends CProps.Editor, CProps.ErrorProcessing, CProps.Colors, CProps.TextArea {
diff --git a/rsconcept/frontend/src/components/ui/Input/TextInput.tsx b/rsconcept/frontend/src/components/Input/TextInput.tsx
similarity index 93%
rename from rsconcept/frontend/src/components/ui/Input/TextInput.tsx
rename to rsconcept/frontend/src/components/Input/TextInput.tsx
index 3c329080..179fbe40 100644
--- a/rsconcept/frontend/src/components/ui/Input/TextInput.tsx
+++ b/rsconcept/frontend/src/components/Input/TextInput.tsx
@@ -1,8 +1,7 @@
 import clsx from 'clsx';
 
-import { CProps } from '@/components/props';
-import { Label } from '@/components/ui/Input/Label';
-
+import { Label } from '../Input/Label';
+import { CProps } from '../props';
 import { ErrorField } from './ErrorField';
 
 interface TextInputProps extends CProps.Editor, CProps.ErrorProcessing, CProps.Colors, CProps.Input {
diff --git a/rsconcept/frontend/src/components/ui/Input/index.tsx b/rsconcept/frontend/src/components/Input/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/ui/Input/index.tsx
rename to rsconcept/frontend/src/components/Input/index.tsx
diff --git a/rsconcept/frontend/src/components/ui/Loader.tsx b/rsconcept/frontend/src/components/Loader.tsx
similarity index 97%
rename from rsconcept/frontend/src/components/ui/Loader.tsx
rename to rsconcept/frontend/src/components/Loader.tsx
index 09f35ae4..e6f34b2f 100644
--- a/rsconcept/frontend/src/components/ui/Loader.tsx
+++ b/rsconcept/frontend/src/components/Loader.tsx
@@ -54,7 +54,7 @@ const animatePulse = (startBig: boolean, duration: string) => {
 /**
  * Displays animated loader.
  */
-function Loader({ scale = 5, circular }: LoaderProps) {
+export function Loader({ scale = 5, circular }: LoaderProps) {
   if (circular) {
     return (
       <div className='flex justify-center' aria-label='three-circles-loading' aria-busy='true' role='progressbar'>
@@ -89,5 +89,3 @@ function Loader({ scale = 5, circular }: LoaderProps) {
     );
   }
 }
-
-export default Loader;
diff --git a/rsconcept/frontend/src/components/ui/Modal/ModalBackdrop.tsx b/rsconcept/frontend/src/components/Modal/ModalBackdrop.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/ui/Modal/ModalBackdrop.tsx
rename to rsconcept/frontend/src/components/Modal/ModalBackdrop.tsx
diff --git a/rsconcept/frontend/src/components/ui/Modal/ModalForm.tsx b/rsconcept/frontend/src/components/Modal/ModalForm.tsx
similarity index 94%
rename from rsconcept/frontend/src/components/ui/Modal/ModalForm.tsx
rename to rsconcept/frontend/src/components/Modal/ModalForm.tsx
index 5c5c4d5f..0f58a8fa 100644
--- a/rsconcept/frontend/src/components/ui/Modal/ModalForm.tsx
+++ b/rsconcept/frontend/src/components/Modal/ModalForm.tsx
@@ -2,16 +2,16 @@
 
 import clsx from 'clsx';
 
-import { IconClose } from '@/components/Icons';
-import BadgeHelp from '@/components/info/BadgeHelp';
-import { CProps } from '@/components/props';
+import { HelpTopic } from '@/features/help/models/helpTopic';
 import useEscapeKey from '@/hooks/useEscapeKey';
-import { HelpTopic } from '@/models/miscellaneous';
 import { useDialogsStore } from '@/stores/dialogs';
 import { PARAMETER } from '@/utils/constants';
 import { prepareTooltip } from '@/utils/labels';
 
 import { Button, MiniButton, SubmitButton } from '../Control';
+import { IconClose } from '../Icons';
+import { CProps } from '../props';
+import BadgeHelp from '../shared/BadgeHelp';
 import { ModalBackdrop } from './ModalBackdrop';
 
 export interface ModalProps extends CProps.Styling {
diff --git a/rsconcept/frontend/src/components/ui/Modal/ModalLoader.tsx b/rsconcept/frontend/src/components/Modal/ModalLoader.tsx
similarity index 93%
rename from rsconcept/frontend/src/components/ui/Modal/ModalLoader.tsx
rename to rsconcept/frontend/src/components/Modal/ModalLoader.tsx
index 634196e1..7cd388bb 100644
--- a/rsconcept/frontend/src/components/ui/Modal/ModalLoader.tsx
+++ b/rsconcept/frontend/src/components/Modal/ModalLoader.tsx
@@ -2,7 +2,7 @@
 
 import clsx from 'clsx';
 
-import Loader from '@/components/ui/Loader';
+import { Loader } from '@/components/Loader';
 
 export function ModalLoader() {
   return (
diff --git a/rsconcept/frontend/src/components/ui/Modal/ModalView.tsx b/rsconcept/frontend/src/components/Modal/ModalView.tsx
similarity index 95%
rename from rsconcept/frontend/src/components/ui/Modal/ModalView.tsx
rename to rsconcept/frontend/src/components/Modal/ModalView.tsx
index 16a40a73..05a98dae 100644
--- a/rsconcept/frontend/src/components/ui/Modal/ModalView.tsx
+++ b/rsconcept/frontend/src/components/Modal/ModalView.tsx
@@ -2,14 +2,14 @@
 
 import clsx from 'clsx';
 
-import { IconClose } from '@/components/Icons';
-import BadgeHelp from '@/components/info/BadgeHelp';
 import useEscapeKey from '@/hooks/useEscapeKey';
 import { useDialogsStore } from '@/stores/dialogs';
 import { PARAMETER } from '@/utils/constants';
 import { prepareTooltip } from '@/utils/labels';
 
 import { Button, MiniButton } from '../Control';
+import { IconClose } from '../Icons';
+import BadgeHelp from '../shared/BadgeHelp';
 import { ModalBackdrop } from './ModalBackdrop';
 import { ModalProps } from './ModalForm';
 
diff --git a/rsconcept/frontend/src/components/ui/Modal/index.tsx b/rsconcept/frontend/src/components/Modal/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/ui/Modal/index.tsx
rename to rsconcept/frontend/src/components/Modal/index.tsx
diff --git a/rsconcept/frontend/src/components/ui/Tabs/TabLabel.tsx b/rsconcept/frontend/src/components/Tabs/TabLabel.tsx
similarity index 96%
rename from rsconcept/frontend/src/components/ui/Tabs/TabLabel.tsx
rename to rsconcept/frontend/src/components/Tabs/TabLabel.tsx
index 9ef8d227..b887c163 100644
--- a/rsconcept/frontend/src/components/ui/Tabs/TabLabel.tsx
+++ b/rsconcept/frontend/src/components/Tabs/TabLabel.tsx
@@ -2,9 +2,10 @@ import clsx from 'clsx';
 import type { TabProps as TabPropsImpl } from 'react-tabs';
 import { Tab as TabImpl } from 'react-tabs';
 
-import { CProps } from '@/components/props';
 import { globals } from '@/utils/constants';
 
+import { CProps } from '../props';
+
 interface TabLabelProps extends Omit<TabPropsImpl, 'children'>, CProps.Titled {
   /** Label to display in the tab. */
   label?: string;
diff --git a/rsconcept/frontend/src/components/ui/Tabs/index.tsx b/rsconcept/frontend/src/components/Tabs/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/ui/Tabs/index.tsx
rename to rsconcept/frontend/src/components/Tabs/index.tsx
diff --git a/rsconcept/frontend/src/components/ui/View/EmbedYoutube.tsx b/rsconcept/frontend/src/components/View/EmbedYoutube.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/ui/View/EmbedYoutube.tsx
rename to rsconcept/frontend/src/components/View/EmbedYoutube.tsx
diff --git a/rsconcept/frontend/src/components/ui/View/Indicator.tsx b/rsconcept/frontend/src/components/View/Indicator.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/ui/View/Indicator.tsx
rename to rsconcept/frontend/src/components/View/Indicator.tsx
diff --git a/rsconcept/frontend/src/components/ui/View/NoData.tsx b/rsconcept/frontend/src/components/View/NoData.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/ui/View/NoData.tsx
rename to rsconcept/frontend/src/components/View/NoData.tsx
diff --git a/rsconcept/frontend/src/components/ui/View/PDFViewer.tsx b/rsconcept/frontend/src/components/View/PDFViewer.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/ui/View/PDFViewer.tsx
rename to rsconcept/frontend/src/components/View/PDFViewer.tsx
diff --git a/rsconcept/frontend/src/components/ui/View/PrettyJSON.tsx b/rsconcept/frontend/src/components/View/PrettyJSON.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/ui/View/PrettyJSON.tsx
rename to rsconcept/frontend/src/components/View/PrettyJSON.tsx
diff --git a/rsconcept/frontend/src/components/ui/View/TextContent.tsx b/rsconcept/frontend/src/components/View/TextContent.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/ui/View/TextContent.tsx
rename to rsconcept/frontend/src/components/View/TextContent.tsx
diff --git a/rsconcept/frontend/src/components/ui/View/ValueIcon.tsx b/rsconcept/frontend/src/components/View/ValueIcon.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/ui/View/ValueIcon.tsx
rename to rsconcept/frontend/src/components/View/ValueIcon.tsx
diff --git a/rsconcept/frontend/src/components/ui/View/ValueLabeled.tsx b/rsconcept/frontend/src/components/View/ValueLabeled.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/ui/View/ValueLabeled.tsx
rename to rsconcept/frontend/src/components/View/ValueLabeled.tsx
diff --git a/rsconcept/frontend/src/components/ui/View/ValueStats.tsx b/rsconcept/frontend/src/components/View/ValueStats.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/ui/View/ValueStats.tsx
rename to rsconcept/frontend/src/components/View/ValueStats.tsx
diff --git a/rsconcept/frontend/src/components/ui/View/index.tsx b/rsconcept/frontend/src/components/View/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/ui/View/index.tsx
rename to rsconcept/frontend/src/components/View/index.tsx
diff --git a/rsconcept/frontend/src/components/select/SelectWordForm.tsx b/rsconcept/frontend/src/components/select/SelectWordForm.tsx
deleted file mode 100644
index 6e0f79bb..00000000
--- a/rsconcept/frontend/src/components/select/SelectWordForm.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-'use client';
-
-import clsx from 'clsx';
-
-import { CProps } from '@/components/props';
-import WordformButton from '@/dialogs/DlgEditReference/WordformButton';
-import { Grammeme } from '@/models/language';
-import { prefixes } from '@/utils/constants';
-import { DefaultWordForms, IGrammemeOption, SelectorGrammemes } from '@/utils/selectors';
-
-interface SelectWordFormProps extends CProps.Styling {
-  value: IGrammemeOption[];
-  onChange: React.Dispatch<React.SetStateAction<IGrammemeOption[]>>;
-}
-
-function SelectWordForm({ value, onChange, className, ...restProps }: SelectWordFormProps) {
-  function handleSelect(grams: Grammeme[]) {
-    onChange(SelectorGrammemes.filter(({ value }) => grams.includes(value as Grammeme)));
-  }
-
-  return (
-    <div className={clsx('text-xs sm:text-sm', className)} {...restProps}>
-      {DefaultWordForms.slice(0, 12).map((data, index) => (
-        <WordformButton
-          key={`${prefixes.wordform_list}${index}`}
-          text={data.text}
-          example={data.example}
-          grams={data.grams}
-          isSelected={data.grams.every(gram => value.find(item => (item.value as Grammeme) === gram))}
-          onSelectGrams={handleSelect}
-        />
-      ))}
-    </div>
-  );
-}
-
-export default SelectWordForm;
diff --git a/rsconcept/frontend/src/components/info/BadgeHelp.tsx b/rsconcept/frontend/src/components/shared/BadgeHelp.tsx
similarity index 82%
rename from rsconcept/frontend/src/components/info/BadgeHelp.tsx
rename to rsconcept/frontend/src/components/shared/BadgeHelp.tsx
index 0eaee73c..b48572a3 100644
--- a/rsconcept/frontend/src/components/info/BadgeHelp.tsx
+++ b/rsconcept/frontend/src/components/shared/BadgeHelp.tsx
@@ -1,14 +1,14 @@
 import React, { Suspense } from 'react';
 
+import { PlacesType, Tooltip } from '@/components/Container';
+import { TextURL } from '@/components/Control';
 import { IconHelp } from '@/components/Icons';
+import { Loader } from '@/components/Loader';
 import { CProps } from '@/components/props';
-import { PlacesType, Tooltip } from '@/components/ui/Container';
-import { TextURL } from '@/components/ui/Control';
-import Loader from '@/components/ui/Loader';
-import { HelpTopic } from '@/models/miscellaneous';
+import { HelpTopic } from '@/features/help/models/helpTopic';
 import { usePreferencesStore } from '@/stores/preferences';
 
-const TopicPage = React.lazy(() => import('@/pages/ManualsPage/TopicPage'));
+const TopicPage = React.lazy(() => import('@/features/help/pages/ManualsPage/TopicPage'));
 
 interface BadgeHelpProps extends CProps.Styling {
   /** Topic to display in a tooltip. */
diff --git a/rsconcept/frontend/src/components/ui/SearchBar.tsx b/rsconcept/frontend/src/components/shared/SearchBar.tsx
similarity index 93%
rename from rsconcept/frontend/src/components/ui/SearchBar.tsx
rename to rsconcept/frontend/src/components/shared/SearchBar.tsx
index 6f1e18a5..cce2c634 100644
--- a/rsconcept/frontend/src/components/ui/SearchBar.tsx
+++ b/rsconcept/frontend/src/components/shared/SearchBar.tsx
@@ -1,11 +1,10 @@
 import clsx from 'clsx';
 
+import { Overlay } from '@/components/Container';
 import { IconSearch } from '@/components/Icons';
+import { TextInput } from '@/components/Input';
 import { CProps } from '@/components/props';
 
-import { Overlay } from './Container';
-import { TextInput } from './Input';
-
 interface SearchBarProps extends CProps.Styling {
   /** Id of the search bar. */
   id?: string;
diff --git a/rsconcept/frontend/src/backend/auth/api.ts b/rsconcept/frontend/src/features/auth/backend/api.ts
similarity index 90%
rename from rsconcept/frontend/src/backend/auth/api.ts
rename to rsconcept/frontend/src/features/auth/backend/api.ts
index 8f31b3d3..9d4adcd1 100644
--- a/rsconcept/frontend/src/backend/auth/api.ts
+++ b/rsconcept/frontend/src/features/auth/backend/api.ts
@@ -3,9 +3,20 @@ import { z } from 'zod';
 
 import { axiosGet, axiosPatch, axiosPost } from '@/backend/apiTransport';
 import { DELAYS } from '@/backend/configuration';
-import { ICurrentUser } from '@/models/user';
+import { LibraryItemID } from '@/features/library/models/library';
+import { UserID } from '@/features/users/models/user';
 import { errors, information } from '@/utils/labels';
 
+/**
+ * Represents CurrentUser information.
+ */
+export interface ICurrentUser {
+  id: UserID | null;
+  username: string;
+  is_staff: boolean;
+  editor: LibraryItemID[];
+}
+
 /**
  * Represents login data, used to authenticate users.
  */
diff --git a/rsconcept/frontend/src/backend/auth/useAuth.tsx b/rsconcept/frontend/src/features/auth/backend/useAuth.tsx
similarity index 91%
rename from rsconcept/frontend/src/backend/auth/useAuth.tsx
rename to rsconcept/frontend/src/features/auth/backend/useAuth.tsx
index 1aba50c3..16ec2ce2 100644
--- a/rsconcept/frontend/src/backend/auth/useAuth.tsx
+++ b/rsconcept/frontend/src/features/auth/backend/useAuth.tsx
@@ -1,6 +1,7 @@
 import { useQuery, useSuspenseQuery } from '@tanstack/react-query';
 
-import { queryClient } from '../queryClient';
+import { queryClient } from '@/backend/queryClient';
+
 import { authApi } from './api';
 
 export function useAuth() {
diff --git a/rsconcept/frontend/src/backend/auth/useChangePassword.tsx b/rsconcept/frontend/src/features/auth/backend/useChangePassword.tsx
similarity index 100%
rename from rsconcept/frontend/src/backend/auth/useChangePassword.tsx
rename to rsconcept/frontend/src/features/auth/backend/useChangePassword.tsx
diff --git a/rsconcept/frontend/src/backend/auth/useLogin.tsx b/rsconcept/frontend/src/features/auth/backend/useLogin.tsx
similarity index 100%
rename from rsconcept/frontend/src/backend/auth/useLogin.tsx
rename to rsconcept/frontend/src/features/auth/backend/useLogin.tsx
diff --git a/rsconcept/frontend/src/backend/auth/useLogout.tsx b/rsconcept/frontend/src/features/auth/backend/useLogout.tsx
similarity index 100%
rename from rsconcept/frontend/src/backend/auth/useLogout.tsx
rename to rsconcept/frontend/src/features/auth/backend/useLogout.tsx
diff --git a/rsconcept/frontend/src/backend/auth/useRequestPasswordReset.tsx b/rsconcept/frontend/src/features/auth/backend/useRequestPasswordReset.tsx
similarity index 100%
rename from rsconcept/frontend/src/backend/auth/useRequestPasswordReset.tsx
rename to rsconcept/frontend/src/features/auth/backend/useRequestPasswordReset.tsx
diff --git a/rsconcept/frontend/src/backend/auth/useResetPassword.tsx b/rsconcept/frontend/src/features/auth/backend/useResetPassword.tsx
similarity index 100%
rename from rsconcept/frontend/src/backend/auth/useResetPassword.tsx
rename to rsconcept/frontend/src/features/auth/backend/useResetPassword.tsx
diff --git a/rsconcept/frontend/src/components/ExpectedAnonymous.tsx b/rsconcept/frontend/src/features/auth/components/ExpectedAnonymous.tsx
similarity index 77%
rename from rsconcept/frontend/src/components/ExpectedAnonymous.tsx
rename to rsconcept/frontend/src/features/auth/components/ExpectedAnonymous.tsx
index c0c6782e..d58caf83 100644
--- a/rsconcept/frontend/src/components/ExpectedAnonymous.tsx
+++ b/rsconcept/frontend/src/features/auth/components/ExpectedAnonymous.tsx
@@ -1,9 +1,8 @@
-import { useConceptNavigation } from '@/app/Navigation/NavigationContext';
-import { urls } from '@/app/urls';
-import { useAuthSuspense } from '@/backend/auth/useAuth';
-import { useLogout } from '@/backend/auth/useLogout';
+import { urls, useConceptNavigation } from '@/app';
+import { TextURL } from '@/components/Control';
 
-import { TextURL } from './ui/Control';
+import { useAuthSuspense } from '../backend/useAuth';
+import { useLogout } from '../backend/useLogout';
 
 function ExpectedAnonymous() {
   const { user } = useAuthSuspense();
diff --git a/rsconcept/frontend/src/components/RequireAuth.tsx b/rsconcept/frontend/src/features/auth/components/RequireAuth.tsx
similarity index 85%
rename from rsconcept/frontend/src/components/RequireAuth.tsx
rename to rsconcept/frontend/src/features/auth/components/RequireAuth.tsx
index 9579c596..08d4b09f 100644
--- a/rsconcept/frontend/src/components/RequireAuth.tsx
+++ b/rsconcept/frontend/src/features/auth/components/RequireAuth.tsx
@@ -1,8 +1,8 @@
 'use client';
 
-import { useAuthSuspense } from '@/backend/auth/useAuth';
+import { TextURL } from '@/components/Control';
 
-import { TextURL } from './ui/Control';
+import { useAuthSuspense } from '../backend/useAuth';
 
 function RequireAuth({ children }: React.PropsWithChildren) {
   const { isAnonymous } = useAuthSuspense();
diff --git a/rsconcept/frontend/src/pages/LoginPage.tsx b/rsconcept/frontend/src/features/auth/pages/LoginPage.tsx
similarity index 81%
rename from rsconcept/frontend/src/pages/LoginPage.tsx
rename to rsconcept/frontend/src/features/auth/pages/LoginPage.tsx
index e5cfaf55..48894d26 100644
--- a/rsconcept/frontend/src/pages/LoginPage.tsx
+++ b/rsconcept/frontend/src/features/auth/pages/LoginPage.tsx
@@ -1,22 +1,22 @@
 'use client';
 
 import { zodResolver } from '@hookform/resolvers/zod';
-import axios from 'axios';
 import clsx from 'clsx';
 import { useForm } from 'react-hook-form';
 
-import { useConceptNavigation } from '@/app/Navigation/NavigationContext';
-import { urls } from '@/app/urls';
-import { IUserLoginDTO, UserLoginSchema } from '@/backend/auth/api';
-import { useAuthSuspense } from '@/backend/auth/useAuth';
-import { useLogin } from '@/backend/auth/useLogin';
-import ExpectedAnonymous from '@/components/ExpectedAnonymous';
-import { ErrorData } from '@/components/info/InfoError';
-import { SubmitButton, TextURL } from '@/components/ui/Control';
-import { TextInput } from '@/components/ui/Input';
+import { urls, useConceptNavigation } from '@/app';
+import { isAxiosError } from '@/backend/apiTransport';
+import { SubmitButton, TextURL } from '@/components/Control';
+import { ErrorData } from '@/components/InfoError';
+import { TextInput } from '@/components/Input';
 import useQueryStrings from '@/hooks/useQueryStrings';
 import { resources } from '@/utils/constants';
 
+import { IUserLoginDTO, UserLoginSchema } from '../backend/api';
+import { useAuthSuspense } from '../backend/useAuth';
+import { useLogin } from '../backend/useLogin';
+import ExpectedAnonymous from '../components/ExpectedAnonymous';
+
 function LoginPage() {
   const router = useConceptNavigation();
   const query = useQueryStrings();
@@ -97,7 +97,7 @@ export default LoginPage;
 
 // ====== Internals =========
 function ServerError({ error }: { error: ErrorData }): React.ReactElement | null {
-  if (axios.isAxiosError(error) && error.response && error.response.status === 400) {
+  if (isAxiosError(error) && error.response && error.response.status === 400) {
     return (
       <div className='text-sm select-text text-warn-600'>
         На Портале отсутствует такое сочетание имени пользователя и пароля
diff --git a/rsconcept/frontend/src/pages/PasswordChangePage.tsx b/rsconcept/frontend/src/features/auth/pages/PasswordChangePage.tsx
similarity index 84%
rename from rsconcept/frontend/src/pages/PasswordChangePage.tsx
rename to rsconcept/frontend/src/features/auth/pages/PasswordChangePage.tsx
index 592eff0f..cc8622e8 100644
--- a/rsconcept/frontend/src/pages/PasswordChangePage.tsx
+++ b/rsconcept/frontend/src/features/auth/pages/PasswordChangePage.tsx
@@ -1,18 +1,18 @@
 'use client';
 
-import axios from 'axios';
 import clsx from 'clsx';
 import { useEffect, useState } from 'react';
 
-import { useConceptNavigation } from '@/app/Navigation/NavigationContext';
-import { urls } from '@/app/urls';
-import { useResetPassword } from '@/backend/auth/useResetPassword';
-import InfoError, { ErrorData } from '@/components/info/InfoError';
-import { SubmitButton } from '@/components/ui/Control';
-import { TextInput } from '@/components/ui/Input';
-import Loader from '@/components/ui/Loader';
+import { urls, useConceptNavigation } from '@/app';
+import { isAxiosError } from '@/backend/apiTransport';
+import { SubmitButton } from '@/components/Control';
+import { ErrorData, InfoError } from '@/components/InfoError';
+import { TextInput } from '@/components/Input';
+import { Loader } from '@/components/Loader';
 import useQueryStrings from '@/hooks/useQueryStrings';
 
+import { useResetPassword } from '../backend/useResetPassword';
+
 export function Component() {
   const router = useConceptNavigation();
   const token = useQueryStrings().get('token') ?? '';
@@ -95,7 +95,7 @@ export function Component() {
 
 // ====== Internals =========
 function ServerError({ error }: { error: ErrorData }): React.ReactElement {
-  if (axios.isAxiosError(error) && error.response && error.response.status === 404) {
+  if (isAxiosError(error) && error.response && error.response.status === 404) {
     return <div className='mx-auto mt-6 text-sm select-text text-warn-600'>Данная ссылка не действительна</div>;
   }
   return <InfoError error={error} />;
diff --git a/rsconcept/frontend/src/pages/RestorePasswordPage.tsx b/rsconcept/frontend/src/features/auth/pages/RestorePasswordPage.tsx
similarity index 84%
rename from rsconcept/frontend/src/pages/RestorePasswordPage.tsx
rename to rsconcept/frontend/src/features/auth/pages/RestorePasswordPage.tsx
index 9d900f78..a327fb55 100644
--- a/rsconcept/frontend/src/pages/RestorePasswordPage.tsx
+++ b/rsconcept/frontend/src/features/auth/pages/RestorePasswordPage.tsx
@@ -1,13 +1,14 @@
 'use client';
 
-import axios from 'axios';
 import clsx from 'clsx';
 import { useState } from 'react';
 
-import { useRequestPasswordReset } from '@/backend/auth/useRequestPasswordReset';
-import { ErrorData } from '@/components/info/InfoError';
-import { SubmitButton, TextURL } from '@/components/ui/Control';
-import { TextInput } from '@/components/ui/Input';
+import { isAxiosError } from '@/backend/apiTransport';
+import { SubmitButton, TextURL } from '@/components/Control';
+import { ErrorData } from '@/components/InfoError';
+import { TextInput } from '@/components/Input';
+
+import { useRequestPasswordReset } from '../backend/useRequestPasswordReset';
 
 export function Component() {
   const { requestPasswordReset, isPending, error: serverError, reset: clearServerError } = useRequestPasswordReset();
@@ -61,7 +62,7 @@ export function Component() {
 
 // ====== Internals =========
 function ServerError({ error }: { error: ErrorData }): React.ReactElement {
-  if (axios.isAxiosError(error) && error.response && error.response.status === 400) {
+  if (isAxiosError(error) && error.response && error.response.status === 400) {
     return (
       <div className='mx-auto mt-6 text-sm select-text text-warn-600'>Данный email не используется на Портале.</div>
     );
diff --git a/rsconcept/frontend/src/components/info/InfoCstClass.tsx b/rsconcept/frontend/src/features/help/components/InfoCstClass.tsx
similarity index 94%
rename from rsconcept/frontend/src/components/info/InfoCstClass.tsx
rename to rsconcept/frontend/src/features/help/components/InfoCstClass.tsx
index ddc062cb..3f48bb82 100644
--- a/rsconcept/frontend/src/components/info/InfoCstClass.tsx
+++ b/rsconcept/frontend/src/features/help/components/InfoCstClass.tsx
@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 
-import { CstClass } from '@/models/rsform';
+import { CstClass } from '@/features/rsform/models/rsform';
 import { colorBgCstClass } from '@/styling/color';
 import { prefixes } from '@/utils/constants';
 import { describeCstClass, labelCstClass } from '@/utils/labels';
diff --git a/rsconcept/frontend/src/components/info/InfoCstStatus.tsx b/rsconcept/frontend/src/features/help/components/InfoCstStatus.tsx
similarity index 94%
rename from rsconcept/frontend/src/components/info/InfoCstStatus.tsx
rename to rsconcept/frontend/src/features/help/components/InfoCstStatus.tsx
index 853c2847..12d29c99 100644
--- a/rsconcept/frontend/src/components/info/InfoCstStatus.tsx
+++ b/rsconcept/frontend/src/features/help/components/InfoCstStatus.tsx
@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 
-import { ExpressionStatus } from '@/models/rsform';
+import { ExpressionStatus } from '@/features/rsform/models/rsform';
 import { colorBgCstStatus } from '@/styling/color';
 import { prefixes } from '@/utils/constants';
 import { describeExpressionStatus, labelExpressionStatus } from '@/utils/labels';
diff --git a/rsconcept/frontend/src/components/ui/Control/LinkTopic.tsx b/rsconcept/frontend/src/features/help/components/LinkTopic.tsx
similarity index 69%
rename from rsconcept/frontend/src/components/ui/Control/LinkTopic.tsx
rename to rsconcept/frontend/src/features/help/components/LinkTopic.tsx
index 76891fc4..8770ce92 100644
--- a/rsconcept/frontend/src/components/ui/Control/LinkTopic.tsx
+++ b/rsconcept/frontend/src/features/help/components/LinkTopic.tsx
@@ -1,7 +1,7 @@
-import { urls } from '@/app/urls';
-import { HelpTopic } from '@/models/miscellaneous';
+import { urls } from '@/app';
+import { TextURL } from '@/components/Control';
 
-import { TextURL } from './TextURL';
+import { HelpTopic } from '../models/helpTopic';
 
 interface TextURLProps {
   /** Text to display. */
diff --git a/rsconcept/frontend/src/pages/ManualsPage/Subtopics.tsx b/rsconcept/frontend/src/features/help/components/Subtopics.tsx
similarity index 67%
rename from rsconcept/frontend/src/pages/ManualsPage/Subtopics.tsx
rename to rsconcept/frontend/src/features/help/components/Subtopics.tsx
index d1ca3ff9..8779397c 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/Subtopics.tsx
+++ b/rsconcept/frontend/src/features/help/components/Subtopics.tsx
@@ -1,13 +1,14 @@
-import { HelpTopic, topicParent } from '@/models/miscellaneous';
 import { prefixes } from '@/utils/constants';
 
-import TopicItem from './TopicItem';
+import { topicParent } from '../models/helpTopic';
+import { HelpTopic } from '../models/helpTopic';
+import { TopicItem } from './TopicItem';
 
 interface SubtopicsProps {
   headTopic: HelpTopic;
 }
 
-function Subtopics({ headTopic }: SubtopicsProps) {
+export function Subtopics({ headTopic }: SubtopicsProps) {
   return (
     <>
       <h2>Содержание раздела</h2>
@@ -19,5 +20,3 @@ function Subtopics({ headTopic }: SubtopicsProps) {
     </>
   );
 }
-
-export default Subtopics;
diff --git a/rsconcept/frontend/src/pages/ManualsPage/TopicItem.tsx b/rsconcept/frontend/src/features/help/components/TopicItem.tsx
similarity index 60%
rename from rsconcept/frontend/src/pages/ManualsPage/TopicItem.tsx
rename to rsconcept/frontend/src/features/help/components/TopicItem.tsx
index fc291072..20447751 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/TopicItem.tsx
+++ b/rsconcept/frontend/src/features/help/components/TopicItem.tsx
@@ -1,17 +1,16 @@
-import { LinkTopic } from '@/components/ui/Control';
-import { HelpTopic } from '@/models/miscellaneous';
 import { describeHelpTopic, labelHelpTopic, removeTags } from '@/utils/labels';
 
+import { LinkTopic } from '../components/LinkTopic';
+import { HelpTopic } from '../models/helpTopic';
+
 interface TopicItemProps {
   topic: HelpTopic;
 }
 
-function TopicItem({ topic }: TopicItemProps) {
+export function TopicItem({ topic }: TopicItemProps) {
   return (
     <li>
       <LinkTopic text={labelHelpTopic(topic)} topic={topic} /> – {removeTags(describeHelpTopic(topic))}
     </li>
   );
 }
-
-export default TopicItem;
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpAccess.tsx b/rsconcept/frontend/src/features/help/items/HelpAccess.tsx
similarity index 100%
rename from rsconcept/frontend/src/pages/ManualsPage/items/HelpAccess.tsx
rename to rsconcept/frontend/src/features/help/items/HelpAccess.tsx
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpConcept.tsx b/rsconcept/frontend/src/features/help/items/HelpConcept.tsx
similarity index 96%
rename from rsconcept/frontend/src/pages/ManualsPage/items/HelpConcept.tsx
rename to rsconcept/frontend/src/features/help/items/HelpConcept.tsx
index 8e6e6c83..f938b526 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpConcept.tsx
+++ b/rsconcept/frontend/src/features/help/items/HelpConcept.tsx
@@ -1,8 +1,8 @@
-import { TextURL } from '@/components/ui/Control';
-import { HelpTopic } from '@/models/miscellaneous';
+import { TextURL } from '@/components/Control';
 import { external_urls } from '@/utils/constants';
 
-import Subtopics from '../Subtopics';
+import { Subtopics } from '../components/Subtopics';
+import { HelpTopic } from '../models/helpTopic';
 
 function HelpConceptSystem() {
   return (
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpExteor.tsx b/rsconcept/frontend/src/features/help/items/HelpExteor.tsx
similarity index 98%
rename from rsconcept/frontend/src/pages/ManualsPage/items/HelpExteor.tsx
rename to rsconcept/frontend/src/features/help/items/HelpExteor.tsx
index a01e8f87..b3592ea6 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpExteor.tsx
+++ b/rsconcept/frontend/src/features/help/items/HelpExteor.tsx
@@ -1,4 +1,4 @@
-import { TextURL } from '@/components/ui/Control';
+import { TextURL } from '@/components/Control';
 import { external_urls, PARAMETER } from '@/utils/constants';
 
 function HelpExteor() {
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpInfo.tsx b/rsconcept/frontend/src/features/help/items/HelpInfo.tsx
similarity index 81%
rename from rsconcept/frontend/src/pages/ManualsPage/items/HelpInfo.tsx
rename to rsconcept/frontend/src/features/help/items/HelpInfo.tsx
index be4670d6..80a4a1b2 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpInfo.tsx
+++ b/rsconcept/frontend/src/features/help/items/HelpInfo.tsx
@@ -1,6 +1,5 @@
-import { HelpTopic } from '@/models/miscellaneous';
-
-import Subtopics from '../Subtopics';
+import { Subtopics } from '../components/Subtopics';
+import { HelpTopic } from '../models/helpTopic';
 
 function HelpInfo() {
   return (
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpInterface.tsx b/rsconcept/frontend/src/features/help/items/HelpInterface.tsx
similarity index 96%
rename from rsconcept/frontend/src/pages/ManualsPage/items/HelpInterface.tsx
rename to rsconcept/frontend/src/features/help/items/HelpInterface.tsx
index 290d80ef..807fab79 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpInterface.tsx
+++ b/rsconcept/frontend/src/features/help/items/HelpInterface.tsx
@@ -8,9 +8,9 @@ import {
   IconPin,
   IconUser2
 } from '@/components/Icons';
-import { HelpTopic } from '@/models/miscellaneous';
 
-import Subtopics from '../Subtopics';
+import { Subtopics } from '../components/Subtopics';
+import { HelpTopic } from '../models/helpTopic';
 
 function HelpInterface() {
   return (
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpMain.tsx b/rsconcept/frontend/src/features/help/items/HelpMain.tsx
similarity index 94%
rename from rsconcept/frontend/src/pages/ManualsPage/items/HelpMain.tsx
rename to rsconcept/frontend/src/features/help/items/HelpMain.tsx
index a1324196..10ba4711 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpMain.tsx
+++ b/rsconcept/frontend/src/features/help/items/HelpMain.tsx
@@ -1,8 +1,9 @@
-import { LinkTopic, TextURL } from '@/components/ui/Control';
-import { HelpTopic } from '@/models/miscellaneous';
+import { TextURL } from '@/components/Control';
 import { external_urls, prefixes } from '@/utils/constants';
 
-import TopicItem from '../TopicItem';
+import { LinkTopic } from '../components/LinkTopic';
+import { TopicItem } from '../components/TopicItem';
+import { HelpTopic } from '../models/helpTopic';
 
 function HelpMain() {
   return (
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpRSLang.tsx b/rsconcept/frontend/src/features/help/items/HelpRSLang.tsx
similarity index 91%
rename from rsconcept/frontend/src/pages/ManualsPage/items/HelpRSLang.tsx
rename to rsconcept/frontend/src/features/help/items/HelpRSLang.tsx
index 091de553..d7d55783 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpRSLang.tsx
+++ b/rsconcept/frontend/src/features/help/items/HelpRSLang.tsx
@@ -1,9 +1,9 @@
-import { EmbedYoutube } from '@/components/ui/View';
+import { EmbedYoutube } from '@/components/View';
 import useWindowSize from '@/hooks/useWindowSize';
-import { HelpTopic } from '@/models/miscellaneous';
 import { external_urls, youtube } from '@/utils/constants';
 
-import Subtopics from '../Subtopics';
+import { Subtopics } from '../components/Subtopics';
+import { HelpTopic } from '../models/helpTopic';
 
 function HelpRSLang() {
   const windowSize = useWindowSize();
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpTerminologyControl.tsx b/rsconcept/frontend/src/features/help/items/HelpTerminologyControl.tsx
similarity index 100%
rename from rsconcept/frontend/src/pages/ManualsPage/items/HelpTerminologyControl.tsx
rename to rsconcept/frontend/src/features/help/items/HelpTerminologyControl.tsx
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpThesaurus.tsx b/rsconcept/frontend/src/features/help/items/HelpThesaurus.tsx
similarity index 99%
rename from rsconcept/frontend/src/pages/ManualsPage/items/HelpThesaurus.tsx
rename to rsconcept/frontend/src/features/help/items/HelpThesaurus.tsx
index 85e36492..04150b78 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpThesaurus.tsx
+++ b/rsconcept/frontend/src/features/help/items/HelpThesaurus.tsx
@@ -26,8 +26,9 @@ import {
   IconStatusUnknown,
   IconSynthesis
 } from '@/components/Icons';
-import { LinkTopic } from '@/components/ui/Control';
-import { HelpTopic } from '@/models/miscellaneous';
+
+import { LinkTopic } from '../components/LinkTopic';
+import { HelpTopic } from '../models/helpTopic';
 
 function HelpThesaurus() {
   return (
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpVersions.tsx b/rsconcept/frontend/src/features/help/items/HelpVersions.tsx
similarity index 100%
rename from rsconcept/frontend/src/pages/ManualsPage/items/HelpVersions.tsx
rename to rsconcept/frontend/src/features/help/items/HelpVersions.tsx
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/cc/HelpConceptOSS.tsx b/rsconcept/frontend/src/features/help/items/cc/HelpConceptOSS.tsx
similarity index 97%
rename from rsconcept/frontend/src/pages/ManualsPage/items/cc/HelpConceptOSS.tsx
rename to rsconcept/frontend/src/features/help/items/cc/HelpConceptOSS.tsx
index ddbfd551..12bb2aee 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/cc/HelpConceptOSS.tsx
+++ b/rsconcept/frontend/src/features/help/items/cc/HelpConceptOSS.tsx
@@ -7,8 +7,9 @@ import {
   IconRSFormOwned,
   IconSynthesis
 } from '@/components/Icons';
-import { LinkTopic } from '@/components/ui/Control';
-import { HelpTopic } from '@/models/miscellaneous';
+
+import { LinkTopic } from '../../components/LinkTopic';
+import { HelpTopic } from '../../models/helpTopic';
 
 function HelpConceptOSS() {
   return (
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/cc/HelpConceptPropagation.tsx b/rsconcept/frontend/src/features/help/items/cc/HelpConceptPropagation.tsx
similarity index 97%
rename from rsconcept/frontend/src/pages/ManualsPage/items/cc/HelpConceptPropagation.tsx
rename to rsconcept/frontend/src/features/help/items/cc/HelpConceptPropagation.tsx
index 733c7656..88116019 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/cc/HelpConceptPropagation.tsx
+++ b/rsconcept/frontend/src/features/help/items/cc/HelpConceptPropagation.tsx
@@ -1,6 +1,7 @@
 import { IconPredecessor } from '@/components/Icons';
-import { LinkTopic } from '@/components/ui/Control';
-import { HelpTopic } from '@/models/miscellaneous';
+
+import { LinkTopic } from '../../components/LinkTopic';
+import { HelpTopic } from '../../models/helpTopic';
 
 function HelpConceptPropagation() {
   return (
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/cc/HelpConceptRelations.tsx b/rsconcept/frontend/src/features/help/items/cc/HelpConceptRelations.tsx
similarity index 96%
rename from rsconcept/frontend/src/pages/ManualsPage/items/cc/HelpConceptRelations.tsx
rename to rsconcept/frontend/src/features/help/items/cc/HelpConceptRelations.tsx
index 7274bcec..36274cab 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/cc/HelpConceptRelations.tsx
+++ b/rsconcept/frontend/src/features/help/items/cc/HelpConceptRelations.tsx
@@ -1,5 +1,5 @@
-import { LinkTopic } from '@/components/ui/Control';
-import { HelpTopic } from '@/models/miscellaneous';
+import { LinkTopic } from '../../components/LinkTopic';
+import { HelpTopic } from '../../models/helpTopic';
 
 function HelpConceptRelations() {
   return (
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/cc/HelpConceptSynthesis.tsx b/rsconcept/frontend/src/features/help/items/cc/HelpConceptSynthesis.tsx
similarity index 97%
rename from rsconcept/frontend/src/pages/ManualsPage/items/cc/HelpConceptSynthesis.tsx
rename to rsconcept/frontend/src/features/help/items/cc/HelpConceptSynthesis.tsx
index eaa1185c..b3791598 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/cc/HelpConceptSynthesis.tsx
+++ b/rsconcept/frontend/src/features/help/items/cc/HelpConceptSynthesis.tsx
@@ -1,5 +1,5 @@
-import { LinkTopic } from '@/components/ui/Control';
-import { HelpTopic } from '@/models/miscellaneous';
+import { LinkTopic } from '../../components/LinkTopic';
+import { HelpTopic } from '../../models/helpTopic';
 
 function HelpConceptSynthesis() {
   return (
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/cc/HelpConceptSystem.tsx b/rsconcept/frontend/src/features/help/items/cc/HelpConceptSystem.tsx
similarity index 98%
rename from rsconcept/frontend/src/pages/ManualsPage/items/cc/HelpConceptSystem.tsx
rename to rsconcept/frontend/src/features/help/items/cc/HelpConceptSystem.tsx
index ed7401cd..6be37c02 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/cc/HelpConceptSystem.tsx
+++ b/rsconcept/frontend/src/features/help/items/cc/HelpConceptSystem.tsx
@@ -1,5 +1,5 @@
-import { LinkTopic } from '@/components/ui/Control';
-import { HelpTopic } from '@/models/miscellaneous';
+import { LinkTopic } from '../../components/LinkTopic';
+import { HelpTopic } from '../../models/helpTopic';
 
 function HelpConceptSystem() {
   return (
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/cc/HelpCstAttributes.tsx b/rsconcept/frontend/src/features/help/items/cc/HelpCstAttributes.tsx
similarity index 97%
rename from rsconcept/frontend/src/pages/ManualsPage/items/cc/HelpCstAttributes.tsx
rename to rsconcept/frontend/src/features/help/items/cc/HelpCstAttributes.tsx
index 79787596..b2fd42b7 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/cc/HelpCstAttributes.tsx
+++ b/rsconcept/frontend/src/features/help/items/cc/HelpCstAttributes.tsx
@@ -1,5 +1,5 @@
-import { LinkTopic } from '@/components/ui/Control';
-import { HelpTopic } from '@/models/miscellaneous';
+import { LinkTopic } from '../../components/LinkTopic';
+import { HelpTopic } from '../../models/helpTopic';
 
 function HelpCstAttributes() {
   return (
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/info/HelpAPI.tsx b/rsconcept/frontend/src/features/help/items/info/HelpAPI.tsx
similarity index 94%
rename from rsconcept/frontend/src/pages/ManualsPage/items/info/HelpAPI.tsx
rename to rsconcept/frontend/src/features/help/items/info/HelpAPI.tsx
index c968555c..08d49d93 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/info/HelpAPI.tsx
+++ b/rsconcept/frontend/src/features/help/items/info/HelpAPI.tsx
@@ -1,4 +1,4 @@
-import { TextURL } from '@/components/ui/Control';
+import { TextURL } from '@/components/Control';
 import { external_urls } from '@/utils/constants';
 
 function HelpAPI() {
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/info/HelpContributors.tsx b/rsconcept/frontend/src/features/help/items/info/HelpContributors.tsx
similarity index 99%
rename from rsconcept/frontend/src/pages/ManualsPage/items/info/HelpContributors.tsx
rename to rsconcept/frontend/src/features/help/items/info/HelpContributors.tsx
index 0f8e3aee..1bcf66f5 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/info/HelpContributors.tsx
+++ b/rsconcept/frontend/src/features/help/items/info/HelpContributors.tsx
@@ -1,7 +1,9 @@
-import { LinkTopic, TextURL } from '@/components/ui/Control';
-import { HelpTopic } from '@/models/miscellaneous';
+import { TextURL } from '@/components/Control';
 import { external_urls } from '@/utils/constants';
 
+import { LinkTopic } from '../../components/LinkTopic';
+import { HelpTopic } from '../../models/helpTopic';
+
 function HelpInfo() {
   return (
     <div>
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/info/HelpPrivacy.tsx b/rsconcept/frontend/src/features/help/items/info/HelpPrivacy.tsx
similarity index 87%
rename from rsconcept/frontend/src/pages/ManualsPage/items/info/HelpPrivacy.tsx
rename to rsconcept/frontend/src/features/help/items/info/HelpPrivacy.tsx
index b2810121..8dc73c7a 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/info/HelpPrivacy.tsx
+++ b/rsconcept/frontend/src/features/help/items/info/HelpPrivacy.tsx
@@ -1,4 +1,4 @@
-import { PDFViewer } from '@/components/ui/View';
+import { PDFViewer } from '@/components/View';
 import { resources } from '@/utils/constants';
 
 interface HelpPrivacyProps {
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/info/HelpRules.tsx b/rsconcept/frontend/src/features/help/items/info/HelpRules.tsx
similarity index 98%
rename from rsconcept/frontend/src/pages/ManualsPage/items/info/HelpRules.tsx
rename to rsconcept/frontend/src/features/help/items/info/HelpRules.tsx
index 7597bf14..4b0e6f5c 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/info/HelpRules.tsx
+++ b/rsconcept/frontend/src/features/help/items/info/HelpRules.tsx
@@ -1,5 +1,5 @@
-import { urls } from '@/app/urls';
-import { TextURL } from '@/components/ui/Control';
+import { urls } from '@/app';
+import { TextURL } from '@/components/Control';
 import { external_urls } from '@/utils/constants';
 
 function HelpRules() {
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/rslang/HelpRSLangCorrect.tsx b/rsconcept/frontend/src/features/help/items/rslang/HelpRSLangCorrect.tsx
similarity index 96%
rename from rsconcept/frontend/src/pages/ManualsPage/items/rslang/HelpRSLangCorrect.tsx
rename to rsconcept/frontend/src/features/help/items/rslang/HelpRSLangCorrect.tsx
index 578ad637..b1e5b98e 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/rslang/HelpRSLangCorrect.tsx
+++ b/rsconcept/frontend/src/features/help/items/rslang/HelpRSLangCorrect.tsx
@@ -1,5 +1,5 @@
-import { LinkTopic } from '@/components/ui/Control';
-import { HelpTopic } from '@/models/miscellaneous';
+import { LinkTopic } from '../../components/LinkTopic';
+import { HelpTopic } from '../../models/helpTopic';
 
 function HelpRSLangCorrect() {
   return (
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/rslang/HelpRSLangInterpret.tsx b/rsconcept/frontend/src/features/help/items/rslang/HelpRSLangInterpret.tsx
similarity index 97%
rename from rsconcept/frontend/src/pages/ManualsPage/items/rslang/HelpRSLangInterpret.tsx
rename to rsconcept/frontend/src/features/help/items/rslang/HelpRSLangInterpret.tsx
index a401c816..1326ba10 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/rslang/HelpRSLangInterpret.tsx
+++ b/rsconcept/frontend/src/features/help/items/rslang/HelpRSLangInterpret.tsx
@@ -1,5 +1,5 @@
-import { LinkTopic } from '@/components/ui/Control';
-import { HelpTopic } from '@/models/miscellaneous';
+import { LinkTopic } from '../../components/LinkTopic';
+import { HelpTopic } from '../../models/helpTopic';
 
 function HelpRSLangInterpret() {
   return (
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/rslang/HelpRSLangOperations.tsx b/rsconcept/frontend/src/features/help/items/rslang/HelpRSLangOperations.tsx
similarity index 97%
rename from rsconcept/frontend/src/pages/ManualsPage/items/rslang/HelpRSLangOperations.tsx
rename to rsconcept/frontend/src/features/help/items/rslang/HelpRSLangOperations.tsx
index 116b558f..23fdeb1e 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/rslang/HelpRSLangOperations.tsx
+++ b/rsconcept/frontend/src/features/help/items/rslang/HelpRSLangOperations.tsx
@@ -6,8 +6,9 @@ import {
   IconSortList,
   IconTemplates
 } from '@/components/Icons';
-import { LinkTopic } from '@/components/ui/Control';
-import { HelpTopic } from '@/models/miscellaneous';
+
+import { LinkTopic } from '../../components/LinkTopic';
+import { HelpTopic } from '../../models/helpTopic';
 
 function HelpRSLangOperations() {
   return (
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/rslang/HelpRSLangTemplates.tsx b/rsconcept/frontend/src/features/help/items/rslang/HelpRSLangTemplates.tsx
similarity index 100%
rename from rsconcept/frontend/src/pages/ManualsPage/items/rslang/HelpRSLangTemplates.tsx
rename to rsconcept/frontend/src/features/help/items/rslang/HelpRSLangTemplates.tsx
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/rslang/HelpRSLangTypes.tsx b/rsconcept/frontend/src/features/help/items/rslang/HelpRSLangTypes.tsx
similarity index 100%
rename from rsconcept/frontend/src/pages/ManualsPage/items/rslang/HelpRSLangTypes.tsx
rename to rsconcept/frontend/src/features/help/items/rslang/HelpRSLangTypes.tsx
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpCstClass.tsx b/rsconcept/frontend/src/features/help/items/ui/HelpCstClass.tsx
similarity index 68%
rename from rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpCstClass.tsx
rename to rsconcept/frontend/src/features/help/items/ui/HelpCstClass.tsx
index cfaa4050..9abe6a12 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpCstClass.tsx
+++ b/rsconcept/frontend/src/features/help/items/ui/HelpCstClass.tsx
@@ -1,4 +1,4 @@
-import InfoCstClass from '@/components/info/InfoCstClass';
+import InfoCstClass from '../../components/InfoCstClass';
 
 function HelpCstClass() {
   return <InfoCstClass header='Классы конституент' />;
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpCstStatus.tsx b/rsconcept/frontend/src/features/help/items/ui/HelpCstStatus.tsx
similarity index 68%
rename from rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpCstStatus.tsx
rename to rsconcept/frontend/src/features/help/items/ui/HelpCstStatus.tsx
index 13725329..a762f00b 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpCstStatus.tsx
+++ b/rsconcept/frontend/src/features/help/items/ui/HelpCstStatus.tsx
@@ -1,4 +1,4 @@
-import InfoCstStatus from '@/components/info/InfoCstStatus';
+import InfoCstStatus from '../../components/InfoCstStatus';
 
 function HelpCstStatus() {
   return <InfoCstStatus title='Статусы конституент' />;
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpFormulaTree.tsx b/rsconcept/frontend/src/features/help/items/ui/HelpFormulaTree.tsx
similarity index 100%
rename from rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpFormulaTree.tsx
rename to rsconcept/frontend/src/features/help/items/ui/HelpFormulaTree.tsx
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpLibrary.tsx b/rsconcept/frontend/src/features/help/items/ui/HelpLibrary.tsx
similarity index 97%
rename from rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpLibrary.tsx
rename to rsconcept/frontend/src/features/help/items/ui/HelpLibrary.tsx
index f40c0e6f..5157efed 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpLibrary.tsx
+++ b/rsconcept/frontend/src/features/help/items/ui/HelpLibrary.tsx
@@ -16,10 +16,11 @@ import {
   IconSubfolders,
   IconUserSearch
 } from '@/components/Icons';
-import { LinkTopic } from '@/components/ui/Control';
-import { HelpTopic } from '@/models/miscellaneous';
 import { APP_COLORS } from '@/styling/color';
 
+import { LinkTopic } from '../../components/LinkTopic';
+import { HelpTopic } from '../../models/helpTopic';
+
 function HelpLibrary() {
   return (
     <div>
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpOssGraph.tsx b/rsconcept/frontend/src/features/help/items/ui/HelpOssGraph.tsx
similarity index 96%
rename from rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpOssGraph.tsx
rename to rsconcept/frontend/src/features/help/items/ui/HelpOssGraph.tsx
index dad173b8..45390782 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpOssGraph.tsx
+++ b/rsconcept/frontend/src/features/help/items/ui/HelpOssGraph.tsx
@@ -1,3 +1,4 @@
+import { Divider } from '@/components/Container';
 import {
   IconAnimation,
   IconAnimationOff,
@@ -18,9 +19,9 @@ import {
   IconRSForm,
   IconSave
 } from '@/components/Icons';
-import { Divider } from '@/components/ui/Container';
-import { LinkTopic } from '@/components/ui/Control';
-import { HelpTopic } from '@/models/miscellaneous';
+
+import { LinkTopic } from '../../components/LinkTopic';
+import { HelpTopic } from '../../models/helpTopic';
 
 function HelpOssGraph() {
   return (
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpRSCard.tsx b/rsconcept/frontend/src/features/help/items/ui/HelpRSCard.tsx
similarity index 95%
rename from rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpRSCard.tsx
rename to rsconcept/frontend/src/features/help/items/ui/HelpRSCard.tsx
index 02c1eb3a..9cccb09a 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpRSCard.tsx
+++ b/rsconcept/frontend/src/features/help/items/ui/HelpRSCard.tsx
@@ -9,8 +9,9 @@ import {
   IconPublic,
   IconSave
 } from '@/components/Icons';
-import { LinkTopic } from '@/components/ui/Control';
-import { HelpTopic } from '@/models/miscellaneous';
+
+import { LinkTopic } from '../../components/LinkTopic';
+import { HelpTopic } from '../../models/helpTopic';
 
 function HelpRSCard() {
   return (
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpRSEditor.tsx b/rsconcept/frontend/src/features/help/items/ui/HelpRSEditor.tsx
similarity index 97%
rename from rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpRSEditor.tsx
rename to rsconcept/frontend/src/features/help/items/ui/HelpRSEditor.tsx
index 7c578522..fd4a9eaa 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpRSEditor.tsx
+++ b/rsconcept/frontend/src/features/help/items/ui/HelpRSEditor.tsx
@@ -18,10 +18,11 @@ import {
   IconTree,
   IconTypeGraph
 } from '@/components/Icons';
-import { LinkTopic } from '@/components/ui/Control';
-import { HelpTopic } from '@/models/miscellaneous';
 import { APP_COLORS } from '@/styling/color';
 
+import { LinkTopic } from '../../components/LinkTopic';
+import { HelpTopic } from '../../models/helpTopic';
+
 function HelpRSEditor() {
   return (
     <div className='dense'>
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpRSGraphTerm.tsx b/rsconcept/frontend/src/features/help/items/ui/HelpRSGraphTerm.tsx
similarity index 96%
rename from rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpRSGraphTerm.tsx
rename to rsconcept/frontend/src/features/help/items/ui/HelpRSGraphTerm.tsx
index 6f0c7d28..f455321b 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpRSGraphTerm.tsx
+++ b/rsconcept/frontend/src/features/help/items/ui/HelpRSGraphTerm.tsx
@@ -1,3 +1,4 @@
+import { Divider } from '@/components/Container';
 import {
   IconClustering,
   IconDestroy,
@@ -19,11 +20,11 @@ import {
   IconText,
   IconTypeGraph
 } from '@/components/Icons';
-import { Divider } from '@/components/ui/Container';
-import { LinkTopic } from '@/components/ui/Control';
-import { HelpTopic } from '@/models/miscellaneous';
 import { APP_COLORS } from '@/styling/color';
 
+import { LinkTopic } from '../../components/LinkTopic';
+import { HelpTopic } from '../../models/helpTopic';
+
 function HelpRSGraphTerm() {
   return (
     <div className='flex flex-col'>
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpRSList.tsx b/rsconcept/frontend/src/features/help/items/ui/HelpRSList.tsx
similarity index 90%
rename from rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpRSList.tsx
rename to rsconcept/frontend/src/features/help/items/ui/HelpRSList.tsx
index 47b27baa..e11a71a4 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpRSList.tsx
+++ b/rsconcept/frontend/src/features/help/items/ui/HelpRSList.tsx
@@ -1,3 +1,4 @@
+import { Divider } from '@/components/Container';
 import {
   IconAlias,
   IconClone,
@@ -9,10 +10,10 @@ import {
   IconOSS,
   IconReset
 } from '@/components/Icons';
-import InfoCstStatus from '@/components/info/InfoCstStatus';
-import { Divider } from '@/components/ui/Container';
-import { LinkTopic } from '@/components/ui/Control';
-import { HelpTopic } from '@/models/miscellaneous';
+
+import InfoCstStatus from '../../components/InfoCstStatus';
+import { LinkTopic } from '../../components/LinkTopic';
+import { HelpTopic } from '../../models/helpTopic';
 
 function HelpRSList() {
   return (
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpRSMenu.tsx b/rsconcept/frontend/src/features/help/items/ui/HelpRSMenu.tsx
similarity index 96%
rename from rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpRSMenu.tsx
rename to rsconcept/frontend/src/features/help/items/ui/HelpRSMenu.tsx
index 9f6fc208..06db944b 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpRSMenu.tsx
+++ b/rsconcept/frontend/src/features/help/items/ui/HelpRSMenu.tsx
@@ -1,3 +1,4 @@
+import { Divider } from '@/components/Container';
 import {
   IconAdmin,
   IconAlert,
@@ -13,9 +14,9 @@ import {
   IconShare,
   IconUpload
 } from '@/components/Icons';
-import { Divider } from '@/components/ui/Container';
-import { LinkTopic } from '@/components/ui/Control';
-import { HelpTopic } from '@/models/miscellaneous';
+
+import { LinkTopic } from '../../components/LinkTopic';
+import { HelpTopic } from '../../models/helpTopic';
 
 function HelpRSMenu() {
   return (
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpRelocateCst.tsx b/rsconcept/frontend/src/features/help/items/ui/HelpRelocateCst.tsx
similarity index 94%
rename from rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpRelocateCst.tsx
rename to rsconcept/frontend/src/features/help/items/ui/HelpRelocateCst.tsx
index 2beef9f1..7f3f58a8 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpRelocateCst.tsx
+++ b/rsconcept/frontend/src/features/help/items/ui/HelpRelocateCst.tsx
@@ -1,6 +1,7 @@
 import { IconMoveDown, IconMoveUp, IconOSS, IconPredecessor } from '@/components/Icons';
-import { LinkTopic } from '@/components/ui/Control';
-import { HelpTopic } from '@/models/miscellaneous';
+
+import { LinkTopic } from '../../components/LinkTopic';
+import { HelpTopic } from '../../models/helpTopic';
 
 function HelpRelocateCst() {
   return (
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpSubstitutions.tsx b/rsconcept/frontend/src/features/help/items/ui/HelpSubstitutions.tsx
similarity index 100%
rename from rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpSubstitutions.tsx
rename to rsconcept/frontend/src/features/help/items/ui/HelpSubstitutions.tsx
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpTypeGraph.tsx b/rsconcept/frontend/src/features/help/items/ui/HelpTypeGraph.tsx
similarity index 94%
rename from rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpTypeGraph.tsx
rename to rsconcept/frontend/src/features/help/items/ui/HelpTypeGraph.tsx
index b87bf475..678fe710 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpTypeGraph.tsx
+++ b/rsconcept/frontend/src/features/help/items/ui/HelpTypeGraph.tsx
@@ -1,7 +1,8 @@
-import { LinkTopic } from '@/components/ui/Control';
-import { HelpTopic } from '@/models/miscellaneous';
 import { APP_COLORS } from '@/styling/color';
 
+import { LinkTopic } from '../../components/LinkTopic';
+import { HelpTopic } from '../../models/helpTopic';
+
 function HelpTypeGraph() {
   return (
     <div>
diff --git a/rsconcept/frontend/src/models/miscellaneous.ts b/rsconcept/frontend/src/features/help/models/helpTopic.ts
similarity index 55%
rename from rsconcept/frontend/src/models/miscellaneous.ts
rename to rsconcept/frontend/src/features/help/models/helpTopic.ts
index eec88ebb..4c432576 100644
--- a/rsconcept/frontend/src/models/miscellaneous.ts
+++ b/rsconcept/frontend/src/features/help/models/helpTopic.ts
@@ -1,62 +1,3 @@
-/**
- * Module: Miscellaneous frontend model types. Future targets for refactoring aimed at extracting modules.
- */
-
-import { EdgeProps, Node } from 'reactflow';
-
-import { LibraryItemType, LocationHead } from './library';
-import { IOperation } from './oss';
-import { UserID } from './user';
-
-/**
- * Represents graph dependency mode.
- */
-export enum DependencyMode {
-  ALL = 0,
-  OUTPUTS,
-  INPUTS,
-  EXPAND_OUTPUTS,
-  EXPAND_INPUTS
-}
-
-/**
- * Represents graph OSS node data.
- */
-export interface OssNode extends Node {
-  id: string;
-  data: {
-    label: string;
-    operation: IOperation;
-  };
-  position: { x: number; y: number };
-}
-
-/**
- * Represents graph OSS node internal data.
- */
-export interface OssNodeInternal {
-  id: string;
-  data: {
-    label: string;
-    operation: IOperation;
-  };
-  dragging: boolean;
-  xPos: number;
-  yPos: number;
-}
-
-/**
- * Represents graph TMGraph edge internal data.
- */
-export interface MGraphEdgeInternal extends EdgeProps {
-  data?: { indices: number[] };
-}
-
-/**
- * Represents graph node coloring scheme.
- */
-export type GraphColoring = 'none' | 'status' | 'type' | 'schemas';
-
 /**
  * Represents manuals topic.
  */
@@ -163,93 +104,3 @@ export const topicParent = new Map<HelpTopic, HelpTopic>([
  *  Topics that can be folded.
  */
 export const foldableTopics = [HelpTopic.INTERFACE, HelpTopic.RSLANG, HelpTopic.CONCEPTUAL, HelpTopic.INFO];
-
-/**
- * Represents {@link IConstituenta} matching mode.
- */
-export enum CstMatchMode {
-  ALL = 1,
-  EXPR,
-  TERM,
-  TEXT,
-  NAME
-}
-
-/**
- * Represents Library filter parameters.
- */
-export interface ILibraryFilter {
-  type?: LibraryItemType;
-  query?: string;
-
-  folderMode?: boolean;
-  subfolders?: boolean;
-  path?: string;
-  head?: LocationHead;
-  location?: string;
-
-  isVisible?: boolean;
-  isOwned?: boolean;
-  isEditor?: boolean;
-  filterUser?: UserID;
-}
-
-/**
- * Represents parameters for GraphEditor.
- */
-export interface GraphFilterParams {
-  noHermits: boolean;
-  noTransitive: boolean;
-  noTemplates: boolean;
-  noText: boolean;
-  foldDerived: boolean;
-
-  focusShowInputs: boolean;
-  focusShowOutputs: boolean;
-
-  allowBase: boolean;
-  allowStruct: boolean;
-  allowTerm: boolean;
-  allowAxiom: boolean;
-  allowFunction: boolean;
-  allowPredicate: boolean;
-  allowConstant: boolean;
-  allowTheorem: boolean;
-}
-
-/**
- * Represents XY Position.
- */
-export interface Position2D {
-  x: number;
-  y: number;
-}
-
-/**
- * Represents global dialog.
- */
-export enum DialogType {
-  CONSTITUENTA_TEMPLATE = 1,
-  CREATE_CONSTITUENTA,
-  CREATE_OPERATION,
-  DELETE_CONSTITUENTA,
-  EDIT_EDITORS,
-  EDIT_OPERATION,
-  EDIT_REFERENCE,
-  EDIT_VERSIONS,
-  EDIT_WORD_FORMS,
-  INLINE_SYNTHESIS,
-  SHOW_AST,
-  SHOW_TYPE_GRAPH,
-  CHANGE_INPUT_SCHEMA,
-  CHANGE_LOCATION,
-  CLONE_LIBRARY_ITEM,
-  CREATE_VERSION,
-  DELETE_OPERATION,
-  GRAPH_PARAMETERS,
-  RELOCATE_CONSTITUENTS,
-  RENAME_CONSTITUENTA,
-  SHOW_QR_CODE,
-  SUBSTITUTE_CONSTITUENTS,
-  UPLOAD_RSFORM
-}
diff --git a/rsconcept/frontend/src/pages/ManualsPage/ManualsPage.tsx b/rsconcept/frontend/src/features/help/pages/ManualsPage/ManualsPage.tsx
similarity index 86%
rename from rsconcept/frontend/src/pages/ManualsPage/ManualsPage.tsx
rename to rsconcept/frontend/src/features/help/pages/ManualsPage/ManualsPage.tsx
index 8f1e50e7..5f408d28 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/ManualsPage.tsx
+++ b/rsconcept/frontend/src/features/help/pages/ManualsPage/ManualsPage.tsx
@@ -1,12 +1,11 @@
 'use client';
 
-import { useConceptNavigation } from '@/app/Navigation/NavigationContext';
-import { urls } from '@/app/urls';
+import { urls, useConceptNavigation } from '@/app';
 import useQueryStrings from '@/hooks/useQueryStrings';
-import { HelpTopic } from '@/models/miscellaneous';
 import { useMainHeight } from '@/stores/appLayout';
 import { PARAMETER } from '@/utils/constants';
 
+import { HelpTopic } from '../../models/helpTopic';
 import TopicsList from './TopicsList';
 import ViewTopic from './ViewTopic';
 
diff --git a/rsconcept/frontend/src/pages/ManualsPage/TopicPage.tsx b/rsconcept/frontend/src/features/help/pages/ManualsPage/TopicPage.tsx
similarity index 56%
rename from rsconcept/frontend/src/pages/ManualsPage/TopicPage.tsx
rename to rsconcept/frontend/src/features/help/pages/ManualsPage/TopicPage.tsx
index b06c7803..e8a5b2c2 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/TopicPage.tsx
+++ b/rsconcept/frontend/src/features/help/pages/ManualsPage/TopicPage.tsx
@@ -1,44 +1,44 @@
 import useWindowSize from '@/hooks/useWindowSize';
-import { HelpTopic } from '@/models/miscellaneous';
 
-import HelpConceptOSS from './items/cc/HelpConceptOSS';
-import HelpConceptPropagation from './items/cc/HelpConceptPropagation';
-import HelpConceptRelations from './items/cc/HelpConceptRelations';
-import HelpConceptSynthesis from './items/cc/HelpConceptSynthesis';
-import HelpConceptSystem from './items/cc/HelpConceptSystem';
-import HelpCstAttributes from './items/cc/HelpCstAttributes';
-import HelpAccess from './items/HelpAccess';
-import HelpConcept from './items/HelpConcept';
-import HelpExteor from './items/HelpExteor';
-import HelpInfo from './items/HelpInfo';
-import HelpInterface from './items/HelpInterface';
-import HelpMain from './items/HelpMain';
-import HelpRSLang from './items/HelpRSLang';
-import HelpTerminologyControl from './items/HelpTerminologyControl';
-import HelpThesaurus from './items/HelpThesaurus';
-import HelpVersions from './items/HelpVersions';
-import HelpAPI from './items/info/HelpAPI';
-import HelpContributors from './items/info/HelpContributors';
-import HelpPrivacy from './items/info/HelpPrivacy';
-import HelpRules from './items/info/HelpRules';
-import HelpRSLangCorrect from './items/rslang/HelpRSLangCorrect';
-import HelpRSLangInterpret from './items/rslang/HelpRSLangInterpret';
-import HelpRSLangOperations from './items/rslang/HelpRSLangOperations';
-import HelpRSLangTemplates from './items/rslang/HelpRSLangTemplates';
-import HelpRSLangTypes from './items/rslang/HelpRSLangTypes';
-import HelpCstClass from './items/ui/HelpCstClass';
-import HelpCstStatus from './items/ui/HelpCstStatus';
-import HelpFormulaTree from './items/ui/HelpFormulaTree';
-import HelpLibrary from './items/ui/HelpLibrary';
-import HelpOssGraph from './items/ui/HelpOssGraph';
-import HelpRelocateCst from './items/ui/HelpRelocateCst';
-import HelpRSCard from './items/ui/HelpRSCard';
-import HelpRSEditor from './items/ui/HelpRSEditor';
-import HelpRSGraphTerm from './items/ui/HelpRSGraphTerm';
-import HelpRSList from './items/ui/HelpRSList';
-import HelpRSMenu from './items/ui/HelpRSMenu';
-import HelpSubstitutions from './items/ui/HelpSubstitutions';
-import HelpTypeGraph from './items/ui/HelpTypeGraph';
+import HelpConceptOSS from '../../items/cc/HelpConceptOSS';
+import HelpConceptPropagation from '../../items/cc/HelpConceptPropagation';
+import HelpConceptRelations from '../../items/cc/HelpConceptRelations';
+import HelpConceptSynthesis from '../../items/cc/HelpConceptSynthesis';
+import HelpConceptSystem from '../../items/cc/HelpConceptSystem';
+import HelpCstAttributes from '../../items/cc/HelpCstAttributes';
+import HelpAccess from '../../items/HelpAccess';
+import HelpConcept from '../../items/HelpConcept';
+import HelpExteor from '../../items/HelpExteor';
+import HelpInfo from '../../items/HelpInfo';
+import HelpInterface from '../../items/HelpInterface';
+import HelpMain from '../../items/HelpMain';
+import HelpRSLang from '../../items/HelpRSLang';
+import HelpTerminologyControl from '../../items/HelpTerminologyControl';
+import HelpThesaurus from '../../items/HelpThesaurus';
+import HelpVersions from '../../items/HelpVersions';
+import HelpAPI from '../../items/info/HelpAPI';
+import HelpContributors from '../../items/info/HelpContributors';
+import HelpPrivacy from '../../items/info/HelpPrivacy';
+import HelpRules from '../../items/info/HelpRules';
+import HelpRSLangCorrect from '../../items/rslang/HelpRSLangCorrect';
+import HelpRSLangInterpret from '../../items/rslang/HelpRSLangInterpret';
+import HelpRSLangOperations from '../../items/rslang/HelpRSLangOperations';
+import HelpRSLangTemplates from '../../items/rslang/HelpRSLangTemplates';
+import HelpRSLangTypes from '../../items/rslang/HelpRSLangTypes';
+import HelpCstClass from '../../items/ui/HelpCstClass';
+import HelpCstStatus from '../../items/ui/HelpCstStatus';
+import HelpFormulaTree from '../../items/ui/HelpFormulaTree';
+import HelpLibrary from '../../items/ui/HelpLibrary';
+import HelpOssGraph from '../../items/ui/HelpOssGraph';
+import HelpRelocateCst from '../../items/ui/HelpRelocateCst';
+import HelpRSCard from '../../items/ui/HelpRSCard';
+import HelpRSEditor from '../../items/ui/HelpRSEditor';
+import HelpRSGraphTerm from '../../items/ui/HelpRSGraphTerm';
+import HelpRSList from '../../items/ui/HelpRSList';
+import HelpRSMenu from '../../items/ui/HelpRSMenu';
+import HelpSubstitutions from '../../items/ui/HelpSubstitutions';
+import HelpTypeGraph from '../../items/ui/HelpTypeGraph';
+import { HelpTopic } from '../../models/helpTopic';
 
 // PDF Viewer setup
 const OFFSET_X_SMALL = 32;
diff --git a/rsconcept/frontend/src/pages/ManualsPage/TopicsDropdown.tsx b/rsconcept/frontend/src/features/help/pages/ManualsPage/TopicsDropdown.tsx
similarity index 89%
rename from rsconcept/frontend/src/pages/ManualsPage/TopicsDropdown.tsx
rename to rsconcept/frontend/src/features/help/pages/ManualsPage/TopicsDropdown.tsx
index c1767d15..ed1bbe4d 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/TopicsDropdown.tsx
+++ b/rsconcept/frontend/src/features/help/pages/ManualsPage/TopicsDropdown.tsx
@@ -2,15 +2,17 @@
 
 import clsx from 'clsx';
 
+import { Button } from '@/components/Control';
+import { useDropdown } from '@/components/Dropdown';
 import { IconMenuFold, IconMenuUnfold } from '@/components/Icons';
-import { Button } from '@/components/ui/Control';
-import { useDropdown } from '@/components/ui/Dropdown';
-import { SelectTree } from '@/components/ui/Input';
-import { HelpTopic, topicParent } from '@/models/miscellaneous';
+import { SelectTree } from '@/components/Input';
 import { useAppLayoutStore, useFitHeight } from '@/stores/appLayout';
 import { PARAMETER, prefixes } from '@/utils/constants';
 import { describeHelpTopic, labelHelpTopic } from '@/utils/labels';
 
+import { topicParent } from '../../models/helpTopic';
+import { HelpTopic } from '../../models/helpTopic';
+
 interface TopicsDropdownProps {
   activeTopic: HelpTopic;
   onChangeTopic: (newTopic: HelpTopic) => void;
diff --git a/rsconcept/frontend/src/pages/ManualsPage/TopicsList.tsx b/rsconcept/frontend/src/features/help/pages/ManualsPage/TopicsList.tsx
similarity index 92%
rename from rsconcept/frontend/src/pages/ManualsPage/TopicsList.tsx
rename to rsconcept/frontend/src/features/help/pages/ManualsPage/TopicsList.tsx
index 5a3b1075..5577cd51 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/TopicsList.tsx
+++ b/rsconcept/frontend/src/features/help/pages/ManualsPage/TopicsList.tsx
@@ -1,8 +1,8 @@
 'use client';
 
 import useWindowSize from '@/hooks/useWindowSize';
-import { HelpTopic } from '@/models/miscellaneous';
 
+import { HelpTopic } from '../../models/helpTopic';
 import TopicsDropdown from './TopicsDropdown';
 import TopicsStatic from './TopicsStatic';
 
diff --git a/rsconcept/frontend/src/pages/ManualsPage/TopicsStatic.tsx b/rsconcept/frontend/src/features/help/pages/ManualsPage/TopicsStatic.tsx
similarity index 88%
rename from rsconcept/frontend/src/pages/ManualsPage/TopicsStatic.tsx
rename to rsconcept/frontend/src/features/help/pages/ManualsPage/TopicsStatic.tsx
index 26acf52f..d2799479 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/TopicsStatic.tsx
+++ b/rsconcept/frontend/src/features/help/pages/ManualsPage/TopicsStatic.tsx
@@ -1,11 +1,13 @@
 import clsx from 'clsx';
 
-import { SelectTree } from '@/components/ui/Input';
-import { HelpTopic, topicParent } from '@/models/miscellaneous';
+import { SelectTree } from '@/components/Input';
 import { useFitHeight } from '@/stores/appLayout';
 import { prefixes } from '@/utils/constants';
 import { describeHelpTopic, labelHelpTopic } from '@/utils/labels';
 
+import { topicParent } from '../../models/helpTopic';
+import { HelpTopic } from '../../models/helpTopic';
+
 interface TopicsStaticProps {
   activeTopic: HelpTopic;
   onChangeTopic: (newTopic: HelpTopic) => void;
diff --git a/rsconcept/frontend/src/pages/ManualsPage/ViewTopic.tsx b/rsconcept/frontend/src/features/help/pages/ManualsPage/ViewTopic.tsx
similarity index 78%
rename from rsconcept/frontend/src/pages/ManualsPage/ViewTopic.tsx
rename to rsconcept/frontend/src/features/help/pages/ManualsPage/ViewTopic.tsx
index 068967a7..ace88fbc 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/ViewTopic.tsx
+++ b/rsconcept/frontend/src/features/help/pages/ManualsPage/ViewTopic.tsx
@@ -1,9 +1,10 @@
 'use client';
 
-import { HelpTopic } from '@/models/miscellaneous';
-import TopicPage from '@/pages/ManualsPage/TopicPage';
+import TopicPage from '@/features/help/pages/ManualsPage/TopicPage';
 import { useMainHeight } from '@/stores/appLayout';
 
+import { HelpTopic } from '../../models/helpTopic';
+
 interface ViewTopicProps {
   topic: HelpTopic;
 }
diff --git a/rsconcept/frontend/src/pages/ManualsPage/index.tsx b/rsconcept/frontend/src/features/help/pages/ManualsPage/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/pages/ManualsPage/index.tsx
rename to rsconcept/frontend/src/features/help/pages/ManualsPage/index.tsx
diff --git a/rsconcept/frontend/src/pages/DatabaseSchemaPage.tsx b/rsconcept/frontend/src/features/home/DatabaseSchemaPage.tsx
similarity index 100%
rename from rsconcept/frontend/src/pages/DatabaseSchemaPage.tsx
rename to rsconcept/frontend/src/features/home/DatabaseSchemaPage.tsx
diff --git a/rsconcept/frontend/src/pages/HomePage.tsx b/rsconcept/frontend/src/features/home/HomePage.tsx
similarity index 71%
rename from rsconcept/frontend/src/pages/HomePage.tsx
rename to rsconcept/frontend/src/features/home/HomePage.tsx
index 34415485..38762235 100644
--- a/rsconcept/frontend/src/pages/HomePage.tsx
+++ b/rsconcept/frontend/src/features/home/HomePage.tsx
@@ -1,9 +1,8 @@
 import { useEffect } from 'react';
 
-import { useConceptNavigation } from '@/app/Navigation/NavigationContext';
-import { urls } from '@/app/urls';
-import { useAuthSuspense } from '@/backend/auth/useAuth';
-import Loader from '@/components/ui/Loader';
+import { urls, useConceptNavigation } from '@/app';
+import { Loader } from '@/components/Loader';
+import { useAuthSuspense } from '@/features/auth/backend/useAuth';
 import { PARAMETER } from '@/utils/constants';
 
 function HomePage() {
diff --git a/rsconcept/frontend/src/pages/IconsPage.tsx b/rsconcept/frontend/src/features/home/IconsPage.tsx
similarity index 100%
rename from rsconcept/frontend/src/pages/IconsPage.tsx
rename to rsconcept/frontend/src/features/home/IconsPage.tsx
diff --git a/rsconcept/frontend/src/pages/NotFoundPage.tsx b/rsconcept/frontend/src/features/home/NotFoundPage.tsx
similarity index 90%
rename from rsconcept/frontend/src/pages/NotFoundPage.tsx
rename to rsconcept/frontend/src/features/home/NotFoundPage.tsx
index f162e799..e0023bda 100644
--- a/rsconcept/frontend/src/pages/NotFoundPage.tsx
+++ b/rsconcept/frontend/src/features/home/NotFoundPage.tsx
@@ -1,4 +1,4 @@
-import { TextURL } from '@/components/ui/Control';
+import { TextURL } from '@/components/Control';
 
 export function NotFoundPage() {
   return (
diff --git a/rsconcept/frontend/src/backend/library/api.ts b/rsconcept/frontend/src/features/library/backend/api.ts
similarity index 96%
rename from rsconcept/frontend/src/backend/library/api.ts
rename to rsconcept/frontend/src/features/library/backend/api.ts
index 119ffed1..bc0ae512 100644
--- a/rsconcept/frontend/src/backend/library/api.ts
+++ b/rsconcept/frontend/src/features/library/backend/api.ts
@@ -3,13 +3,14 @@ import { z } from 'zod';
 
 import { axiosDelete, axiosGet, axiosPatch, axiosPost } from '@/backend/apiTransport';
 import { DELAYS } from '@/backend/configuration';
-import { ossApi } from '@/backend/oss/api';
-import { IRSFormDTO, rsformsApi } from '@/backend/rsform/api';
-import { AccessPolicy, ILibraryItem, IVersionInfo, LibraryItemID, LibraryItemType, VersionID } from '@/models/library';
-import { validateLocation } from '@/models/libraryAPI';
-import { UserID } from '@/models/user';
+import { ossApi } from '@/features/oss/backend/api';
+import { IRSFormDTO, rsformsApi } from '@/features/rsform/backend/api';
+import { UserID } from '@/features/users/models/user';
 import { errors, information } from '@/utils/labels';
 
+import { AccessPolicy, ILibraryItem, IVersionInfo, LibraryItemID, LibraryItemType, VersionID } from '../models/library';
+import { validateLocation } from '../models/libraryAPI';
+
 /**
  * Represents update data for renaming Location.
  */
diff --git a/rsconcept/frontend/src/backend/library/useApplyLibraryFilter.tsx b/rsconcept/frontend/src/features/library/backend/useApplyLibraryFilter.tsx
similarity index 87%
rename from rsconcept/frontend/src/backend/library/useApplyLibraryFilter.tsx
rename to rsconcept/frontend/src/features/library/backend/useApplyLibraryFilter.tsx
index 0ff93baf..f15dd275 100644
--- a/rsconcept/frontend/src/backend/library/useApplyLibraryFilter.tsx
+++ b/rsconcept/frontend/src/features/library/backend/useApplyLibraryFilter.tsx
@@ -1,7 +1,7 @@
-import { useAuthSuspense } from '@/backend/auth/useAuth';
-import { matchLibraryItem, matchLibraryItemLocation } from '@/models/libraryAPI';
-import { ILibraryFilter } from '@/models/miscellaneous';
+import { useAuthSuspense } from '@/features/auth/backend/useAuth';
 
+import { ILibraryFilter } from '../models/library';
+import { matchLibraryItem, matchLibraryItemLocation } from '../models/libraryAPI';
 import { useLibrary } from './useLibrary';
 
 export function useApplyLibraryFilter(filter: ILibraryFilter) {
diff --git a/rsconcept/frontend/src/backend/library/useCloneItem.tsx b/rsconcept/frontend/src/features/library/backend/useCloneItem.tsx
similarity index 91%
rename from rsconcept/frontend/src/backend/library/useCloneItem.tsx
rename to rsconcept/frontend/src/features/library/backend/useCloneItem.tsx
index 28ce52ba..b972a6fa 100644
--- a/rsconcept/frontend/src/backend/library/useCloneItem.tsx
+++ b/rsconcept/frontend/src/features/library/backend/useCloneItem.tsx
@@ -1,8 +1,8 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
 import { DataCallback } from '@/backend/apiTransport';
+import { IRSFormDTO } from '@/features/rsform/backend/api';
 
-import { IRSFormDTO } from '../rsform/api';
 import { ICloneLibraryItemDTO, libraryApi } from './api';
 
 export const useCloneItem = () => {
diff --git a/rsconcept/frontend/src/backend/library/useCreateItem.tsx b/rsconcept/frontend/src/features/library/backend/useCreateItem.tsx
similarity index 93%
rename from rsconcept/frontend/src/backend/library/useCreateItem.tsx
rename to rsconcept/frontend/src/features/library/backend/useCreateItem.tsx
index e7f8d3df..4098f60f 100644
--- a/rsconcept/frontend/src/backend/library/useCreateItem.tsx
+++ b/rsconcept/frontend/src/features/library/backend/useCreateItem.tsx
@@ -1,8 +1,8 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
 import { DataCallback } from '@/backend/apiTransport';
-import { ILibraryItem } from '@/models/library';
 
+import { ILibraryItem } from '../models/library';
 import { ICreateLibraryItemDTO, libraryApi } from './api';
 
 export const useCreateItem = () => {
diff --git a/rsconcept/frontend/src/backend/library/useDeleteItem.tsx b/rsconcept/frontend/src/features/library/backend/useDeleteItem.tsx
similarity index 87%
rename from rsconcept/frontend/src/backend/library/useDeleteItem.tsx
rename to rsconcept/frontend/src/features/library/backend/useDeleteItem.tsx
index 8577bb3e..28a30efa 100644
--- a/rsconcept/frontend/src/backend/library/useDeleteItem.tsx
+++ b/rsconcept/frontend/src/features/library/backend/useDeleteItem.tsx
@@ -1,10 +1,10 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { ossApi } from '@/backend/oss/api';
-import { rsformsApi } from '@/backend/rsform/api';
-import { LibraryItemID } from '@/models/library';
+import { ossApi } from '@/features/oss/backend/api';
+import { rsformsApi } from '@/features/rsform/backend/api';
 import { PARAMETER } from '@/utils/constants';
 
+import { LibraryItemID } from '../models/library';
 import { libraryApi } from './api';
 
 export const useDeleteItem = () => {
diff --git a/rsconcept/frontend/src/backend/library/useFolders.tsx b/rsconcept/frontend/src/features/library/backend/useFolders.tsx
similarity index 90%
rename from rsconcept/frontend/src/backend/library/useFolders.tsx
rename to rsconcept/frontend/src/features/library/backend/useFolders.tsx
index d793a111..1b0a0632 100644
--- a/rsconcept/frontend/src/backend/library/useFolders.tsx
+++ b/rsconcept/frontend/src/features/library/backend/useFolders.tsx
@@ -1,6 +1,6 @@
 import { FolderTree } from '@/models/FolderTree';
-import { LocationHead } from '@/models/library';
 
+import { LocationHead } from '../models/library';
 import { useLibrary } from './useLibrary';
 
 export function useFolders() {
diff --git a/rsconcept/frontend/src/backend/library/useLibrary.tsx b/rsconcept/frontend/src/features/library/backend/useLibrary.tsx
similarity index 93%
rename from rsconcept/frontend/src/backend/library/useLibrary.tsx
rename to rsconcept/frontend/src/features/library/backend/useLibrary.tsx
index b2dcfe9c..f14b57b3 100644
--- a/rsconcept/frontend/src/backend/library/useLibrary.tsx
+++ b/rsconcept/frontend/src/features/library/backend/useLibrary.tsx
@@ -1,7 +1,7 @@
 import { useQuery, useSuspenseQuery } from '@tanstack/react-query';
 
-import { useAuthSuspense } from '@/backend/auth/useAuth';
 import { queryClient } from '@/backend/queryClient';
+import { useAuthSuspense } from '@/features/auth/backend/useAuth';
 import { usePreferencesStore } from '@/stores/preferences';
 
 import { libraryApi } from './api';
diff --git a/rsconcept/frontend/src/backend/library/useMutatingLibrary.tsx b/rsconcept/frontend/src/features/library/backend/useMutatingLibrary.tsx
similarity index 78%
rename from rsconcept/frontend/src/backend/library/useMutatingLibrary.tsx
rename to rsconcept/frontend/src/features/library/backend/useMutatingLibrary.tsx
index c28906c8..4ca57cd3 100644
--- a/rsconcept/frontend/src/backend/library/useMutatingLibrary.tsx
+++ b/rsconcept/frontend/src/features/library/backend/useMutatingLibrary.tsx
@@ -1,7 +1,7 @@
 import { useIsMutating } from '@tanstack/react-query';
 
-import { ossApi } from '@/backend/oss/api';
-import { rsformsApi } from '@/backend/rsform/api';
+import { ossApi } from '@/features/oss/backend/api';
+import { rsformsApi } from '@/features/rsform/backend/api';
 
 import { libraryApi } from './api';
 
diff --git a/rsconcept/frontend/src/backend/library/useRenameLocation.tsx b/rsconcept/frontend/src/features/library/backend/useRenameLocation.tsx
similarity index 87%
rename from rsconcept/frontend/src/backend/library/useRenameLocation.tsx
rename to rsconcept/frontend/src/features/library/backend/useRenameLocation.tsx
index 17394d93..6924be0c 100644
--- a/rsconcept/frontend/src/backend/library/useRenameLocation.tsx
+++ b/rsconcept/frontend/src/features/library/backend/useRenameLocation.tsx
@@ -1,7 +1,7 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { ossApi } from '@/backend/oss/api';
-import { rsformsApi } from '@/backend/rsform/api';
+import { ossApi } from '@/features/oss/backend/api';
+import { rsformsApi } from '@/features/rsform/backend/api';
 
 import { IRenameLocationDTO, libraryApi } from './api';
 
diff --git a/rsconcept/frontend/src/backend/library/useSetAccessPolicy.tsx b/rsconcept/frontend/src/features/library/backend/useSetAccessPolicy.tsx
similarity index 88%
rename from rsconcept/frontend/src/backend/library/useSetAccessPolicy.tsx
rename to rsconcept/frontend/src/features/library/backend/useSetAccessPolicy.tsx
index 37f27303..32c2b1c2 100644
--- a/rsconcept/frontend/src/backend/library/useSetAccessPolicy.tsx
+++ b/rsconcept/frontend/src/features/library/backend/useSetAccessPolicy.tsx
@@ -1,9 +1,9 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { IOperationSchemaDTO, ossApi } from '@/backend/oss/api';
-import { rsformsApi } from '@/backend/rsform/api';
-import { AccessPolicy, ILibraryItem, LibraryItemID } from '@/models/library';
+import { IOperationSchemaDTO, ossApi } from '@/features/oss/backend/api';
+import { rsformsApi } from '@/features/rsform/backend/api';
 
+import { AccessPolicy, ILibraryItem, LibraryItemID } from '../models/library';
 import { libraryApi } from './api';
 
 export const useSetAccessPolicy = () => {
diff --git a/rsconcept/frontend/src/backend/library/useSetEditors.tsx b/rsconcept/frontend/src/features/library/backend/useSetEditors.tsx
similarity index 85%
rename from rsconcept/frontend/src/backend/library/useSetEditors.tsx
rename to rsconcept/frontend/src/features/library/backend/useSetEditors.tsx
index 7680d4b1..7d9dd2ab 100644
--- a/rsconcept/frontend/src/backend/library/useSetEditors.tsx
+++ b/rsconcept/frontend/src/features/library/backend/useSetEditors.tsx
@@ -1,10 +1,10 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { ossApi } from '@/backend/oss/api';
-import { rsformsApi } from '@/backend/rsform/api';
-import { LibraryItemID } from '@/models/library';
-import { UserID } from '@/models/user';
+import { ossApi } from '@/features/oss/backend/api';
+import { rsformsApi } from '@/features/rsform/backend/api';
+import { UserID } from '@/features/users/models/user';
 
+import { LibraryItemID } from '../models/library';
 import { libraryApi } from './api';
 
 export const useSetEditors = () => {
diff --git a/rsconcept/frontend/src/backend/library/useSetLocation.tsx b/rsconcept/frontend/src/features/library/backend/useSetLocation.tsx
similarity index 89%
rename from rsconcept/frontend/src/backend/library/useSetLocation.tsx
rename to rsconcept/frontend/src/features/library/backend/useSetLocation.tsx
index 2dcaa19e..574e86a7 100644
--- a/rsconcept/frontend/src/backend/library/useSetLocation.tsx
+++ b/rsconcept/frontend/src/features/library/backend/useSetLocation.tsx
@@ -1,9 +1,9 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { IOperationSchemaDTO, ossApi } from '@/backend/oss/api';
-import { rsformsApi } from '@/backend/rsform/api';
-import { ILibraryItem, LibraryItemID } from '@/models/library';
+import { IOperationSchemaDTO, ossApi } from '@/features/oss/backend/api';
+import { rsformsApi } from '@/features/rsform/backend/api';
 
+import { ILibraryItem, LibraryItemID } from '../models/library';
 import { libraryApi } from './api';
 
 export const useSetLocation = () => {
diff --git a/rsconcept/frontend/src/backend/library/useSetOwner.tsx b/rsconcept/frontend/src/features/library/backend/useSetOwner.tsx
similarity index 86%
rename from rsconcept/frontend/src/backend/library/useSetOwner.tsx
rename to rsconcept/frontend/src/features/library/backend/useSetOwner.tsx
index 09bd4ef9..3c03fbbe 100644
--- a/rsconcept/frontend/src/backend/library/useSetOwner.tsx
+++ b/rsconcept/frontend/src/features/library/backend/useSetOwner.tsx
@@ -1,10 +1,10 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { IOperationSchemaDTO, ossApi } from '@/backend/oss/api';
-import { rsformsApi } from '@/backend/rsform/api';
-import { ILibraryItem, LibraryItemID } from '@/models/library';
-import { UserID } from '@/models/user';
+import { IOperationSchemaDTO, ossApi } from '@/features/oss/backend/api';
+import { rsformsApi } from '@/features/rsform/backend/api';
+import { UserID } from '@/features/users/models/user';
 
+import { ILibraryItem, LibraryItemID } from '../models/library';
 import { libraryApi } from './api';
 
 export const useSetOwner = () => {
diff --git a/rsconcept/frontend/src/backend/library/useTemplates.tsx b/rsconcept/frontend/src/features/library/backend/useTemplates.tsx
similarity index 100%
rename from rsconcept/frontend/src/backend/library/useTemplates.tsx
rename to rsconcept/frontend/src/features/library/backend/useTemplates.tsx
diff --git a/rsconcept/frontend/src/backend/library/useUpdateItem.tsx b/rsconcept/frontend/src/features/library/backend/useUpdateItem.tsx
similarity index 86%
rename from rsconcept/frontend/src/backend/library/useUpdateItem.tsx
rename to rsconcept/frontend/src/features/library/backend/useUpdateItem.tsx
index 188fa490..668a51a2 100644
--- a/rsconcept/frontend/src/backend/library/useUpdateItem.tsx
+++ b/rsconcept/frontend/src/features/library/backend/useUpdateItem.tsx
@@ -1,9 +1,9 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { IOperationSchemaDTO, ossApi } from '@/backend/oss/api';
-import { ILibraryItem, LibraryItemType } from '@/models/library';
+import { IOperationSchemaDTO, ossApi } from '@/features/oss/backend/api';
+import { IRSFormDTO } from '@/features/rsform/backend/api';
 
-import { IRSFormDTO } from '../rsform/api';
+import { ILibraryItem, LibraryItemType } from '../models/library';
 import { IUpdateLibraryItemDTO, libraryApi } from './api';
 
 export const useUpdateItem = () => {
diff --git a/rsconcept/frontend/src/backend/library/useUpdateTimestamp.tsx b/rsconcept/frontend/src/features/library/backend/useUpdateTimestamp.tsx
similarity index 87%
rename from rsconcept/frontend/src/backend/library/useUpdateTimestamp.tsx
rename to rsconcept/frontend/src/features/library/backend/useUpdateTimestamp.tsx
index 1e82548c..cedcd851 100644
--- a/rsconcept/frontend/src/backend/library/useUpdateTimestamp.tsx
+++ b/rsconcept/frontend/src/features/library/backend/useUpdateTimestamp.tsx
@@ -1,7 +1,6 @@
 import { useQueryClient } from '@tanstack/react-query';
 
-import { ILibraryItem, LibraryItemID } from '@/models/library';
-
+import { ILibraryItem, LibraryItemID } from '../models/library';
 import { libraryApi } from './api';
 
 export function useUpdateTimestamp() {
diff --git a/rsconcept/frontend/src/backend/library/useVersionCreate.tsx b/rsconcept/frontend/src/features/library/backend/useVersionCreate.tsx
similarity index 82%
rename from rsconcept/frontend/src/backend/library/useVersionCreate.tsx
rename to rsconcept/frontend/src/features/library/backend/useVersionCreate.tsx
index a7800b6c..743f9bee 100644
--- a/rsconcept/frontend/src/backend/library/useVersionCreate.tsx
+++ b/rsconcept/frontend/src/features/library/backend/useVersionCreate.tsx
@@ -1,11 +1,11 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
 import { DataCallback } from '@/backend/apiTransport';
-import { useUpdateTimestamp } from '@/backend/library/useUpdateTimestamp';
-import { rsformsApi } from '@/backend/rsform/api';
-import { LibraryItemID, VersionID } from '@/models/library';
+import { rsformsApi } from '@/features/rsform/backend/api';
 
+import { LibraryItemID, VersionID } from '../models/library';
 import { IVersionCreateDTO, libraryApi } from './api';
+import { useUpdateTimestamp } from './useUpdateTimestamp';
 
 export const useVersionCreate = () => {
   const client = useQueryClient();
diff --git a/rsconcept/frontend/src/backend/library/useVersionDelete.tsx b/rsconcept/frontend/src/features/library/backend/useVersionDelete.tsx
similarity index 87%
rename from rsconcept/frontend/src/backend/library/useVersionDelete.tsx
rename to rsconcept/frontend/src/features/library/backend/useVersionDelete.tsx
index df6fa608..c191853b 100644
--- a/rsconcept/frontend/src/backend/library/useVersionDelete.tsx
+++ b/rsconcept/frontend/src/features/library/backend/useVersionDelete.tsx
@@ -1,8 +1,8 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { IRSFormDTO, rsformsApi } from '@/backend/rsform/api';
-import { LibraryItemID, VersionID } from '@/models/library';
+import { IRSFormDTO, rsformsApi } from '@/features/rsform/backend/api';
 
+import { LibraryItemID, VersionID } from '../models/library';
 import { libraryApi } from './api';
 
 export const useVersionDelete = () => {
diff --git a/rsconcept/frontend/src/backend/library/useVersionRestore.tsx b/rsconcept/frontend/src/features/library/backend/useVersionRestore.tsx
similarity index 86%
rename from rsconcept/frontend/src/backend/library/useVersionRestore.tsx
rename to rsconcept/frontend/src/features/library/backend/useVersionRestore.tsx
index bceecc54..f54a6097 100644
--- a/rsconcept/frontend/src/backend/library/useVersionRestore.tsx
+++ b/rsconcept/frontend/src/features/library/backend/useVersionRestore.tsx
@@ -1,8 +1,8 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { rsformsApi } from '@/backend/rsform/api';
-import { VersionID } from '@/models/library';
+import { rsformsApi } from '@/features/rsform/backend/api';
 
+import { VersionID } from '../models/library';
 import { libraryApi } from './api';
 
 export const useVersionRestore = () => {
diff --git a/rsconcept/frontend/src/backend/library/useVersionUpdate.tsx b/rsconcept/frontend/src/features/library/backend/useVersionUpdate.tsx
similarity index 93%
rename from rsconcept/frontend/src/backend/library/useVersionUpdate.tsx
rename to rsconcept/frontend/src/features/library/backend/useVersionUpdate.tsx
index 2d112fc4..9c661ab2 100644
--- a/rsconcept/frontend/src/backend/library/useVersionUpdate.tsx
+++ b/rsconcept/frontend/src/features/library/backend/useVersionUpdate.tsx
@@ -1,6 +1,6 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { IRSFormDTO, rsformsApi } from '@/backend/rsform/api';
+import { IRSFormDTO, rsformsApi } from '@/features/rsform/backend/api';
 
 import { IVersionUpdateDTO, libraryApi } from './api';
 
diff --git a/rsconcept/frontend/src/components/info/BadgeLocation.tsx b/rsconcept/frontend/src/features/library/components/BadgeLocation.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/info/BadgeLocation.tsx
rename to rsconcept/frontend/src/features/library/components/BadgeLocation.tsx
diff --git a/rsconcept/frontend/src/components/select/SelectAccessPolicy.tsx b/rsconcept/frontend/src/features/library/components/SelectAccessPolicy.tsx
similarity index 92%
rename from rsconcept/frontend/src/components/select/SelectAccessPolicy.tsx
rename to rsconcept/frontend/src/features/library/components/SelectAccessPolicy.tsx
index a78b4359..43258ee8 100644
--- a/rsconcept/frontend/src/components/select/SelectAccessPolicy.tsx
+++ b/rsconcept/frontend/src/features/library/components/SelectAccessPolicy.tsx
@@ -1,13 +1,14 @@
 'use client';
 
+import { MiniButton } from '@/components/Control';
 import { PolicyIcon } from '@/components/DomainIcons';
+import { Dropdown, DropdownButton, useDropdown } from '@/components/Dropdown';
 import { CProps } from '@/components/props';
-import { MiniButton } from '@/components/ui/Control';
-import { Dropdown, DropdownButton, useDropdown } from '@/components/ui/Dropdown';
-import { AccessPolicy } from '@/models/library';
 import { prefixes } from '@/utils/constants';
 import { describeAccessPolicy, labelAccessPolicy } from '@/utils/labels';
 
+import { AccessPolicy } from '../models/library';
+
 interface SelectAccessPolicyProps extends CProps.Styling {
   value: AccessPolicy;
   onChange: (value: AccessPolicy) => void;
diff --git a/rsconcept/frontend/src/components/select/SelectItemType.tsx b/rsconcept/frontend/src/features/library/components/SelectItemType.tsx
similarity index 92%
rename from rsconcept/frontend/src/components/select/SelectItemType.tsx
rename to rsconcept/frontend/src/features/library/components/SelectItemType.tsx
index a1552b38..3d654d1e 100644
--- a/rsconcept/frontend/src/components/select/SelectItemType.tsx
+++ b/rsconcept/frontend/src/features/library/components/SelectItemType.tsx
@@ -1,13 +1,14 @@
 'use client';
 
+import { SelectorButton } from '@/components/Control';
 import { ItemTypeIcon } from '@/components/DomainIcons';
+import { Dropdown, DropdownButton, useDropdown } from '@/components/Dropdown';
 import { CProps } from '@/components/props';
-import { SelectorButton } from '@/components/ui/Control';
-import { Dropdown, DropdownButton, useDropdown } from '@/components/ui/Dropdown';
-import { LibraryItemType } from '@/models/library';
 import { prefixes } from '@/utils/constants';
 import { describeLibraryItemType, labelLibraryItemType } from '@/utils/labels';
 
+import { LibraryItemType } from '../models/library';
+
 interface SelectItemTypeProps extends CProps.Styling {
   value: LibraryItemType;
   onChange: (value: LibraryItemType) => void;
diff --git a/rsconcept/frontend/src/components/select/SelectLibraryItem.tsx b/rsconcept/frontend/src/features/library/components/SelectLibraryItem.tsx
similarity index 88%
rename from rsconcept/frontend/src/components/select/SelectLibraryItem.tsx
rename to rsconcept/frontend/src/features/library/components/SelectLibraryItem.tsx
index 314c77d0..4df1585e 100644
--- a/rsconcept/frontend/src/components/select/SelectLibraryItem.tsx
+++ b/rsconcept/frontend/src/features/library/components/SelectLibraryItem.tsx
@@ -2,10 +2,11 @@
 
 import clsx from 'clsx';
 
+import { SelectSingle } from '@/components/Input';
 import { CProps } from '@/components/props';
-import { SelectSingle } from '@/components/ui/Input';
-import { ILibraryItem, LibraryItemID } from '@/models/library';
-import { matchLibraryItem } from '@/models/libraryAPI';
+
+import { ILibraryItem, LibraryItemID } from '../models/library';
+import { matchLibraryItem } from '../models/libraryAPI';
 
 interface SelectLibraryItemProps extends CProps.Styling {
   items?: ILibraryItem[];
diff --git a/rsconcept/frontend/src/components/select/SelectLocation.tsx b/rsconcept/frontend/src/features/library/components/SelectLocation.tsx
similarity index 96%
rename from rsconcept/frontend/src/components/select/SelectLocation.tsx
rename to rsconcept/frontend/src/features/library/components/SelectLocation.tsx
index 336ab52b..f78ce4c5 100644
--- a/rsconcept/frontend/src/components/select/SelectLocation.tsx
+++ b/rsconcept/frontend/src/features/library/components/SelectLocation.tsx
@@ -3,13 +3,14 @@
 import clsx from 'clsx';
 import { useEffect, useState } from 'react';
 
-import { useFolders } from '@/backend/library/useFolders';
+import { MiniButton } from '@/components/Control';
 import { IconFolder, IconFolderClosed, IconFolderEmpty, IconFolderOpened } from '@/components/Icons';
 import { CProps } from '@/components/props';
-import { MiniButton } from '@/components/ui/Control';
 import { FolderNode } from '@/models/FolderTree';
 import { labelFolderNode } from '@/utils/labels';
 
+import { useFolders } from '../backend/useFolders';
+
 interface SelectLocationProps extends CProps.Styling {
   value: string;
   onClick: (event: CProps.EventMouse, target: FolderNode) => void;
diff --git a/rsconcept/frontend/src/components/select/SelectLocationContext.tsx b/rsconcept/frontend/src/features/library/components/SelectLocationContext.tsx
similarity index 92%
rename from rsconcept/frontend/src/components/select/SelectLocationContext.tsx
rename to rsconcept/frontend/src/features/library/components/SelectLocationContext.tsx
index fe8de27e..8b3a48bc 100644
--- a/rsconcept/frontend/src/components/select/SelectLocationContext.tsx
+++ b/rsconcept/frontend/src/features/library/components/SelectLocationContext.tsx
@@ -2,10 +2,10 @@
 
 import clsx from 'clsx';
 
+import { MiniButton } from '@/components/Control';
+import { Dropdown, useDropdown } from '@/components/Dropdown';
 import { IconFolderTree } from '@/components/Icons';
 import { CProps } from '@/components/props';
-import { MiniButton } from '@/components/ui/Control';
-import { Dropdown, useDropdown } from '@/components/ui/Dropdown';
 import { prefixes } from '@/utils/constants';
 
 import SelectLocation from './SelectLocation';
diff --git a/rsconcept/frontend/src/components/select/SelectLocationHead.tsx b/rsconcept/frontend/src/features/library/components/SelectLocationHead.tsx
similarity index 93%
rename from rsconcept/frontend/src/components/select/SelectLocationHead.tsx
rename to rsconcept/frontend/src/features/library/components/SelectLocationHead.tsx
index ccfd6cfb..425ec216 100644
--- a/rsconcept/frontend/src/components/select/SelectLocationHead.tsx
+++ b/rsconcept/frontend/src/features/library/components/SelectLocationHead.tsx
@@ -2,14 +2,15 @@
 
 import clsx from 'clsx';
 
+import { SelectorButton } from '@/components/Control';
 import { LocationIcon } from '@/components/DomainIcons';
+import { Dropdown, DropdownButton, useDropdown } from '@/components/Dropdown';
 import { CProps } from '@/components/props';
-import { SelectorButton } from '@/components/ui/Control';
-import { Dropdown, DropdownButton, useDropdown } from '@/components/ui/Dropdown';
-import { LocationHead } from '@/models/library';
 import { prefixes } from '@/utils/constants';
 import { describeLocationHead, labelLocationHead } from '@/utils/labels';
 
+import { LocationHead } from '../models/library';
+
 interface SelectLocationHeadProps extends CProps.Styling {
   value: LocationHead;
   onChange: (newValue: LocationHead) => void;
diff --git a/rsconcept/frontend/src/dialogs/DlgChangeLocation.tsx b/rsconcept/frontend/src/features/library/dialogs/DlgChangeLocation.tsx
similarity index 83%
rename from rsconcept/frontend/src/dialogs/DlgChangeLocation.tsx
rename to rsconcept/frontend/src/features/library/dialogs/DlgChangeLocation.tsx
index 3c4efcd6..1b0c69cb 100644
--- a/rsconcept/frontend/src/dialogs/DlgChangeLocation.tsx
+++ b/rsconcept/frontend/src/features/library/dialogs/DlgChangeLocation.tsx
@@ -3,16 +3,17 @@
 import clsx from 'clsx';
 import { useState } from 'react';
 
-import { useAuthSuspense } from '@/backend/auth/useAuth';
-import SelectLocationContext from '@/components/select/SelectLocationContext';
-import SelectLocationHead from '@/components/select/SelectLocationHead';
-import { Label, TextArea } from '@/components/ui/Input';
-import { ModalForm } from '@/components/ui/Modal';
-import { LocationHead } from '@/models/library';
-import { combineLocation, validateLocation } from '@/models/libraryAPI';
+import { Label, TextArea } from '@/components/Input';
+import { ModalForm } from '@/components/Modal';
+import { useAuthSuspense } from '@/features/auth/backend/useAuth';
 import { useDialogsStore } from '@/stores/dialogs';
 import { limits } from '@/utils/constants';
 
+import SelectLocationContext from '../components/SelectLocationContext';
+import SelectLocationHead from '../components/SelectLocationHead';
+import { LocationHead } from '../models/library';
+import { combineLocation, validateLocation } from '../models/libraryAPI';
+
 export interface DlgChangeLocationProps {
   initial: string;
   onChangeLocation: (newLocation: string) => void;
diff --git a/rsconcept/frontend/src/models/library.ts b/rsconcept/frontend/src/features/library/models/library.ts
similarity index 83%
rename from rsconcept/frontend/src/models/library.ts
rename to rsconcept/frontend/src/features/library/models/library.ts
index 0ff07e31..d579ebb8 100644
--- a/rsconcept/frontend/src/models/library.ts
+++ b/rsconcept/frontend/src/features/library/models/library.ts
@@ -2,7 +2,7 @@
  * Module: Models for LibraryItem.
  */
 
-import { UserID } from './user';
+import { UserID } from '@/features/users/models/user';
 
 /**
  * Represents type of library items.
@@ -102,3 +102,22 @@ export interface ILibraryItemEditor {
   isMutable: boolean;
   isAttachedToOSS: boolean;
 }
+
+/**
+ * Represents Library filter parameters.
+ */
+export interface ILibraryFilter {
+  type?: LibraryItemType;
+  query?: string;
+
+  folderMode?: boolean;
+  subfolders?: boolean;
+  path?: string;
+  head?: LocationHead;
+  location?: string;
+
+  isVisible?: boolean;
+  isOwned?: boolean;
+  isEditor?: boolean;
+  filterUser?: UserID;
+}
diff --git a/rsconcept/frontend/src/models/libraryAPI.test.ts b/rsconcept/frontend/src/features/library/models/libraryAPI.test.ts
similarity index 100%
rename from rsconcept/frontend/src/models/libraryAPI.test.ts
rename to rsconcept/frontend/src/features/library/models/libraryAPI.test.ts
diff --git a/rsconcept/frontend/src/models/libraryAPI.ts b/rsconcept/frontend/src/features/library/models/libraryAPI.ts
similarity index 100%
rename from rsconcept/frontend/src/models/libraryAPI.ts
rename to rsconcept/frontend/src/features/library/models/libraryAPI.ts
diff --git a/rsconcept/frontend/src/pages/CreateItemPage/CreateItemPage.tsx b/rsconcept/frontend/src/features/library/pages/CreateItemPage/CreateItemPage.tsx
similarity index 74%
rename from rsconcept/frontend/src/pages/CreateItemPage/CreateItemPage.tsx
rename to rsconcept/frontend/src/features/library/pages/CreateItemPage/CreateItemPage.tsx
index 44ae148f..3be81da4 100644
--- a/rsconcept/frontend/src/pages/CreateItemPage/CreateItemPage.tsx
+++ b/rsconcept/frontend/src/features/library/pages/CreateItemPage/CreateItemPage.tsx
@@ -1,4 +1,4 @@
-import RequireAuth from '@/components/RequireAuth';
+import RequireAuth from '@/features/auth/components/RequireAuth';
 
 import FormCreateItem from './FormCreateItem';
 
diff --git a/rsconcept/frontend/src/pages/CreateItemPage/FormCreateItem.tsx b/rsconcept/frontend/src/features/library/pages/CreateItemPage/FormCreateItem.tsx
similarity index 88%
rename from rsconcept/frontend/src/pages/CreateItemPage/FormCreateItem.tsx
rename to rsconcept/frontend/src/features/library/pages/CreateItemPage/FormCreateItem.tsx
index 1447f68b..7d51f847 100644
--- a/rsconcept/frontend/src/pages/CreateItemPage/FormCreateItem.tsx
+++ b/rsconcept/frontend/src/features/library/pages/CreateItemPage/FormCreateItem.tsx
@@ -5,26 +5,26 @@ import clsx from 'clsx';
 import { useRef } from 'react';
 import { Controller, useForm, useWatch } from 'react-hook-form';
 
-import { useConceptNavigation } from '@/app/Navigation/NavigationContext';
-import { urls } from '@/app/urls';
-import { useAuthSuspense } from '@/backend/auth/useAuth';
-import { CreateLibraryItemSchema, ICreateLibraryItemDTO } from '@/backend/library/api';
-import { useCreateItem } from '@/backend/library/useCreateItem';
+import { urls, useConceptNavigation } from '@/app';
+import { Overlay } from '@/components/Container';
+import { Button, MiniButton, SubmitButton } from '@/components/Control';
 import { VisibilityIcon } from '@/components/DomainIcons';
 import { IconDownload } from '@/components/Icons';
-import InfoError from '@/components/info/InfoError';
-import SelectAccessPolicy from '@/components/select/SelectAccessPolicy';
-import SelectItemType from '@/components/select/SelectItemType';
-import SelectLocationContext from '@/components/select/SelectLocationContext';
-import SelectLocationHead from '@/components/select/SelectLocationHead';
-import { Overlay } from '@/components/ui/Container';
-import { Button, MiniButton, SubmitButton } from '@/components/ui/Control';
-import { Label, TextArea, TextInput } from '@/components/ui/Input';
-import { AccessPolicy, LibraryItemType, LocationHead } from '@/models/library';
-import { combineLocation } from '@/models/libraryAPI';
-import { useLibrarySearchStore } from '@/stores/librarySearch';
+import { InfoError } from '@/components/InfoError';
+import { Label, TextArea, TextInput } from '@/components/Input';
+import { useAuthSuspense } from '@/features/auth/backend/useAuth';
 import { EXTEOR_TRS_FILE } from '@/utils/constants';
 
+import { CreateLibraryItemSchema, ICreateLibraryItemDTO } from '../../backend/api';
+import { useCreateItem } from '../../backend/useCreateItem';
+import SelectAccessPolicy from '../../components/SelectAccessPolicy';
+import SelectItemType from '../../components/SelectItemType';
+import SelectLocationContext from '../../components/SelectLocationContext';
+import SelectLocationHead from '../../components/SelectLocationHead';
+import { AccessPolicy, LibraryItemType, LocationHead } from '../../models/library';
+import { combineLocation } from '../../models/libraryAPI';
+import { useLibrarySearchStore } from '../../stores/librarySearch';
+
 function FormCreateItem() {
   const router = useConceptNavigation();
   const { user } = useAuthSuspense();
diff --git a/rsconcept/frontend/src/pages/CreateItemPage/index.tsx b/rsconcept/frontend/src/features/library/pages/CreateItemPage/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/pages/CreateItemPage/index.tsx
rename to rsconcept/frontend/src/features/library/pages/CreateItemPage/index.tsx
diff --git a/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx b/rsconcept/frontend/src/features/library/pages/LibraryPage/LibraryPage.tsx
similarity index 85%
rename from rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx
rename to rsconcept/frontend/src/features/library/pages/LibraryPage/LibraryPage.tsx
index 71746f62..7d30564b 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx
+++ b/rsconcept/frontend/src/features/library/pages/LibraryPage/LibraryPage.tsx
@@ -3,18 +3,18 @@
 import fileDownload from 'js-file-download';
 import { toast } from 'react-toastify';
 
-import { useApplyLibraryFilter } from '@/backend/library/useApplyLibraryFilter';
-import { useLibrarySuspense } from '@/backend/library/useLibrary';
-import { useRenameLocation } from '@/backend/library/useRenameLocation';
+import { Overlay } from '@/components/Container';
+import { MiniButton } from '@/components/Control';
 import { IconCSV } from '@/components/Icons';
-import { Overlay } from '@/components/ui/Container';
-import { MiniButton } from '@/components/ui/Control';
 import { useAppLayoutStore } from '@/stores/appLayout';
 import { useDialogsStore } from '@/stores/dialogs';
-import { useCreateLibraryFilter, useLibrarySearchStore } from '@/stores/librarySearch';
 import { information } from '@/utils/labels';
 import { convertToCSV } from '@/utils/utils';
 
+import { useApplyLibraryFilter } from '../../backend/useApplyLibraryFilter';
+import { useLibrarySuspense } from '../../backend/useLibrary';
+import { useRenameLocation } from '../../backend/useRenameLocation';
+import { useCreateLibraryFilter, useLibrarySearchStore } from '../../stores/librarySearch';
 import TableLibraryItems from './TableLibraryItems';
 import ToolbarSearch from './ToolbarSearch';
 import ViewSideLocation from './ViewSideLocation';
diff --git a/rsconcept/frontend/src/pages/LibraryPage/TableLibraryItems.tsx b/rsconcept/frontend/src/features/library/pages/LibraryPage/TableLibraryItems.tsx
similarity index 91%
rename from rsconcept/frontend/src/pages/LibraryPage/TableLibraryItems.tsx
rename to rsconcept/frontend/src/features/library/pages/LibraryPage/TableLibraryItems.tsx
index e26967b1..a7cce635 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/TableLibraryItems.tsx
+++ b/rsconcept/frontend/src/features/library/pages/LibraryPage/TableLibraryItems.tsx
@@ -4,22 +4,22 @@ import clsx from 'clsx';
 import { useLayoutEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
 
-import { useConceptNavigation } from '@/app/Navigation/NavigationContext';
-import { urls } from '@/app/urls';
-import { useLabelUser } from '@/backend/users/useLabelUser';
+import { urls, useConceptNavigation } from '@/app';
+import { FlexColumn } from '@/components/Container';
+import { MiniButton, TextURL } from '@/components/Control';
+import DataTable, { createColumnHelper, IConditionalStyle, VisibilityState } from '@/components/DataTable';
 import { IconFolderTree } from '@/components/Icons';
-import BadgeLocation from '@/components/info/BadgeLocation';
 import { CProps } from '@/components/props';
-import { FlexColumn } from '@/components/ui/Container';
-import { MiniButton, TextURL } from '@/components/ui/Control';
-import DataTable, { createColumnHelper, IConditionalStyle, VisibilityState } from '@/components/ui/DataTable';
+import { useLabelUser } from '@/features/users/backend/useLabelUser';
 import useWindowSize from '@/hooks/useWindowSize';
-import { ILibraryItem, LibraryItemType } from '@/models/library';
 import { useFitHeight } from '@/stores/appLayout';
-import { useLibrarySearchStore } from '@/stores/librarySearch';
 import { usePreferencesStore } from '@/stores/preferences';
 import { APP_COLORS } from '@/styling/color';
 
+import BadgeLocation from '../../components/BadgeLocation';
+import { ILibraryItem, LibraryItemType } from '../../models/library';
+import { useLibrarySearchStore } from '../../stores/librarySearch';
+
 interface TableLibraryItemsProps {
   items: ILibraryItem[];
 }
diff --git a/rsconcept/frontend/src/pages/LibraryPage/ToolbarSearch.tsx b/rsconcept/frontend/src/features/library/pages/LibraryPage/ToolbarSearch.tsx
similarity index 95%
rename from rsconcept/frontend/src/pages/LibraryPage/ToolbarSearch.tsx
rename to rsconcept/frontend/src/features/library/pages/LibraryPage/ToolbarSearch.tsx
index 897dba13..b38d262d 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/ToolbarSearch.tsx
+++ b/rsconcept/frontend/src/features/library/pages/LibraryPage/ToolbarSearch.tsx
@@ -2,7 +2,9 @@
 
 import clsx from 'clsx';
 
+import { MiniButton, SelectorButton } from '@/components/Control';
 import { LocationIcon, VisibilityIcon } from '@/components/DomainIcons';
+import { Dropdown, DropdownButton, useDropdown } from '@/components/Dropdown';
 import {
   IconEditor,
   IconFilterReset,
@@ -13,16 +15,15 @@ import {
   IconUserSearch
 } from '@/components/Icons';
 import { CProps } from '@/components/props';
-import SelectUser from '@/components/select/SelectUser';
-import { MiniButton, SelectorButton } from '@/components/ui/Control';
-import { Dropdown, DropdownButton, useDropdown } from '@/components/ui/Dropdown';
-import { SearchBar } from '@/components/ui/SearchBar';
-import { LocationHead } from '@/models/library';
-import { useHasCustomFilter, useLibrarySearchStore } from '@/stores/librarySearch';
+import { SearchBar } from '@/components/shared/SearchBar';
+import SelectUser from '@/features/users/components/SelectUser';
 import { prefixes } from '@/utils/constants';
 import { describeLocationHead, labelLocationHead } from '@/utils/labels';
 import { tripleToggleColor } from '@/utils/utils';
 
+import { LocationHead } from '../../models/library';
+import { useHasCustomFilter, useLibrarySearchStore } from '../../stores/librarySearch';
+
 interface ToolbarSearchProps {
   total: number;
   filtered: number;
diff --git a/rsconcept/frontend/src/pages/LibraryPage/ViewSideLocation.tsx b/rsconcept/frontend/src/features/library/pages/LibraryPage/ViewSideLocation.tsx
similarity index 90%
rename from rsconcept/frontend/src/pages/LibraryPage/ViewSideLocation.tsx
rename to rsconcept/frontend/src/features/library/pages/LibraryPage/ViewSideLocation.tsx
index 7da32163..fb86edba 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/ViewSideLocation.tsx
+++ b/rsconcept/frontend/src/features/library/pages/LibraryPage/ViewSideLocation.tsx
@@ -1,22 +1,23 @@
 import clsx from 'clsx';
 import { toast } from 'react-toastify';
 
-import { useAuthSuspense } from '@/backend/auth/useAuth';
-import { useLibrary } from '@/backend/library/useLibrary';
+import { MiniButton } from '@/components/Control';
 import { SubfoldersIcon } from '@/components/DomainIcons';
 import { IconFolderEdit, IconFolderTree } from '@/components/Icons';
-import BadgeHelp from '@/components/info/BadgeHelp';
 import { CProps } from '@/components/props';
-import SelectLocation from '@/components/select/SelectLocation';
-import { MiniButton } from '@/components/ui/Control';
+import BadgeHelp from '@/components/shared/BadgeHelp';
+import { useAuthSuspense } from '@/features/auth/backend/useAuth';
+import { HelpTopic } from '@/features/help/models/helpTopic';
 import useWindowSize from '@/hooks/useWindowSize';
 import { FolderNode } from '@/models/FolderTree';
-import { HelpTopic } from '@/models/miscellaneous';
 import { useFitHeight } from '@/stores/appLayout';
-import { useLibrarySearchStore } from '@/stores/librarySearch';
 import { PARAMETER, prefixes } from '@/utils/constants';
 import { information } from '@/utils/labels';
 
+import { useLibrary } from '../../backend/useLibrary';
+import SelectLocation from '../../components/SelectLocation';
+import { useLibrarySearchStore } from '../../stores/librarySearch';
+
 interface ViewSideLocationProps {
   isVisible: boolean;
   onRenameLocation: () => void;
diff --git a/rsconcept/frontend/src/pages/LibraryPage/index.tsx b/rsconcept/frontend/src/features/library/pages/LibraryPage/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/pages/LibraryPage/index.tsx
rename to rsconcept/frontend/src/features/library/pages/LibraryPage/index.tsx
diff --git a/rsconcept/frontend/src/stores/librarySearch.ts b/rsconcept/frontend/src/features/library/stores/librarySearch.ts
similarity index 96%
rename from rsconcept/frontend/src/stores/librarySearch.ts
rename to rsconcept/frontend/src/features/library/stores/librarySearch.ts
index 7086578e..753c188b 100644
--- a/rsconcept/frontend/src/stores/librarySearch.ts
+++ b/rsconcept/frontend/src/features/library/stores/librarySearch.ts
@@ -1,11 +1,11 @@
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';
 
-import { LocationHead } from '@/models/library';
-import { ILibraryFilter } from '@/models/miscellaneous';
-import { UserID } from '@/models/user';
+import { UserID } from '@/features/users/models/user';
 import { toggleTristateFlag } from '@/utils/utils';
 
+import { ILibraryFilter, LocationHead } from '../models/library';
+
 interface LibrarySearchStore {
   folderMode: boolean;
   toggleFolderMode: () => void;
diff --git a/rsconcept/frontend/src/backend/oss/OssLoader.ts b/rsconcept/frontend/src/features/oss/backend/OssLoader.ts
similarity index 93%
rename from rsconcept/frontend/src/backend/oss/OssLoader.ts
rename to rsconcept/frontend/src/features/oss/backend/OssLoader.ts
index 36a673fc..a55990c4 100644
--- a/rsconcept/frontend/src/backend/oss/OssLoader.ts
+++ b/rsconcept/frontend/src/features/oss/backend/OssLoader.ts
@@ -2,9 +2,15 @@
  * Module: OSS data loading and processing.
  */
 
+import { ILibraryItem, LibraryItemID } from '@/features/library/models/library';
+import {
+  IOperation,
+  IOperationSchema,
+  IOperationSchemaStats,
+  OperationID,
+  OperationType
+} from '@/features/oss/models/oss';
 import { Graph } from '@/models/Graph';
-import { ILibraryItem, LibraryItemID } from '@/models/library';
-import { IOperation, IOperationSchema, IOperationSchemaStats, OperationID, OperationType } from '@/models/oss';
 
 import { IOperationSchemaDTO } from './api';
 
diff --git a/rsconcept/frontend/src/backend/oss/api.ts b/rsconcept/frontend/src/features/oss/backend/api.ts
similarity index 98%
rename from rsconcept/frontend/src/backend/oss/api.ts
rename to rsconcept/frontend/src/features/oss/backend/api.ts
index 04516828..70e42c6c 100644
--- a/rsconcept/frontend/src/backend/oss/api.ts
+++ b/rsconcept/frontend/src/features/oss/backend/api.ts
@@ -2,7 +2,7 @@ import { queryOptions } from '@tanstack/react-query';
 
 import { axiosDelete, axiosGet, axiosPatch, axiosPost } from '@/backend/apiTransport';
 import { DELAYS } from '@/backend/configuration';
-import { ILibraryItem, ILibraryItemData, LibraryItemID } from '@/models/library';
+import { ILibraryItem, ILibraryItemData, LibraryItemID } from '@/features/library/models/library';
 import {
   IArgument,
   ICstSubstitute,
@@ -11,8 +11,8 @@ import {
   IOperationPosition,
   OperationID,
   OperationType
-} from '@/models/oss';
-import { ConstituentaID, IConstituentaReference, ITargetCst } from '@/models/rsform';
+} from '@/features/oss/models/oss';
+import { ConstituentaID, IConstituentaReference, ITargetCst } from '@/features/rsform/models/rsform';
 import { information } from '@/utils/labels';
 
 /**
diff --git a/rsconcept/frontend/src/backend/oss/useFindPredecessor.tsx b/rsconcept/frontend/src/features/oss/backend/useFindPredecessor.tsx
similarity index 84%
rename from rsconcept/frontend/src/backend/oss/useFindPredecessor.tsx
rename to rsconcept/frontend/src/features/oss/backend/useFindPredecessor.tsx
index 7e5527f5..7691a047 100644
--- a/rsconcept/frontend/src/backend/oss/useFindPredecessor.tsx
+++ b/rsconcept/frontend/src/features/oss/backend/useFindPredecessor.tsx
@@ -1,7 +1,7 @@
 import { useMutation } from '@tanstack/react-query';
 
 import { DataCallback } from '@/backend/apiTransport';
-import { IConstituentaReference, ITargetCst } from '@/models/rsform';
+import { IConstituentaReference, ITargetCst } from '@/features/rsform/models/rsform';
 
 import { ossApi } from './api';
 
diff --git a/rsconcept/frontend/src/backend/oss/useInputCreate.tsx b/rsconcept/frontend/src/features/oss/backend/useInputCreate.tsx
similarity index 82%
rename from rsconcept/frontend/src/backend/oss/useInputCreate.tsx
rename to rsconcept/frontend/src/features/oss/backend/useInputCreate.tsx
index 5b26b9d0..f7603e7b 100644
--- a/rsconcept/frontend/src/backend/oss/useInputCreate.tsx
+++ b/rsconcept/frontend/src/features/oss/backend/useInputCreate.tsx
@@ -1,9 +1,9 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
 import { DataCallback } from '@/backend/apiTransport';
-import { libraryApi } from '@/backend/library/api';
-import { rsformsApi } from '@/backend/rsform/api';
-import { ILibraryItem, LibraryItemID } from '@/models/library';
+import { libraryApi } from '@/features/library/backend/api';
+import { ILibraryItem, LibraryItemID } from '@/features/library/models/library';
+import { rsformsApi } from '@/features/rsform/backend/api';
 
 import { ITargetOperation, ossApi } from './api';
 
diff --git a/rsconcept/frontend/src/backend/oss/useInputUpdate.tsx b/rsconcept/frontend/src/features/oss/backend/useInputUpdate.tsx
similarity index 79%
rename from rsconcept/frontend/src/backend/oss/useInputUpdate.tsx
rename to rsconcept/frontend/src/features/oss/backend/useInputUpdate.tsx
index 368def8e..68fbe4ec 100644
--- a/rsconcept/frontend/src/backend/oss/useInputUpdate.tsx
+++ b/rsconcept/frontend/src/features/oss/backend/useInputUpdate.tsx
@@ -1,8 +1,8 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { libraryApi } from '@/backend/library/api';
-import { rsformsApi } from '@/backend/rsform/api';
-import { LibraryItemID } from '@/models/library';
+import { libraryApi } from '@/features/library/backend/api';
+import { LibraryItemID } from '@/features/library/models/library';
+import { rsformsApi } from '@/features/rsform/backend/api';
 
 import { IInputUpdateDTO, ossApi } from './api';
 
diff --git a/rsconcept/frontend/src/backend/oss/useMutatingOss.tsx b/rsconcept/frontend/src/features/oss/backend/useMutatingOss.tsx
similarity index 83%
rename from rsconcept/frontend/src/backend/oss/useMutatingOss.tsx
rename to rsconcept/frontend/src/features/oss/backend/useMutatingOss.tsx
index da1406f0..fac27d60 100644
--- a/rsconcept/frontend/src/backend/oss/useMutatingOss.tsx
+++ b/rsconcept/frontend/src/features/oss/backend/useMutatingOss.tsx
@@ -1,6 +1,6 @@
 import { useIsMutating } from '@tanstack/react-query';
 
-import { libraryApi } from '@/backend/library/api';
+import { libraryApi } from '@/features/library/backend/api';
 
 import { ossApi } from './api';
 
diff --git a/rsconcept/frontend/src/backend/oss/useOSS.tsx b/rsconcept/frontend/src/features/oss/backend/useOSS.tsx
similarity index 78%
rename from rsconcept/frontend/src/backend/oss/useOSS.tsx
rename to rsconcept/frontend/src/features/oss/backend/useOSS.tsx
index 7805b707..2932d83d 100644
--- a/rsconcept/frontend/src/backend/oss/useOSS.tsx
+++ b/rsconcept/frontend/src/features/oss/backend/useOSS.tsx
@@ -1,10 +1,10 @@
 import { useQuery, useSuspenseQuery } from '@tanstack/react-query';
 
-import { useLibrary, useLibrarySuspense } from '@/backend/library/useLibrary';
-import { OssLoader } from '@/backend/oss/OssLoader';
-import { LibraryItemID } from '@/models/library';
+import { useLibrary, useLibrarySuspense } from '@/features/library/backend/useLibrary';
+import { LibraryItemID } from '@/features/library/models/library';
+import { OssLoader } from '@/features/oss/backend/OssLoader';
 
-import { queryClient } from '../queryClient';
+import { queryClient } from '../../../backend/queryClient';
 import { ossApi } from './api';
 
 export function useOss({ itemID }: { itemID?: LibraryItemID }) {
diff --git a/rsconcept/frontend/src/backend/oss/useOperationCreate.tsx b/rsconcept/frontend/src/features/oss/backend/useOperationCreate.tsx
similarity index 85%
rename from rsconcept/frontend/src/backend/oss/useOperationCreate.tsx
rename to rsconcept/frontend/src/features/oss/backend/useOperationCreate.tsx
index 97ca7167..514f08b9 100644
--- a/rsconcept/frontend/src/backend/oss/useOperationCreate.tsx
+++ b/rsconcept/frontend/src/features/oss/backend/useOperationCreate.tsx
@@ -1,8 +1,8 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
 import { DataCallback } from '@/backend/apiTransport';
-import { useUpdateTimestamp } from '@/backend/library/useUpdateTimestamp';
-import { LibraryItemID } from '@/models/library';
+import { useUpdateTimestamp } from '@/features/library/backend/useUpdateTimestamp';
+import { LibraryItemID } from '@/features/library/models/library';
 
 import { IOperationCreateDTO, IOperationDTO, ossApi } from './api';
 
diff --git a/rsconcept/frontend/src/backend/oss/useOperationDelete.tsx b/rsconcept/frontend/src/features/oss/backend/useOperationDelete.tsx
similarity index 80%
rename from rsconcept/frontend/src/backend/oss/useOperationDelete.tsx
rename to rsconcept/frontend/src/features/oss/backend/useOperationDelete.tsx
index 51884ae8..307c6fda 100644
--- a/rsconcept/frontend/src/backend/oss/useOperationDelete.tsx
+++ b/rsconcept/frontend/src/features/oss/backend/useOperationDelete.tsx
@@ -1,8 +1,8 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { libraryApi } from '@/backend/library/api';
-import { rsformsApi } from '@/backend/rsform/api';
-import { LibraryItemID } from '@/models/library';
+import { libraryApi } from '@/features/library/backend/api';
+import { LibraryItemID } from '@/features/library/models/library';
+import { rsformsApi } from '@/features/rsform/backend/api';
 
 import { IOperationDeleteDTO, ossApi } from './api';
 
diff --git a/rsconcept/frontend/src/backend/oss/useOperationExecute.tsx b/rsconcept/frontend/src/features/oss/backend/useOperationExecute.tsx
similarity index 80%
rename from rsconcept/frontend/src/backend/oss/useOperationExecute.tsx
rename to rsconcept/frontend/src/features/oss/backend/useOperationExecute.tsx
index 23477718..59ea65a9 100644
--- a/rsconcept/frontend/src/backend/oss/useOperationExecute.tsx
+++ b/rsconcept/frontend/src/features/oss/backend/useOperationExecute.tsx
@@ -1,8 +1,8 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { libraryApi } from '@/backend/library/api';
-import { rsformsApi } from '@/backend/rsform/api';
-import { LibraryItemID } from '@/models/library';
+import { libraryApi } from '@/features/library/backend/api';
+import { LibraryItemID } from '@/features/library/models/library';
+import { rsformsApi } from '@/features/rsform/backend/api';
 
 import { ITargetOperation, ossApi } from './api';
 
diff --git a/rsconcept/frontend/src/backend/oss/useOperationUpdate.tsx b/rsconcept/frontend/src/features/oss/backend/useOperationUpdate.tsx
similarity index 85%
rename from rsconcept/frontend/src/backend/oss/useOperationUpdate.tsx
rename to rsconcept/frontend/src/features/oss/backend/useOperationUpdate.tsx
index 09b1e484..78bac011 100644
--- a/rsconcept/frontend/src/backend/oss/useOperationUpdate.tsx
+++ b/rsconcept/frontend/src/features/oss/backend/useOperationUpdate.tsx
@@ -1,8 +1,8 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { libraryApi } from '@/backend/library/api';
-import { rsformsApi } from '@/backend/rsform/api';
-import { ILibraryItem, LibraryItemID } from '@/models/library';
+import { libraryApi } from '@/features/library/backend/api';
+import { ILibraryItem, LibraryItemID } from '@/features/library/models/library';
+import { rsformsApi } from '@/features/rsform/backend/api';
 
 import { IOperationUpdateDTO, ossApi } from './api';
 
diff --git a/rsconcept/frontend/src/backend/oss/useRelocateConstituents.tsx b/rsconcept/frontend/src/features/oss/backend/useRelocateConstituents.tsx
similarity index 80%
rename from rsconcept/frontend/src/backend/oss/useRelocateConstituents.tsx
rename to rsconcept/frontend/src/features/oss/backend/useRelocateConstituents.tsx
index 5cdb5f26..cfc8e6b4 100644
--- a/rsconcept/frontend/src/backend/oss/useRelocateConstituents.tsx
+++ b/rsconcept/frontend/src/features/oss/backend/useRelocateConstituents.tsx
@@ -1,8 +1,8 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { libraryApi } from '@/backend/library/api';
-import { rsformsApi } from '@/backend/rsform/api';
-import { LibraryItemID } from '@/models/library';
+import { libraryApi } from '@/features/library/backend/api';
+import { LibraryItemID } from '@/features/library/models/library';
+import { rsformsApi } from '@/features/rsform/backend/api';
 
 import { ICstRelocateDTO, ossApi } from './api';
 
diff --git a/rsconcept/frontend/src/backend/oss/useUpdatePositions.tsx b/rsconcept/frontend/src/features/oss/backend/useUpdatePositions.tsx
similarity index 74%
rename from rsconcept/frontend/src/backend/oss/useUpdatePositions.tsx
rename to rsconcept/frontend/src/features/oss/backend/useUpdatePositions.tsx
index 0ba54cda..125c96b5 100644
--- a/rsconcept/frontend/src/backend/oss/useUpdatePositions.tsx
+++ b/rsconcept/frontend/src/features/oss/backend/useUpdatePositions.tsx
@@ -1,8 +1,8 @@
 import { useMutation } from '@tanstack/react-query';
 
-import { useUpdateTimestamp } from '@/backend/library/useUpdateTimestamp';
-import { LibraryItemID } from '@/models/library';
-import { IOperationPosition } from '@/models/oss';
+import { useUpdateTimestamp } from '@/features/library/backend/useUpdateTimestamp';
+import { LibraryItemID } from '@/features/library/models/library';
+import { IOperationPosition } from '@/features/oss/models/oss';
 
 import { ossApi } from './api';
 
diff --git a/rsconcept/frontend/src/components/select/PickMultiOperation.tsx b/rsconcept/frontend/src/features/oss/components/PickMultiOperation.tsx
similarity index 92%
rename from rsconcept/frontend/src/components/select/PickMultiOperation.tsx
rename to rsconcept/frontend/src/features/oss/components/PickMultiOperation.tsx
index ed0e9b1c..7ee32c75 100644
--- a/rsconcept/frontend/src/components/select/PickMultiOperation.tsx
+++ b/rsconcept/frontend/src/features/oss/components/PickMultiOperation.tsx
@@ -3,13 +3,14 @@
 import clsx from 'clsx';
 import { useState } from 'react';
 
+import { MiniButton } from '@/components/Control';
+import DataTable, { createColumnHelper } from '@/components/DataTable';
 import { IconMoveDown, IconMoveUp, IconRemove } from '@/components/Icons';
 import { CProps } from '@/components/props';
-import SelectOperation from '@/components/select/SelectOperation';
-import { MiniButton } from '@/components/ui/Control';
-import DataTable, { createColumnHelper } from '@/components/ui/DataTable';
-import { NoData } from '@/components/ui/View';
-import { IOperation, OperationID } from '@/models/oss';
+import { NoData } from '@/components/View';
+
+import { IOperation, OperationID } from '../models/oss';
+import SelectOperation from './SelectOperation';
 
 interface PickMultiOperationProps extends CProps.Styling {
   value: OperationID[];
diff --git a/rsconcept/frontend/src/components/select/SelectOperation.tsx b/rsconcept/frontend/src/features/oss/components/SelectOperation.tsx
similarity index 89%
rename from rsconcept/frontend/src/components/select/SelectOperation.tsx
rename to rsconcept/frontend/src/features/oss/components/SelectOperation.tsx
index 04d93fe9..dba0c735 100644
--- a/rsconcept/frontend/src/components/select/SelectOperation.tsx
+++ b/rsconcept/frontend/src/features/oss/components/SelectOperation.tsx
@@ -2,10 +2,11 @@
 
 import clsx from 'clsx';
 
+import { SelectSingle } from '@/components/Input';
 import { CProps } from '@/components/props';
-import { SelectSingle } from '@/components/ui/Input';
-import { IOperation, OperationID } from '@/models/oss';
-import { matchOperation } from '@/models/ossAPI';
+
+import { IOperation, OperationID } from '../models/oss';
+import { matchOperation } from '../models/ossAPI';
 
 interface SelectOperationProps extends CProps.Styling {
   items?: IOperation[];
diff --git a/rsconcept/frontend/src/components/info/TooltipOperation.tsx b/rsconcept/frontend/src/features/oss/components/TooltipOperation.tsx
similarity index 91%
rename from rsconcept/frontend/src/components/info/TooltipOperation.tsx
rename to rsconcept/frontend/src/features/oss/components/TooltipOperation.tsx
index 72910da0..64671040 100644
--- a/rsconcept/frontend/src/components/info/TooltipOperation.tsx
+++ b/rsconcept/frontend/src/features/oss/components/TooltipOperation.tsx
@@ -2,13 +2,14 @@
 
 import { createColumnHelper } from '@tanstack/react-table';
 
+import { Tooltip } from '@/components/Container';
+import DataTable from '@/components/DataTable';
 import { IconPageRight } from '@/components/Icons';
-import { Tooltip } from '@/components/ui/Container';
-import DataTable from '@/components/ui/DataTable';
-import { OssNodeInternal } from '@/models/miscellaneous';
-import { ICstSubstituteEx, OperationType } from '@/models/oss';
 import { labelOperationType } from '@/utils/labels';
 
+import { ICstSubstituteEx, OperationType } from '../models/oss';
+import { OssNodeInternal } from '../models/ossLayout';
+
 interface TooltipOperationProps {
   node: OssNodeInternal;
   anchor: string;
diff --git a/rsconcept/frontend/src/dialogs/DlgChangeInputSchema.tsx b/rsconcept/frontend/src/features/oss/dialogs/DlgChangeInputSchema.tsx
similarity index 83%
rename from rsconcept/frontend/src/dialogs/DlgChangeInputSchema.tsx
rename to rsconcept/frontend/src/features/oss/dialogs/DlgChangeInputSchema.tsx
index cb173189..7b71aa98 100644
--- a/rsconcept/frontend/src/dialogs/DlgChangeInputSchema.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/DlgChangeInputSchema.tsx
@@ -3,17 +3,18 @@
 import clsx from 'clsx';
 import { useState } from 'react';
 
-import { useLibrary } from '@/backend/library/useLibrary';
+import { MiniButton } from '@/components/Control';
 import { IconReset } from '@/components/Icons';
-import PickSchema from '@/components/select/PickSchema';
-import { MiniButton } from '@/components/ui/Control';
-import { Label } from '@/components/ui/Input';
-import { ModalForm } from '@/components/ui/Modal';
-import { ILibraryItem, LibraryItemID, LibraryItemType } from '@/models/library';
-import { IOperation, IOperationSchema, OperationID } from '@/models/oss';
-import { sortItemsForOSS } from '@/models/ossAPI';
+import { Label } from '@/components/Input';
+import { ModalForm } from '@/components/Modal';
+import { useLibrary } from '@/features/library/backend/useLibrary';
+import { ILibraryItem, LibraryItemID, LibraryItemType } from '@/features/library/models/library';
+import PickSchema from '@/features/rsform/components/PickSchema';
 import { useDialogsStore } from '@/stores/dialogs';
 
+import { IOperation, IOperationSchema, OperationID } from '../models/oss';
+import { sortItemsForOSS } from '../models/ossAPI';
+
 export interface DlgChangeInputSchemaProps {
   oss: IOperationSchema;
   target: IOperation;
diff --git a/rsconcept/frontend/src/dialogs/DlgCreateOperation/DlgCreateOperation.tsx b/rsconcept/frontend/src/features/oss/dialogs/DlgCreateOperation/DlgCreateOperation.tsx
similarity index 92%
rename from rsconcept/frontend/src/dialogs/DlgCreateOperation/DlgCreateOperation.tsx
rename to rsconcept/frontend/src/features/oss/dialogs/DlgCreateOperation/DlgCreateOperation.tsx
index e45b4449..7cf6ef97 100644
--- a/rsconcept/frontend/src/dialogs/DlgCreateOperation/DlgCreateOperation.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/DlgCreateOperation/DlgCreateOperation.tsx
@@ -3,16 +3,16 @@
 import clsx from 'clsx';
 import { useEffect, useState } from 'react';
 
-import { useLibrary } from '@/backend/library/useLibrary';
-import { IOperationCreateDTO } from '@/backend/oss/api';
-import { ModalForm } from '@/components/ui/Modal';
-import { TabLabel, TabList, TabPanel, Tabs } from '@/components/ui/Tabs';
-import { LibraryItemID } from '@/models/library';
-import { HelpTopic } from '@/models/miscellaneous';
-import { IOperationSchema, OperationID, OperationType } from '@/models/oss';
+import { ModalForm } from '@/components/Modal';
+import { TabLabel, TabList, TabPanel, Tabs } from '@/components/Tabs';
+import { HelpTopic } from '@/features/help/models/helpTopic';
+import { useLibrary } from '@/features/library/backend/useLibrary';
+import { LibraryItemID } from '@/features/library/models/library';
 import { useDialogsStore } from '@/stores/dialogs';
 import { describeOperationType, labelOperationType } from '@/utils/labels';
 
+import { IOperationCreateDTO } from '../../backend/api';
+import { IOperationSchema, OperationID, OperationType } from '../../models/oss';
 import TabInputOperation from './TabInputOperation';
 import TabSynthesisOperation from './TabSynthesisOperation';
 
diff --git a/rsconcept/frontend/src/dialogs/DlgCreateOperation/TabInputOperation.tsx b/rsconcept/frontend/src/features/oss/dialogs/DlgCreateOperation/TabInputOperation.tsx
similarity index 89%
rename from rsconcept/frontend/src/dialogs/DlgCreateOperation/TabInputOperation.tsx
rename to rsconcept/frontend/src/features/oss/dialogs/DlgCreateOperation/TabInputOperation.tsx
index 8cf557cf..ea0c5c83 100644
--- a/rsconcept/frontend/src/dialogs/DlgCreateOperation/TabInputOperation.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/DlgCreateOperation/TabInputOperation.tsx
@@ -2,14 +2,14 @@
 
 import { useEffect } from 'react';
 
-import { useLibrary } from '@/backend/library/useLibrary';
+import { MiniButton } from '@/components/Control';
 import { IconReset } from '@/components/Icons';
-import PickSchema from '@/components/select/PickSchema';
-import { MiniButton } from '@/components/ui/Control';
-import { Checkbox, Label, TextArea, TextInput } from '@/components/ui/Input';
-import { ILibraryItem, LibraryItemID, LibraryItemType } from '@/models/library';
-import { IOperationSchema } from '@/models/oss';
-import { sortItemsForOSS } from '@/models/ossAPI';
+import { Checkbox, Label, TextArea, TextInput } from '@/components/Input';
+import { useLibrary } from '@/features/library/backend/useLibrary';
+import { ILibraryItem, LibraryItemID, LibraryItemType } from '@/features/library/models/library';
+import { IOperationSchema } from '@/features/oss/models/oss';
+import { sortItemsForOSS } from '@/features/oss/models/ossAPI';
+import PickSchema from '@/features/rsform/components/PickSchema';
 
 interface TabInputOperationProps {
   oss: IOperationSchema;
diff --git a/rsconcept/frontend/src/dialogs/DlgCreateOperation/TabSynthesisOperation.tsx b/rsconcept/frontend/src/features/oss/dialogs/DlgCreateOperation/TabSynthesisOperation.tsx
similarity index 85%
rename from rsconcept/frontend/src/dialogs/DlgCreateOperation/TabSynthesisOperation.tsx
rename to rsconcept/frontend/src/features/oss/dialogs/DlgCreateOperation/TabSynthesisOperation.tsx
index 4d3ce675..29ff1199 100644
--- a/rsconcept/frontend/src/dialogs/DlgCreateOperation/TabSynthesisOperation.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/DlgCreateOperation/TabSynthesisOperation.tsx
@@ -1,7 +1,8 @@
-import PickMultiOperation from '@/components/select/PickMultiOperation';
-import { FlexColumn } from '@/components/ui/Container';
-import { Label, TextArea, TextInput } from '@/components/ui/Input';
-import { IOperationSchema, OperationID } from '@/models/oss';
+import { FlexColumn } from '@/components/Container';
+import { Label, TextArea, TextInput } from '@/components/Input';
+
+import PickMultiOperation from '../../components/PickMultiOperation';
+import { IOperationSchema, OperationID } from '../../models/oss';
 
 interface TabSynthesisOperationProps {
   oss: IOperationSchema;
diff --git a/rsconcept/frontend/src/dialogs/DlgCreateOperation/index.tsx b/rsconcept/frontend/src/features/oss/dialogs/DlgCreateOperation/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/dialogs/DlgCreateOperation/index.tsx
rename to rsconcept/frontend/src/features/oss/dialogs/DlgCreateOperation/index.tsx
diff --git a/rsconcept/frontend/src/dialogs/DlgDeleteOperation.tsx b/rsconcept/frontend/src/features/oss/dialogs/DlgDeleteOperation.tsx
similarity index 89%
rename from rsconcept/frontend/src/dialogs/DlgDeleteOperation.tsx
rename to rsconcept/frontend/src/features/oss/dialogs/DlgDeleteOperation.tsx
index 80c3596b..57e233be 100644
--- a/rsconcept/frontend/src/dialogs/DlgDeleteOperation.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/DlgDeleteOperation.tsx
@@ -3,10 +3,10 @@
 import clsx from 'clsx';
 import { useState } from 'react';
 
-import { Checkbox, TextInput } from '@/components/ui/Input';
-import { ModalForm } from '@/components/ui/Modal';
-import { HelpTopic } from '@/models/miscellaneous';
-import { IOperation, OperationID } from '@/models/oss';
+import { Checkbox, TextInput } from '@/components/Input';
+import { ModalForm } from '@/components/Modal';
+import { HelpTopic } from '@/features/help/models/helpTopic';
+import { IOperation, OperationID } from '@/features/oss/models/oss';
 import { useDialogsStore } from '@/stores/dialogs';
 
 export interface DlgDeleteOperationProps {
diff --git a/rsconcept/frontend/src/dialogs/DlgEditOperation/DlgEditOperation.tsx b/rsconcept/frontend/src/features/oss/dialogs/DlgEditOperation/DlgEditOperation.tsx
similarity index 92%
rename from rsconcept/frontend/src/dialogs/DlgEditOperation/DlgEditOperation.tsx
rename to rsconcept/frontend/src/features/oss/dialogs/DlgEditOperation/DlgEditOperation.tsx
index 39e2de78..9a5e0dfd 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditOperation/DlgEditOperation.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/DlgEditOperation/DlgEditOperation.tsx
@@ -3,17 +3,17 @@
 import clsx from 'clsx';
 import { useCallback, useEffect, useState } from 'react';
 
-import { IOperationUpdateDTO } from '@/backend/oss/api';
-import { useRSForms } from '@/backend/rsform/useRSForms';
-import { ModalForm } from '@/components/ui/Modal';
-import { TabLabel, TabList, TabPanel, Tabs } from '@/components/ui/Tabs';
-import { LibraryItemID } from '@/models/library';
-import { HelpTopic } from '@/models/miscellaneous';
-import { ICstSubstitute, IOperation, IOperationSchema, OperationID, OperationType } from '@/models/oss';
-import { SubstitutionValidator } from '@/models/ossAPI';
-import { ConstituentaID } from '@/models/rsform';
+import { ModalForm } from '@/components/Modal';
+import { TabLabel, TabList, TabPanel, Tabs } from '@/components/Tabs';
+import { HelpTopic } from '@/features/help/models/helpTopic';
+import { LibraryItemID } from '@/features/library/models/library';
+import { useRSForms } from '@/features/rsform/backend/useRSForms';
+import { ConstituentaID } from '@/features/rsform/models/rsform';
 import { useDialogsStore } from '@/stores/dialogs';
 
+import { IOperationUpdateDTO } from '../../backend/api';
+import { ICstSubstitute, IOperation, IOperationSchema, OperationID, OperationType } from '../../models/oss';
+import { SubstitutionValidator } from '../../models/ossAPI';
 import TabArguments from './TabArguments';
 import TabOperation from './TabOperation';
 import TabSynthesis from './TabSynthesis';
diff --git a/rsconcept/frontend/src/dialogs/DlgEditOperation/TabArguments.tsx b/rsconcept/frontend/src/features/oss/dialogs/DlgEditOperation/TabArguments.tsx
similarity index 75%
rename from rsconcept/frontend/src/dialogs/DlgEditOperation/TabArguments.tsx
rename to rsconcept/frontend/src/features/oss/dialogs/DlgEditOperation/TabArguments.tsx
index c8f396dd..dd6a0ae0 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditOperation/TabArguments.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/DlgEditOperation/TabArguments.tsx
@@ -1,9 +1,9 @@
 'use client';
+import { FlexColumn } from '@/components/Container';
+import { Label } from '@/components/Input';
 
-import PickMultiOperation from '@/components/select/PickMultiOperation';
-import { FlexColumn } from '@/components/ui/Container';
-import { Label } from '@/components/ui/Input';
-import { IOperationSchema, OperationID } from '@/models/oss';
+import PickMultiOperation from '../../components/PickMultiOperation';
+import { IOperationSchema, OperationID } from '../../models/oss';
 
 interface TabArgumentsProps {
   oss: IOperationSchema;
diff --git a/rsconcept/frontend/src/dialogs/DlgEditOperation/TabOperation.tsx b/rsconcept/frontend/src/features/oss/dialogs/DlgEditOperation/TabOperation.tsx
similarity index 94%
rename from rsconcept/frontend/src/dialogs/DlgEditOperation/TabOperation.tsx
rename to rsconcept/frontend/src/features/oss/dialogs/DlgEditOperation/TabOperation.tsx
index 6cb52ef3..bd275d99 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditOperation/TabOperation.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/DlgEditOperation/TabOperation.tsx
@@ -1,4 +1,4 @@
-import { TextArea, TextInput } from '@/components/ui/Input';
+import { TextArea, TextInput } from '@/components/Input';
 
 interface TabOperationProps {
   alias: string;
diff --git a/rsconcept/frontend/src/dialogs/DlgEditOperation/TabSynthesis.tsx b/rsconcept/frontend/src/features/oss/dialogs/DlgEditOperation/TabSynthesis.tsx
similarity index 79%
rename from rsconcept/frontend/src/dialogs/DlgEditOperation/TabSynthesis.tsx
rename to rsconcept/frontend/src/features/oss/dialogs/DlgEditOperation/TabSynthesis.tsx
index 9b707d78..2ade526a 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditOperation/TabSynthesis.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/DlgEditOperation/TabSynthesis.tsx
@@ -1,9 +1,10 @@
-import PickSubstitutions from '@/components/select/PickSubstitutions';
-import { TextArea } from '@/components/ui/Input';
-import { ICstSubstitute } from '@/models/oss';
-import { IRSForm } from '@/models/rsform';
+import { TextArea } from '@/components/Input';
+import PickSubstitutions from '@/features/rsform/components/PickSubstitutions';
+import { IRSForm } from '@/features/rsform/models/rsform';
 import { APP_COLORS } from '@/styling/color';
 
+import { ICstSubstitute } from '../../models/oss';
+
 interface TabSynthesisProps {
   validationText: string;
   isCorrect: boolean;
diff --git a/rsconcept/frontend/src/dialogs/DlgEditOperation/index.tsx b/rsconcept/frontend/src/features/oss/dialogs/DlgEditOperation/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/dialogs/DlgEditOperation/index.tsx
rename to rsconcept/frontend/src/features/oss/dialogs/DlgEditOperation/index.tsx
diff --git a/rsconcept/frontend/src/dialogs/DlgRelocateConstituents.tsx b/rsconcept/frontend/src/features/oss/dialogs/DlgRelocateConstituents.tsx
similarity index 83%
rename from rsconcept/frontend/src/dialogs/DlgRelocateConstituents.tsx
rename to rsconcept/frontend/src/features/oss/dialogs/DlgRelocateConstituents.tsx
index 6e77c364..1e5653e5 100644
--- a/rsconcept/frontend/src/dialogs/DlgRelocateConstituents.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/DlgRelocateConstituents.tsx
@@ -3,22 +3,23 @@
 import clsx from 'clsx';
 import { useState } from 'react';
 
-import { useLibrary } from '@/backend/library/useLibrary';
-import { ICstRelocateDTO } from '@/backend/oss/api';
-import { useRSForm } from '@/backend/rsform/useRSForm';
+import { MiniButton } from '@/components/Control';
 import { RelocateUpIcon } from '@/components/DomainIcons';
-import PickMultiConstituenta from '@/components/select/PickMultiConstituenta';
-import SelectLibraryItem from '@/components/select/SelectLibraryItem';
-import { MiniButton } from '@/components/ui/Control';
-import Loader from '@/components/ui/Loader';
-import { ModalForm } from '@/components/ui/Modal';
-import { ILibraryItem, LibraryItemID } from '@/models/library';
-import { HelpTopic } from '@/models/miscellaneous';
-import { IOperation, IOperationSchema } from '@/models/oss';
-import { getRelocateCandidates } from '@/models/ossAPI';
-import { ConstituentaID } from '@/models/rsform';
+import { Loader } from '@/components/Loader';
+import { ModalForm } from '@/components/Modal';
+import { HelpTopic } from '@/features/help/models/helpTopic';
+import { useLibrary } from '@/features/library/backend/useLibrary';
+import SelectLibraryItem from '@/features/library/components/SelectLibraryItem';
+import { ILibraryItem, LibraryItemID } from '@/features/library/models/library';
+import { ICstRelocateDTO } from '@/features/oss/backend/api';
+import { useRSForm } from '@/features/rsform/backend/useRSForm';
+import PickMultiConstituenta from '@/features/rsform/components/PickMultiConstituenta';
+import { ConstituentaID } from '@/features/rsform/models/rsform';
 import { useDialogsStore } from '@/stores/dialogs';
 
+import { IOperation, IOperationSchema } from '../models/oss';
+import { getRelocateCandidates } from '../models/ossAPI';
+
 export interface DlgRelocateConstituentsProps {
   oss: IOperationSchema;
   initialTarget?: IOperation;
diff --git a/rsconcept/frontend/src/models/oss.ts b/rsconcept/frontend/src/features/oss/models/oss.ts
similarity index 92%
rename from rsconcept/frontend/src/models/oss.ts
rename to rsconcept/frontend/src/features/oss/models/oss.ts
index f17e9491..b57900c8 100644
--- a/rsconcept/frontend/src/models/oss.ts
+++ b/rsconcept/frontend/src/features/oss/models/oss.ts
@@ -2,9 +2,10 @@
  * Module: Schema of Synthesis Operations.
  */
 
-import { Graph } from './Graph';
-import { ILibraryItem, ILibraryItemData, LibraryItemID } from './library';
-import { ConstituentaID, IConstituenta } from './rsform';
+import { ILibraryItem, ILibraryItemData, LibraryItemID } from '@/features/library/models/library';
+import { ConstituentaID, IConstituenta } from '@/features/rsform/models/rsform';
+
+import { Graph } from '../../../models/Graph';
 
 /**
  * Represents {@link IOperation} identifier type.
diff --git a/rsconcept/frontend/src/models/ossAPI.ts b/rsconcept/frontend/src/features/oss/models/ossAPI.ts
similarity index 86%
rename from rsconcept/frontend/src/models/ossAPI.ts
rename to rsconcept/frontend/src/features/oss/models/ossAPI.ts
index 3047b505..2fd28839 100644
--- a/rsconcept/frontend/src/models/ossAPI.ts
+++ b/rsconcept/frontend/src/features/oss/models/ossAPI.ts
@@ -2,16 +2,30 @@
  * Module: API for OperationSystem.
  */
 
-import { ConstituentaID, CstClass, CstType, IConstituenta, IRSForm } from '@/models/rsform';
-import { limits } from '@/utils/constants';
+import { ILibraryItem, LibraryItemID } from '@/features/library/models/library';
+import { ConstituentaID, CstClass, CstType, IConstituenta, IRSForm } from '@/features/rsform/models/rsform';
+import { AliasMapping, ParsingStatus } from '@/features/rsform/models/rslang';
+import {
+  applyAliasMapping,
+  applyTypificationMapping,
+  extractGlobals,
+  isSetTypification
+} from '@/features/rsform/models/rslangAPI';
+import { limits, PARAMETER } from '@/utils/constants';
 import { describeSubstitutionError, information } from '@/utils/labels';
 import { TextMatcher } from '@/utils/utils';
 
-import { Graph } from './Graph';
-import { ILibraryItem, LibraryItemID } from './library';
-import { ICstSubstitute, IOperation, IOperationSchema, OperationID, SubstitutionErrorType } from './oss';
-import { AliasMapping, ParsingStatus } from './rslang';
-import { applyAliasMapping, applyTypificationMapping, extractGlobals, isSetTypification } from './rslangAPI';
+import { Graph } from '../../../models/Graph';
+import {
+  ICstSubstitute,
+  IOperation,
+  IOperationPosition,
+  IOperationSchema,
+  OperationID,
+  OperationType,
+  SubstitutionErrorType
+} from './oss';
+import { Position2D } from './ossLayout';
 
 /**
  * Checks if a given target {@link IOperation} matches the specified query using.
@@ -465,3 +479,53 @@ export function getRelocateCandidates(
   const unreachable = schema.graph.expandAllOutputs(unreachableBases);
   return addedCst.filter(cst => !unreachable.includes(cst.id));
 }
+
+/**
+ * Calculate insert position for a new {@link IOperation}
+ */
+export function calculateInsertPosition(
+  oss: IOperationSchema,
+  operationType: OperationType,
+  argumentsOps: OperationID[],
+  positions: IOperationPosition[],
+  defaultPosition: Position2D
+): Position2D {
+  const result = defaultPosition;
+  if (positions.length === 0) {
+    return result;
+  }
+
+  if (operationType === OperationType.INPUT) {
+    let inputsNodes = positions.filter(pos =>
+      oss.items.find(operation => operation.operation_type === OperationType.INPUT && operation.id === pos.id)
+    );
+    if (inputsNodes.length > 0) {
+      inputsNodes = positions;
+    }
+    const maxX = Math.max(...inputsNodes.map(node => node.position_x));
+    const minY = Math.min(...inputsNodes.map(node => node.position_y));
+    result.x = maxX + PARAMETER.ossDistanceX;
+    result.y = minY;
+  } else {
+    const argNodes = positions.filter(pos => argumentsOps.includes(pos.id));
+    const maxY = Math.max(...argNodes.map(node => node.position_y));
+    const minX = Math.min(...argNodes.map(node => node.position_x));
+    const maxX = Math.max(...argNodes.map(node => node.position_x));
+    result.x = Math.ceil((maxX + minX) / 2 / PARAMETER.ossGridSize) * PARAMETER.ossGridSize;
+    result.y = maxY + PARAMETER.ossDistanceY;
+  }
+
+  let flagIntersect = false;
+  do {
+    flagIntersect = positions.some(
+      position =>
+        Math.abs(position.position_x - result.x) < PARAMETER.ossMinDistance &&
+        Math.abs(position.position_y - result.y) < PARAMETER.ossMinDistance
+    );
+    if (flagIntersect) {
+      result.x += PARAMETER.ossMinDistance;
+      result.y += PARAMETER.ossMinDistance;
+    }
+  } while (flagIntersect);
+  return result;
+}
diff --git a/rsconcept/frontend/src/features/oss/models/ossLayout.ts b/rsconcept/frontend/src/features/oss/models/ossLayout.ts
new file mode 100644
index 00000000..731244bb
--- /dev/null
+++ b/rsconcept/frontend/src/features/oss/models/ossLayout.ts
@@ -0,0 +1,40 @@
+/**
+ * Module: OSS representation.
+ */
+import { Node } from 'reactflow';
+
+import { IOperation } from './oss';
+
+/**
+ * Represents XY Position.
+ */
+export interface Position2D {
+  x: number;
+  y: number;
+}
+
+/**
+ * Represents graph OSS node data.
+ */
+export interface OssNode extends Node {
+  id: string;
+  data: {
+    label: string;
+    operation: IOperation;
+  };
+  position: { x: number; y: number };
+}
+
+/**
+ * Represents graph OSS node internal data.
+ */
+export interface OssNodeInternal {
+  id: string;
+  data: {
+    label: string;
+    operation: IOperation;
+  };
+  dragging: boolean;
+  xPos: number;
+  yPos: number;
+}
diff --git a/rsconcept/frontend/src/pages/OssPage/EditorOssCard/EditorOssCard.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssCard/EditorOssCard.tsx
similarity index 82%
rename from rsconcept/frontend/src/pages/OssPage/EditorOssCard/EditorOssCard.tsx
rename to rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssCard/EditorOssCard.tsx
index 6cfde598..1af4ccc8 100644
--- a/rsconcept/frontend/src/pages/OssPage/EditorOssCard/EditorOssCard.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssCard/EditorOssCard.tsx
@@ -2,9 +2,10 @@
 
 import clsx from 'clsx';
 
-import { FlexColumn } from '@/components/ui/Container';
-import EditorLibraryItem from '@/pages/RSFormPage/EditorRSFormCard/EditorLibraryItem';
-import ToolbarRSFormCard from '@/pages/RSFormPage/EditorRSFormCard/ToolbarRSFormCard';
+import { FlexColumn } from '@/components/Container';
+// TODO: reconsider this dependency
+import EditorLibraryItem from '@/features/rsform/pages/RSFormPage/EditorRSFormCard/EditorLibraryItem';
+import ToolbarRSFormCard from '@/features/rsform/pages/RSFormPage/EditorRSFormCard/ToolbarRSFormCard';
 import { useModificationStore } from '@/stores/modification';
 import { globals } from '@/utils/constants';
 
diff --git a/rsconcept/frontend/src/pages/OssPage/EditorOssCard/FormOSS.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssCard/FormOSS.tsx
similarity index 87%
rename from rsconcept/frontend/src/pages/OssPage/EditorOssCard/FormOSS.tsx
rename to rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssCard/FormOSS.tsx
index 1c5fff8b..1f9c0a17 100644
--- a/rsconcept/frontend/src/pages/OssPage/EditorOssCard/FormOSS.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssCard/FormOSS.tsx
@@ -6,17 +6,17 @@ import clsx from 'clsx';
 import { useEffect } from 'react';
 import { useForm, useWatch } from 'react-hook-form';
 
-import { IUpdateLibraryItemDTO, UpdateLibraryItemSchema } from '@/backend/library/api';
-import { useUpdateItem } from '@/backend/library/useUpdateItem';
-import { useMutatingOss } from '@/backend/oss/useMutatingOss';
+import { SubmitButton } from '@/components/Control';
 import { IconSave } from '@/components/Icons';
-import { SubmitButton } from '@/components/ui/Control';
-import { TextArea, TextInput } from '@/components/ui/Input';
-import { LibraryItemType } from '@/models/library';
-import ToolbarItemAccess from '@/pages/RSFormPage/EditorRSFormCard/ToolbarItemAccess';
+import { TextArea, TextInput } from '@/components/Input';
+import { IUpdateLibraryItemDTO, UpdateLibraryItemSchema } from '@/features/library/backend/api';
+import { useUpdateItem } from '@/features/library/backend/useUpdateItem';
+import { LibraryItemType } from '@/features/library/models/library';
+import ToolbarItemAccess from '@/features/rsform/pages/RSFormPage/EditorRSFormCard/ToolbarItemAccess';
 import { useModificationStore } from '@/stores/modification';
 import { globals } from '@/utils/constants';
 
+import { useMutatingOss } from '../../../backend/useMutatingOss';
 import { useOssEdit } from '../OssEditContext';
 
 function FormOSS() {
diff --git a/rsconcept/frontend/src/pages/OssPage/EditorOssCard/OssStats.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssCard/OssStats.tsx
similarity index 93%
rename from rsconcept/frontend/src/pages/OssPage/EditorOssCard/OssStats.tsx
rename to rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssCard/OssStats.tsx
index 443a3507..db02666b 100644
--- a/rsconcept/frontend/src/pages/OssPage/EditorOssCard/OssStats.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssCard/OssStats.tsx
@@ -1,8 +1,9 @@
 import clsx from 'clsx';
 
 import { IconDownload, IconRSForm, IconRSFormImported, IconRSFormOwned, IconSynthesis } from '@/components/Icons';
-import { ValueStats } from '@/components/ui/View';
-import { IOperationSchemaStats } from '@/models/oss';
+import { ValueStats } from '@/components/View';
+
+import { IOperationSchemaStats } from '../../../models/oss';
 
 interface OssStatsProps {
   stats: IOperationSchemaStats;
diff --git a/rsconcept/frontend/src/pages/OssPage/EditorOssCard/index.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssCard/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/pages/OssPage/EditorOssCard/index.tsx
rename to rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssCard/index.tsx
diff --git a/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/EditorOssGraph.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/EditorOssGraph.tsx
similarity index 100%
rename from rsconcept/frontend/src/pages/OssPage/EditorOssGraph/EditorOssGraph.tsx
rename to rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/EditorOssGraph.tsx
diff --git a/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/NodeContextMenu.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/NodeContextMenu.tsx
similarity index 96%
rename from rsconcept/frontend/src/pages/OssPage/EditorOssGraph/NodeContextMenu.tsx
rename to rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/NodeContextMenu.tsx
index 8afc027d..bf2ec50a 100644
--- a/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/NodeContextMenu.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/NodeContextMenu.tsx
@@ -2,7 +2,7 @@
 
 import { useRef } from 'react';
 
-import { useMutatingOss } from '@/backend/oss/useMutatingOss';
+import { Dropdown, DropdownButton } from '@/components/Dropdown';
 import {
   IconChild,
   IconConnect,
@@ -12,9 +12,9 @@ import {
   IconNewRSForm,
   IconRSForm
 } from '@/components/Icons';
-import { Dropdown, DropdownButton } from '@/components/ui/Dropdown';
+import { useMutatingOss } from '@/features/oss/backend/useMutatingOss';
+import { IOperation, OperationID, OperationType } from '@/features/oss/models/oss';
 import useClickedOutside from '@/hooks/useClickedOutside';
-import { IOperation, OperationID, OperationType } from '@/models/oss';
 import { PARAMETER } from '@/utils/constants';
 import { prepareTooltip } from '@/utils/labels';
 
diff --git a/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/OssFlow.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/OssFlow.tsx
similarity index 94%
rename from rsconcept/frontend/src/pages/OssPage/EditorOssGraph/OssFlow.tsx
rename to rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/OssFlow.tsx
index 874ed327..303e869a 100644
--- a/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/OssFlow.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/OssFlow.tsx
@@ -16,24 +16,23 @@ import {
   useReactFlow
 } from 'reactflow';
 
-import { useConceptNavigation } from '@/app/Navigation/NavigationContext';
-import { urls } from '@/app/urls';
-import { useLibrary } from '@/backend/library/useLibrary';
-import { useInputCreate } from '@/backend/oss/useInputCreate';
-import { useMutatingOss } from '@/backend/oss/useMutatingOss';
-import { useOperationExecute } from '@/backend/oss/useOperationExecute';
-import { useUpdatePositions } from '@/backend/oss/useUpdatePositions';
+import { urls, useConceptNavigation } from '@/app';
+import { Overlay } from '@/components/Container';
 import { CProps } from '@/components/props';
-import { Overlay } from '@/components/ui/Container';
-import { OssNode } from '@/models/miscellaneous';
-import { OperationID } from '@/models/oss';
+import { useLibrary } from '@/features/library/backend/useLibrary';
 import { useMainHeight } from '@/stores/appLayout';
 import { useModificationStore } from '@/stores/modification';
-import { useOSSGraphStore } from '@/stores/ossGraph';
 import { APP_COLORS } from '@/styling/color';
 import { PARAMETER } from '@/utils/constants';
 import { errors } from '@/utils/labels';
 
+import { useInputCreate } from '../../../backend/useInputCreate';
+import { useMutatingOss } from '../../../backend/useMutatingOss';
+import { useOperationExecute } from '../../../backend/useOperationExecute';
+import { useUpdatePositions } from '../../../backend/useUpdatePositions';
+import { OperationID } from '../../../models/oss';
+import { OssNode } from '../../../models/ossLayout';
+import { useOSSGraphStore } from '../../../stores/ossGraph';
 import { useOssEdit } from '../OssEditContext';
 import { OssNodeTypes } from './graph/OssNodeTypes';
 import NodeContextMenu, { ContextMenuData } from './NodeContextMenu';
diff --git a/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/ToolbarOssGraph.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/ToolbarOssGraph.tsx
similarity index 94%
rename from rsconcept/frontend/src/pages/OssPage/EditorOssGraph/ToolbarOssGraph.tsx
rename to rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/ToolbarOssGraph.tsx
index c5ad5e2f..bd29b624 100644
--- a/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/ToolbarOssGraph.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/ToolbarOssGraph.tsx
@@ -2,7 +2,7 @@
 
 import clsx from 'clsx';
 
-import { useMutatingOss } from '@/backend/oss/useMutatingOss';
+import { MiniButton } from '@/components/Control';
 import {
   IconAnimation,
   IconAnimationOff,
@@ -18,15 +18,15 @@ import {
   IconReset,
   IconSave
 } from '@/components/Icons';
-import BadgeHelp from '@/components/info/BadgeHelp';
-import { MiniButton } from '@/components/ui/Control';
-import { HelpTopic } from '@/models/miscellaneous';
-import { OperationType } from '@/models/oss';
+import BadgeHelp from '@/components/shared/BadgeHelp';
+import { HelpTopic } from '@/features/help/models/helpTopic';
 import { useModificationStore } from '@/stores/modification';
-import { useOSSGraphStore } from '@/stores/ossGraph';
 import { PARAMETER } from '@/utils/constants';
 import { prepareTooltip } from '@/utils/labels';
 
+import { useMutatingOss } from '../../../backend/useMutatingOss';
+import { OperationType } from '../../../models/oss';
+import { useOSSGraphStore } from '../../../stores/ossGraph';
 import { useOssEdit } from '../OssEditContext';
 
 interface ToolbarOssGraphProps {
diff --git a/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/graph/InputNode.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/graph/InputNode.tsx
similarity index 81%
rename from rsconcept/frontend/src/pages/OssPage/EditorOssGraph/graph/InputNode.tsx
rename to rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/graph/InputNode.tsx
index 10a385a1..0acf10b7 100644
--- a/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/graph/InputNode.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/graph/InputNode.tsx
@@ -1,7 +1,6 @@
 import { Handle, Position } from 'reactflow';
 
-import { OssNodeInternal } from '@/models/miscellaneous';
-
+import { OssNodeInternal } from '../../../../models/ossLayout';
 import NodeCore from './NodeCore';
 
 function InputNode(node: OssNodeInternal) {
diff --git a/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/graph/NodeCore.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/graph/NodeCore.tsx
similarity index 89%
rename from rsconcept/frontend/src/pages/OssPage/EditorOssGraph/graph/NodeCore.tsx
rename to rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/graph/NodeCore.tsx
index 278116d8..2e8c80f9 100644
--- a/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/graph/NodeCore.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/graph/NodeCore.tsx
@@ -1,14 +1,14 @@
 'use client';
 
+import { Overlay } from '@/components/Container';
 import { IconConsolidation, IconRSForm } from '@/components/Icons';
-import TooltipOperation from '@/components/info/TooltipOperation';
-import { Overlay } from '@/components/ui/Container';
-import { Indicator } from '@/components/ui/View';
-import { OssNodeInternal } from '@/models/miscellaneous';
-import { OperationType } from '@/models/oss';
+import { Indicator } from '@/components/View';
 import { PARAMETER, prefixes } from '@/utils/constants';
 import { truncateToLastWord } from '@/utils/utils';
 
+import TooltipOperation from '../../../../components/TooltipOperation';
+import { OperationType } from '../../../../models/oss';
+import { OssNodeInternal } from '../../../../models/ossLayout';
 import { useOssEdit } from '../../OssEditContext';
 
 interface NodeCoreProps {
diff --git a/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/graph/OperationNode.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/graph/OperationNode.tsx
similarity index 88%
rename from rsconcept/frontend/src/pages/OssPage/EditorOssGraph/graph/OperationNode.tsx
rename to rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/graph/OperationNode.tsx
index 02874cb0..c567fb66 100644
--- a/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/graph/OperationNode.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/graph/OperationNode.tsx
@@ -2,8 +2,7 @@
 
 import { Handle, Position } from 'reactflow';
 
-import { OssNodeInternal } from '@/models/miscellaneous';
-
+import { OssNodeInternal } from '../../../../models/ossLayout';
 import NodeCore from './NodeCore';
 
 function OperationNode(node: OssNodeInternal) {
diff --git a/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/graph/OssNodeTypes.ts b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/graph/OssNodeTypes.ts
similarity index 100%
rename from rsconcept/frontend/src/pages/OssPage/EditorOssGraph/graph/OssNodeTypes.ts
rename to rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/graph/OssNodeTypes.ts
diff --git a/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/index.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/pages/OssPage/EditorOssGraph/index.tsx
rename to rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/index.tsx
diff --git a/rsconcept/frontend/src/pages/OssPage/MenuOssTabs.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/MenuOssTabs.tsx
similarity index 94%
rename from rsconcept/frontend/src/pages/OssPage/MenuOssTabs.tsx
rename to rsconcept/frontend/src/features/oss/pages/OssPage/MenuOssTabs.tsx
index f5686f64..c9239250 100644
--- a/rsconcept/frontend/src/pages/OssPage/MenuOssTabs.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/OssPage/MenuOssTabs.tsx
@@ -1,9 +1,9 @@
 'use client';
 
-import { useConceptNavigation } from '@/app/Navigation/NavigationContext';
-import { urls } from '@/app/urls';
-import { useAuthSuspense } from '@/backend/auth/useAuth';
-import { useMutatingOss } from '@/backend/oss/useMutatingOss';
+import { urls, useConceptNavigation } from '@/app';
+import { Divider } from '@/components/Container';
+import { Button } from '@/components/Control';
+import { Dropdown, DropdownButton, useDropdown } from '@/components/Dropdown';
 import {
   IconAdmin,
   IconAlert,
@@ -18,10 +18,9 @@ import {
   IconReader,
   IconShare
 } from '@/components/Icons';
-import { Divider } from '@/components/ui/Container';
-import { Button } from '@/components/ui/Control';
-import { Dropdown, DropdownButton, useDropdown } from '@/components/ui/Dropdown';
-import { UserRole } from '@/models/user';
+import { useAuthSuspense } from '@/features/auth/backend/useAuth';
+import { useMutatingOss } from '@/features/oss/backend/useMutatingOss';
+import { UserRole } from '@/features/users/models/user';
 import { useRoleStore } from '@/stores/role';
 import { describeAccessMode as describeUserRole, labelAccessMode as labelUserRole } from '@/utils/labels';
 import { sharePage } from '@/utils/utils';
diff --git a/rsconcept/frontend/src/pages/OssPage/OssEditContext.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/OssEditContext.tsx
similarity index 89%
rename from rsconcept/frontend/src/pages/OssPage/OssEditContext.tsx
rename to rsconcept/frontend/src/features/oss/pages/OssPage/OssEditContext.tsx
index fd649894..57e6561d 100644
--- a/rsconcept/frontend/src/pages/OssPage/OssEditContext.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/OssPage/OssEditContext.tsx
@@ -2,29 +2,29 @@
 
 import { createContext, useContext, useEffect, useState } from 'react';
 
-import { useConceptNavigation } from '@/app/Navigation/NavigationContext';
-import { urls } from '@/app/urls';
-import { useAuthSuspense } from '@/backend/auth/useAuth';
-import { useDeleteItem } from '@/backend/library/useDeleteItem';
-import { useInputUpdate } from '@/backend/oss/useInputUpdate';
-import { useOperationCreate } from '@/backend/oss/useOperationCreate';
-import { useOperationDelete } from '@/backend/oss/useOperationDelete';
-import { useOperationUpdate } from '@/backend/oss/useOperationUpdate';
-import { useOssSuspense } from '@/backend/oss/useOSS';
-import { useRelocateConstituents } from '@/backend/oss/useRelocateConstituents';
-import { useUpdatePositions } from '@/backend/oss/useUpdatePositions';
-import { ILibraryItemEditor, LibraryItemID } from '@/models/library';
-import { calculateInsertPosition } from '@/models/miscellaneousAPI';
-import { IOperationPosition, IOperationSchema, OperationID, OperationType } from '@/models/oss';
-import { UserRole } from '@/models/user';
-import { RSTabID } from '@/pages/RSFormPage/RSEditContext';
+import { urls, useConceptNavigation } from '@/app';
+import { useAuthSuspense } from '@/features/auth/backend/useAuth';
+import { useDeleteItem } from '@/features/library/backend/useDeleteItem';
+import { ILibraryItemEditor, LibraryItemID } from '@/features/library/models/library';
+import { useLibrarySearchStore } from '@/features/library/stores/librarySearch';
+import { RSTabID } from '@/features/rsform/pages/RSFormPage/RSEditContext';
+import { UserRole } from '@/features/users/models/user';
 import { useDialogsStore } from '@/stores/dialogs';
-import { useLibrarySearchStore } from '@/stores/librarySearch';
 import { usePreferencesStore } from '@/stores/preferences';
 import { useRoleStore } from '@/stores/role';
 import { PARAMETER } from '@/utils/constants';
 import { prompts } from '@/utils/labels';
 
+import { useInputUpdate } from '../../backend/useInputUpdate';
+import { useOperationCreate } from '../../backend/useOperationCreate';
+import { useOperationDelete } from '../../backend/useOperationDelete';
+import { useOperationUpdate } from '../../backend/useOperationUpdate';
+import { useOssSuspense } from '../../backend/useOSS';
+import { useRelocateConstituents } from '../../backend/useRelocateConstituents';
+import { useUpdatePositions } from '../../backend/useUpdatePositions';
+import { IOperationPosition, IOperationSchema, OperationID, OperationType } from '../../models/oss';
+import { calculateInsertPosition } from '../../models/ossAPI';
+
 export enum OssTabID {
   CARD = 0,
   GRAPH = 1
diff --git a/rsconcept/frontend/src/pages/OssPage/OssPage.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/OssPage.tsx
similarity index 86%
rename from rsconcept/frontend/src/pages/OssPage/OssPage.tsx
rename to rsconcept/frontend/src/features/oss/pages/OssPage/OssPage.tsx
index 36f4b9b7..4d494de2 100644
--- a/rsconcept/frontend/src/pages/OssPage/OssPage.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/OssPage/OssPage.tsx
@@ -1,15 +1,14 @@
 'use client';
 
-import axios from 'axios';
 import { useEffect } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
 import { useParams } from 'react-router';
 import { z } from 'zod';
 
-import { useBlockNavigation, useConceptNavigation } from '@/app/Navigation/NavigationContext';
-import { urls } from '@/app/urls';
-import { ErrorData } from '@/components/info/InfoError';
-import { TextURL } from '@/components/ui/Control';
+import { urls, useBlockNavigation, useConceptNavigation } from '@/app';
+import { isAxiosError } from '@/backend/apiTransport';
+import { TextURL } from '@/components/Control';
+import { ErrorData } from '@/components/InfoError';
 import useQueryStrings from '@/hooks/useQueryStrings';
 import { useModificationStore } from '@/stores/modification';
 
@@ -52,7 +51,7 @@ export function OssPage() {
 
 // ====== Internals =========
 function ProcessError({ error }: { error: ErrorData }): React.ReactElement {
-  if (axios.isAxiosError(error) && error.response) {
+  if (isAxiosError(error) && error.response) {
     if (error.response.status === 404) {
       return (
         <div className='flex flex-col items-center p-2 mx-auto'>
diff --git a/rsconcept/frontend/src/pages/OssPage/OssTabs.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/OssTabs.tsx
similarity index 97%
rename from rsconcept/frontend/src/pages/OssPage/OssTabs.tsx
rename to rsconcept/frontend/src/features/oss/pages/OssPage/OssTabs.tsx
index 6146d654..d870f697 100644
--- a/rsconcept/frontend/src/pages/OssPage/OssTabs.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/OssPage/OssTabs.tsx
@@ -4,8 +4,8 @@ import clsx from 'clsx';
 import { useEffect } from 'react';
 
 import { useConceptNavigation } from '@/app/Navigation/NavigationContext';
-import { Overlay } from '@/components/ui/Container';
-import { TabLabel, TabList, TabPanel, Tabs } from '@/components/ui/Tabs';
+import { Overlay } from '@/components/Container';
+import { TabLabel, TabList, TabPanel, Tabs } from '@/components/Tabs';
 import { useAppLayoutStore } from '@/stores/appLayout';
 
 import EditorRSForm from './EditorOssCard';
diff --git a/rsconcept/frontend/src/pages/OssPage/index.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/pages/OssPage/index.tsx
rename to rsconcept/frontend/src/features/oss/pages/OssPage/index.tsx
diff --git a/rsconcept/frontend/src/stores/ossGraph.ts b/rsconcept/frontend/src/features/oss/stores/ossGraph.ts
similarity index 100%
rename from rsconcept/frontend/src/stores/ossGraph.ts
rename to rsconcept/frontend/src/features/oss/stores/ossGraph.ts
diff --git a/rsconcept/frontend/src/backend/rsform/RSFormLoader.ts b/rsconcept/frontend/src/features/rsform/backend/RSFormLoader.ts
similarity index 97%
rename from rsconcept/frontend/src/backend/rsform/RSFormLoader.ts
rename to rsconcept/frontend/src/features/rsform/backend/RSFormLoader.ts
index 4d97405b..de92c091 100644
--- a/rsconcept/frontend/src/backend/rsform/RSFormLoader.ts
+++ b/rsconcept/frontend/src/features/rsform/backend/RSFormLoader.ts
@@ -2,13 +2,13 @@
  * Module: RSForm data loading and processing.
  */
 
+import { LibraryItemID } from '@/features/library/models/library';
 import { Graph } from '@/models/Graph';
-import { LibraryItemID } from '@/models/library';
-import { ConstituentaID, CstType, IConstituenta, IRSForm, IRSFormStats } from '@/models/rsform';
-import { inferClass, inferStatus, inferTemplate, isBaseSet, isFunctional } from '@/models/rsformAPI';
-import { ParsingStatus, ValueClass } from '@/models/rslang';
-import { extractGlobals, isSimpleExpression, splitTemplateDefinition } from '@/models/rslangAPI';
 
+import { ConstituentaID, CstType, IConstituenta, IRSForm, IRSFormStats } from '../models/rsform';
+import { inferClass, inferStatus, inferTemplate, isBaseSet, isFunctional } from '../models/rsformAPI';
+import { ParsingStatus, ValueClass } from '../models/rslang';
+import { extractGlobals, isSimpleExpression, splitTemplateDefinition } from '../models/rslangAPI';
 import { IRSFormDTO } from './api';
 
 /**
diff --git a/rsconcept/frontend/src/backend/rsform/api.ts b/rsconcept/frontend/src/features/rsform/backend/api.ts
similarity index 96%
rename from rsconcept/frontend/src/backend/rsform/api.ts
rename to rsconcept/frontend/src/features/rsform/backend/api.ts
index 07f04e23..c4189373 100644
--- a/rsconcept/frontend/src/backend/rsform/api.ts
+++ b/rsconcept/frontend/src/features/rsform/backend/api.ts
@@ -3,8 +3,15 @@ import { z } from 'zod';
 
 import { axiosGet, axiosPatch, axiosPost } from '@/backend/apiTransport';
 import { DELAYS } from '@/backend/configuration';
-import { ILibraryItemReference, ILibraryItemVersioned, LibraryItemID, VersionID } from '@/models/library';
-import { ICstSubstitute, ICstSubstitutions } from '@/models/oss';
+import {
+  ILibraryItemReference,
+  ILibraryItemVersioned,
+  LibraryItemID,
+  VersionID
+} from '@/features/library/models/library';
+import { ICstSubstitute, ICstSubstitutions } from '@/features/oss/models/oss';
+import { information } from '@/utils/labels';
+
 import {
   ConstituentaID,
   CstType,
@@ -13,9 +20,8 @@ import {
   IInheritanceInfo,
   ITargetCst,
   TermForm
-} from '@/models/rsform';
-import { IArgumentInfo, IExpressionParse, ParsingStatus, ValueClass } from '@/models/rslang';
-import { information } from '@/utils/labels';
+} from '../models/rsform';
+import { IArgumentInfo, IExpressionParse, ParsingStatus, ValueClass } from '../models/rslang';
 
 /**
  * Represents {@link IConstituenta} data from server.
diff --git a/rsconcept/frontend/src/backend/cctext/api.ts b/rsconcept/frontend/src/features/rsform/backend/cctext/api.ts
similarity index 100%
rename from rsconcept/frontend/src/backend/cctext/api.ts
rename to rsconcept/frontend/src/features/rsform/backend/cctext/api.ts
diff --git a/rsconcept/frontend/src/backend/cctext/useGenerateLexeme.tsx b/rsconcept/frontend/src/features/rsform/backend/cctext/useGenerateLexeme.tsx
similarity index 100%
rename from rsconcept/frontend/src/backend/cctext/useGenerateLexeme.tsx
rename to rsconcept/frontend/src/features/rsform/backend/cctext/useGenerateLexeme.tsx
diff --git a/rsconcept/frontend/src/backend/cctext/useInflectText.tsx b/rsconcept/frontend/src/features/rsform/backend/cctext/useInflectText.tsx
similarity index 100%
rename from rsconcept/frontend/src/backend/cctext/useInflectText.tsx
rename to rsconcept/frontend/src/features/rsform/backend/cctext/useInflectText.tsx
diff --git a/rsconcept/frontend/src/backend/cctext/useIsProcessingCctext.tsx b/rsconcept/frontend/src/features/rsform/backend/cctext/useIsProcessingCctext.tsx
similarity index 100%
rename from rsconcept/frontend/src/backend/cctext/useIsProcessingCctext.tsx
rename to rsconcept/frontend/src/features/rsform/backend/cctext/useIsProcessingCctext.tsx
diff --git a/rsconcept/frontend/src/backend/cctext/useParseText.tsx b/rsconcept/frontend/src/features/rsform/backend/cctext/useParseText.tsx
similarity index 100%
rename from rsconcept/frontend/src/backend/cctext/useParseText.tsx
rename to rsconcept/frontend/src/features/rsform/backend/cctext/useParseText.tsx
diff --git a/rsconcept/frontend/src/backend/rsform/useCheckConstituenta.tsx b/rsconcept/frontend/src/features/rsform/backend/useCheckConstituenta.tsx
similarity index 84%
rename from rsconcept/frontend/src/backend/rsform/useCheckConstituenta.tsx
rename to rsconcept/frontend/src/features/rsform/backend/useCheckConstituenta.tsx
index c8dd1b5d..5a1acb3d 100644
--- a/rsconcept/frontend/src/backend/rsform/useCheckConstituenta.tsx
+++ b/rsconcept/frontend/src/features/rsform/backend/useCheckConstituenta.tsx
@@ -1,9 +1,9 @@
 import { useMutation } from '@tanstack/react-query';
 
 import { DataCallback } from '@/backend/apiTransport';
-import { LibraryItemID } from '@/models/library';
-import { IExpressionParse } from '@/models/rslang';
+import { LibraryItemID } from '@/features/library/models/library';
 
+import { IExpressionParse } from '../models/rslang';
 import { ICheckConstituentaDTO, rsformsApi } from './api';
 
 export const useCheckConstituenta = () => {
diff --git a/rsconcept/frontend/src/backend/rsform/useCstCreate.tsx b/rsconcept/frontend/src/features/rsform/backend/useCstCreate.tsx
similarity index 81%
rename from rsconcept/frontend/src/backend/rsform/useCstCreate.tsx
rename to rsconcept/frontend/src/features/rsform/backend/useCstCreate.tsx
index f3a10303..59647aaf 100644
--- a/rsconcept/frontend/src/backend/rsform/useCstCreate.tsx
+++ b/rsconcept/frontend/src/features/rsform/backend/useCstCreate.tsx
@@ -1,11 +1,11 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
 import { DataCallback } from '@/backend/apiTransport';
-import { useUpdateTimestamp } from '@/backend/library/useUpdateTimestamp';
-import { ossApi } from '@/backend/oss/api';
-import { LibraryItemID } from '@/models/library';
-import { IConstituentaMeta } from '@/models/rsform';
+import { useUpdateTimestamp } from '@/features/library/backend/useUpdateTimestamp';
+import { LibraryItemID } from '@/features/library/models/library';
+import { ossApi } from '@/features/oss/backend/api';
 
+import { IConstituentaMeta } from '../models/rsform';
 import { ICstCreateDTO, rsformsApi } from './api';
 
 export const useCstCreate = () => {
diff --git a/rsconcept/frontend/src/backend/rsform/useCstDelete.tsx b/rsconcept/frontend/src/features/rsform/backend/useCstDelete.tsx
similarity index 79%
rename from rsconcept/frontend/src/backend/rsform/useCstDelete.tsx
rename to rsconcept/frontend/src/features/rsform/backend/useCstDelete.tsx
index e982a6ef..774881f9 100644
--- a/rsconcept/frontend/src/backend/rsform/useCstDelete.tsx
+++ b/rsconcept/frontend/src/features/rsform/backend/useCstDelete.tsx
@@ -1,10 +1,10 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { useUpdateTimestamp } from '@/backend/library/useUpdateTimestamp';
-import { ossApi } from '@/backend/oss/api';
-import { LibraryItemID } from '@/models/library';
-import { IConstituentaList } from '@/models/rsform';
+import { useUpdateTimestamp } from '@/features/library/backend/useUpdateTimestamp';
+import { LibraryItemID } from '@/features/library/models/library';
+import { ossApi } from '@/features/oss/backend/api';
 
+import { IConstituentaList } from '../models/rsform';
 import { rsformsApi } from './api';
 
 export const useCstDelete = () => {
diff --git a/rsconcept/frontend/src/backend/rsform/useCstMove.tsx b/rsconcept/frontend/src/features/rsform/backend/useCstMove.tsx
similarity index 82%
rename from rsconcept/frontend/src/backend/rsform/useCstMove.tsx
rename to rsconcept/frontend/src/features/rsform/backend/useCstMove.tsx
index ec8b7286..ae818b89 100644
--- a/rsconcept/frontend/src/backend/rsform/useCstMove.tsx
+++ b/rsconcept/frontend/src/features/rsform/backend/useCstMove.tsx
@@ -1,7 +1,7 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { useUpdateTimestamp } from '@/backend/library/useUpdateTimestamp';
-import { LibraryItemID } from '@/models/library';
+import { useUpdateTimestamp } from '@/features/library/backend/useUpdateTimestamp';
+import { LibraryItemID } from '@/features/library/models/library';
 
 import { ICstMoveDTO, rsformsApi } from './api';
 
diff --git a/rsconcept/frontend/src/backend/rsform/useCstRename.tsx b/rsconcept/frontend/src/features/rsform/backend/useCstRename.tsx
similarity index 82%
rename from rsconcept/frontend/src/backend/rsform/useCstRename.tsx
rename to rsconcept/frontend/src/features/rsform/backend/useCstRename.tsx
index 76d9d598..d82758d1 100644
--- a/rsconcept/frontend/src/backend/rsform/useCstRename.tsx
+++ b/rsconcept/frontend/src/features/rsform/backend/useCstRename.tsx
@@ -1,8 +1,8 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { useUpdateTimestamp } from '@/backend/library/useUpdateTimestamp';
-import { ossApi } from '@/backend/oss/api';
-import { LibraryItemID } from '@/models/library';
+import { useUpdateTimestamp } from '@/features/library/backend/useUpdateTimestamp';
+import { LibraryItemID } from '@/features/library/models/library';
+import { ossApi } from '@/features/oss/backend/api';
 
 import { ICstRenameDTO, rsformsApi } from './api';
 
diff --git a/rsconcept/frontend/src/backend/rsform/useCstSubstitute.tsx b/rsconcept/frontend/src/features/rsform/backend/useCstSubstitute.tsx
similarity index 79%
rename from rsconcept/frontend/src/backend/rsform/useCstSubstitute.tsx
rename to rsconcept/frontend/src/features/rsform/backend/useCstSubstitute.tsx
index e0c18d63..41ffb5bc 100644
--- a/rsconcept/frontend/src/backend/rsform/useCstSubstitute.tsx
+++ b/rsconcept/frontend/src/features/rsform/backend/useCstSubstitute.tsx
@@ -1,9 +1,9 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { useUpdateTimestamp } from '@/backend/library/useUpdateTimestamp';
-import { ossApi } from '@/backend/oss/api';
-import { LibraryItemID } from '@/models/library';
-import { ICstSubstitutions } from '@/models/oss';
+import { useUpdateTimestamp } from '@/features/library/backend/useUpdateTimestamp';
+import { LibraryItemID } from '@/features/library/models/library';
+import { ossApi } from '@/features/oss/backend/api';
+import { ICstSubstitutions } from '@/features/oss/models/oss';
 
 import { rsformsApi } from './api';
 
diff --git a/rsconcept/frontend/src/backend/rsform/useCstUpdate.tsx b/rsconcept/frontend/src/features/rsform/backend/useCstUpdate.tsx
similarity index 79%
rename from rsconcept/frontend/src/backend/rsform/useCstUpdate.tsx
rename to rsconcept/frontend/src/features/rsform/backend/useCstUpdate.tsx
index aa9347ff..998de043 100644
--- a/rsconcept/frontend/src/backend/rsform/useCstUpdate.tsx
+++ b/rsconcept/frontend/src/features/rsform/backend/useCstUpdate.tsx
@@ -1,8 +1,8 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { useUpdateTimestamp } from '@/backend/library/useUpdateTimestamp';
-import { ossApi } from '@/backend/oss/api';
-import { LibraryItemID } from '@/models/library';
+import { useUpdateTimestamp } from '@/features/library/backend/useUpdateTimestamp';
+import { LibraryItemID } from '@/features/library/models/library';
+import { ossApi } from '@/features/oss/backend/api';
 
 import { ICstUpdateDTO, rsformsApi } from './api';
 
diff --git a/rsconcept/frontend/src/backend/rsform/useDownloadRSForm.tsx b/rsconcept/frontend/src/features/rsform/backend/useDownloadRSForm.tsx
similarity index 85%
rename from rsconcept/frontend/src/backend/rsform/useDownloadRSForm.tsx
rename to rsconcept/frontend/src/features/rsform/backend/useDownloadRSForm.tsx
index 53eb9f7b..7710a960 100644
--- a/rsconcept/frontend/src/backend/rsform/useDownloadRSForm.tsx
+++ b/rsconcept/frontend/src/features/rsform/backend/useDownloadRSForm.tsx
@@ -1,6 +1,6 @@
 import { useMutation } from '@tanstack/react-query';
 
-import { LibraryItemID, VersionID } from '@/models/library';
+import { LibraryItemID, VersionID } from '@/features/library/models/library';
 
 import { rsformsApi } from './api';
 
diff --git a/rsconcept/frontend/src/backend/rsform/useInlineSynthesis.tsx b/rsconcept/frontend/src/features/rsform/backend/useInlineSynthesis.tsx
similarity index 84%
rename from rsconcept/frontend/src/backend/rsform/useInlineSynthesis.tsx
rename to rsconcept/frontend/src/features/rsform/backend/useInlineSynthesis.tsx
index 69286841..41465d03 100644
--- a/rsconcept/frontend/src/backend/rsform/useInlineSynthesis.tsx
+++ b/rsconcept/frontend/src/features/rsform/backend/useInlineSynthesis.tsx
@@ -1,9 +1,9 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
 import { DataCallback } from '@/backend/apiTransport';
-import { useUpdateTimestamp } from '@/backend/library/useUpdateTimestamp';
-import { ossApi } from '@/backend/oss/api';
-import { LibraryItemID } from '@/models/library';
+import { useUpdateTimestamp } from '@/features/library/backend/useUpdateTimestamp';
+import { LibraryItemID } from '@/features/library/models/library';
+import { ossApi } from '@/features/oss/backend/api';
 
 import { IInlineSynthesisDTO, IRSFormDTO, rsformsApi } from './api';
 
diff --git a/rsconcept/frontend/src/backend/rsform/useMutatingRSForm.tsx b/rsconcept/frontend/src/features/rsform/backend/useMutatingRSForm.tsx
similarity index 84%
rename from rsconcept/frontend/src/backend/rsform/useMutatingRSForm.tsx
rename to rsconcept/frontend/src/features/rsform/backend/useMutatingRSForm.tsx
index 0e047591..16d3f3d1 100644
--- a/rsconcept/frontend/src/backend/rsform/useMutatingRSForm.tsx
+++ b/rsconcept/frontend/src/features/rsform/backend/useMutatingRSForm.tsx
@@ -1,6 +1,6 @@
 import { useIsMutating } from '@tanstack/react-query';
 
-import { libraryApi } from '@/backend/library/api';
+import { libraryApi } from '@/features/library/backend/api';
 
 import { rsformsApi } from './api';
 
diff --git a/rsconcept/frontend/src/backend/rsform/useProduceStructure.tsx b/rsconcept/frontend/src/features/rsform/backend/useProduceStructure.tsx
similarity index 81%
rename from rsconcept/frontend/src/backend/rsform/useProduceStructure.tsx
rename to rsconcept/frontend/src/features/rsform/backend/useProduceStructure.tsx
index 6529d6d1..4db27d51 100644
--- a/rsconcept/frontend/src/backend/rsform/useProduceStructure.tsx
+++ b/rsconcept/frontend/src/features/rsform/backend/useProduceStructure.tsx
@@ -1,11 +1,11 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
 import { DataCallback } from '@/backend/apiTransport';
-import { useUpdateTimestamp } from '@/backend/library/useUpdateTimestamp';
-import { ossApi } from '@/backend/oss/api';
-import { LibraryItemID } from '@/models/library';
-import { ConstituentaID, ITargetCst } from '@/models/rsform';
+import { useUpdateTimestamp } from '@/features/library/backend/useUpdateTimestamp';
+import { LibraryItemID } from '@/features/library/models/library';
+import { ossApi } from '@/features/oss/backend/api';
 
+import { ConstituentaID, ITargetCst } from '../models/rsform';
 import { rsformsApi } from './api';
 
 export const useProduceStructure = () => {
diff --git a/rsconcept/frontend/src/backend/rsform/useRSForm.tsx b/rsconcept/frontend/src/features/rsform/backend/useRSForm.tsx
similarity index 83%
rename from rsconcept/frontend/src/backend/rsform/useRSForm.tsx
rename to rsconcept/frontend/src/features/rsform/backend/useRSForm.tsx
index b650018a..54946318 100644
--- a/rsconcept/frontend/src/backend/rsform/useRSForm.tsx
+++ b/rsconcept/frontend/src/features/rsform/backend/useRSForm.tsx
@@ -1,10 +1,10 @@
 import { useQuery, useSuspenseQuery } from '@tanstack/react-query';
 
-import { RSFormLoader } from '@/backend/rsform/RSFormLoader';
-import { LibraryItemID, VersionID } from '@/models/library';
+import { LibraryItemID, VersionID } from '@/features/library/models/library';
 
-import { queryClient } from '../queryClient';
+import { queryClient } from '../../../backend/queryClient';
 import { rsformsApi } from './api';
+import { RSFormLoader } from './RSFormLoader';
 
 export function useRSForm({ itemID, version }: { itemID?: LibraryItemID; version?: VersionID }) {
   const { data, isLoading, error } = useQuery({
diff --git a/rsconcept/frontend/src/backend/rsform/useRSForms.tsx b/rsconcept/frontend/src/features/rsform/backend/useRSForms.tsx
similarity index 75%
rename from rsconcept/frontend/src/backend/rsform/useRSForms.tsx
rename to rsconcept/frontend/src/features/rsform/backend/useRSForms.tsx
index 1208abde..2be0090b 100644
--- a/rsconcept/frontend/src/backend/rsform/useRSForms.tsx
+++ b/rsconcept/frontend/src/features/rsform/backend/useRSForms.tsx
@@ -1,10 +1,10 @@
 import { useQueries } from '@tanstack/react-query';
 
-import { RSFormLoader } from '@/backend/rsform/RSFormLoader';
-import { LibraryItemID } from '@/models/library';
+import { LibraryItemID } from '@/features/library/models/library';
 
-import { DELAYS } from '../configuration';
+import { DELAYS } from '../../../backend/configuration';
 import { rsformsApi } from './api';
+import { RSFormLoader } from './RSFormLoader';
 
 export function useRSForms(itemIDs: LibraryItemID[]) {
   const results = useQueries({
diff --git a/rsconcept/frontend/src/backend/rsform/useResetAliases.tsx b/rsconcept/frontend/src/features/rsform/backend/useResetAliases.tsx
similarity index 81%
rename from rsconcept/frontend/src/backend/rsform/useResetAliases.tsx
rename to rsconcept/frontend/src/features/rsform/backend/useResetAliases.tsx
index adbb67ec..9352d4ab 100644
--- a/rsconcept/frontend/src/backend/rsform/useResetAliases.tsx
+++ b/rsconcept/frontend/src/features/rsform/backend/useResetAliases.tsx
@@ -1,8 +1,8 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { useUpdateTimestamp } from '@/backend/library/useUpdateTimestamp';
-import { ossApi } from '@/backend/oss/api';
-import { LibraryItemID } from '@/models/library';
+import { useUpdateTimestamp } from '@/features/library/backend/useUpdateTimestamp';
+import { LibraryItemID } from '@/features/library/models/library';
+import { ossApi } from '@/features/oss/backend/api';
 
 import { rsformsApi } from './api';
 
diff --git a/rsconcept/frontend/src/backend/rsform/useRestoreOrder.tsx b/rsconcept/frontend/src/features/rsform/backend/useRestoreOrder.tsx
similarity index 80%
rename from rsconcept/frontend/src/backend/rsform/useRestoreOrder.tsx
rename to rsconcept/frontend/src/features/rsform/backend/useRestoreOrder.tsx
index cdf58ae6..193ec515 100644
--- a/rsconcept/frontend/src/backend/rsform/useRestoreOrder.tsx
+++ b/rsconcept/frontend/src/features/rsform/backend/useRestoreOrder.tsx
@@ -1,7 +1,7 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { useUpdateTimestamp } from '@/backend/library/useUpdateTimestamp';
-import { LibraryItemID } from '@/models/library';
+import { useUpdateTimestamp } from '@/features/library/backend/useUpdateTimestamp';
+import { LibraryItemID } from '@/features/library/models/library';
 
 import { rsformsApi } from './api';
 
diff --git a/rsconcept/frontend/src/backend/rsform/useUploadTRS.tsx b/rsconcept/frontend/src/features/rsform/backend/useUploadTRS.tsx
similarity index 84%
rename from rsconcept/frontend/src/backend/rsform/useUploadTRS.tsx
rename to rsconcept/frontend/src/features/rsform/backend/useUploadTRS.tsx
index e76a2f25..a47ac633 100644
--- a/rsconcept/frontend/src/backend/rsform/useUploadTRS.tsx
+++ b/rsconcept/frontend/src/features/rsform/backend/useUploadTRS.tsx
@@ -1,8 +1,8 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { libraryApi } from '@/backend/library/api';
-import { ossApi } from '@/backend/oss/api';
-import { ILibraryItem } from '@/models/library';
+import { libraryApi } from '@/features/library/backend/api';
+import { ILibraryItem } from '@/features/library/models/library';
+import { ossApi } from '@/features/oss/backend/api';
 
 import { IRSFormUploadDTO, rsformsApi } from './api';
 
diff --git a/rsconcept/frontend/src/components/info/BadgeConstituenta.tsx b/rsconcept/frontend/src/features/rsform/components/BadgeConstituenta.tsx
similarity index 95%
rename from rsconcept/frontend/src/components/info/BadgeConstituenta.tsx
rename to rsconcept/frontend/src/features/rsform/components/BadgeConstituenta.tsx
index e3dbec93..700bb60e 100644
--- a/rsconcept/frontend/src/components/info/BadgeConstituenta.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/BadgeConstituenta.tsx
@@ -1,11 +1,12 @@
 import clsx from 'clsx';
 
 import { CProps } from '@/components/props';
-import { CstClass, IConstituenta } from '@/models/rsform';
 import { useTooltipsStore } from '@/stores/tooltips';
 import { APP_COLORS, colorFgCstStatus } from '@/styling/color';
 import { globals } from '@/utils/constants';
 
+import { CstClass, IConstituenta } from '../models/rsform';
+
 interface BadgeConstituentaProps extends CProps.Styling {
   /** Prefix for tooltip ID. */
   prefixID?: string;
diff --git a/rsconcept/frontend/src/components/info/BadgeGrammeme.tsx b/rsconcept/frontend/src/features/rsform/components/BadgeGrammeme.tsx
similarity index 94%
rename from rsconcept/frontend/src/components/info/BadgeGrammeme.tsx
rename to rsconcept/frontend/src/features/rsform/components/BadgeGrammeme.tsx
index 2ad49f5f..665fedbf 100644
--- a/rsconcept/frontend/src/components/info/BadgeGrammeme.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/BadgeGrammeme.tsx
@@ -1,9 +1,10 @@
 import clsx from 'clsx';
 
-import { GramData } from '@/models/language';
 import { APP_COLORS, colorFgGrammeme } from '@/styling/color';
 import { labelGrammeme } from '@/utils/labels';
 
+import { GramData } from '../models/language';
+
 interface BadgeGrammemeProps {
   /** Grammeme to display. */
   grammeme: GramData;
diff --git a/rsconcept/frontend/src/components/info/BadgeWordForm.tsx b/rsconcept/frontend/src/features/rsform/components/BadgeWordForm.tsx
similarity index 92%
rename from rsconcept/frontend/src/components/info/BadgeWordForm.tsx
rename to rsconcept/frontend/src/features/rsform/components/BadgeWordForm.tsx
index 36cd20e3..4ecaaa3c 100644
--- a/rsconcept/frontend/src/components/info/BadgeWordForm.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/BadgeWordForm.tsx
@@ -1,5 +1,4 @@
-import { IWordForm } from '@/models/language';
-
+import { IWordForm } from '../models/language';
 import BadgeGrammeme from './BadgeGrammeme';
 
 interface BadgeWordFormProps {
diff --git a/rsconcept/frontend/src/components/info/InfoConstituenta.tsx b/rsconcept/frontend/src/features/rsform/components/InfoConstituenta.tsx
similarity index 94%
rename from rsconcept/frontend/src/components/info/InfoConstituenta.tsx
rename to rsconcept/frontend/src/features/rsform/components/InfoConstituenta.tsx
index bd85ac2e..385ade72 100644
--- a/rsconcept/frontend/src/components/info/InfoConstituenta.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/InfoConstituenta.tsx
@@ -2,10 +2,11 @@ import clsx from 'clsx';
 
 import { IconChild } from '@/components/Icons';
 import { CProps } from '@/components/props';
-import { IConstituenta } from '@/models/rsform';
-import { isBasicConcept } from '@/models/rsformAPI';
 import { labelCstTypification } from '@/utils/labels';
 
+import { IConstituenta } from '../models/rsform';
+import { isBasicConcept } from '../models/rsformAPI';
+
 interface InfoConstituentaProps extends CProps.Div {
   data: IConstituenta;
 }
diff --git a/rsconcept/frontend/src/components/select/MiniSelectorOSS.tsx b/rsconcept/frontend/src/features/rsform/components/MiniSelectorOSS.tsx
similarity index 89%
rename from rsconcept/frontend/src/components/select/MiniSelectorOSS.tsx
rename to rsconcept/frontend/src/features/rsform/components/MiniSelectorOSS.tsx
index 9ecd125d..7b0f07d4 100644
--- a/rsconcept/frontend/src/components/select/MiniSelectorOSS.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/MiniSelectorOSS.tsx
@@ -2,12 +2,12 @@
 
 import clsx from 'clsx';
 
+import { MiniButton } from '@/components/Control';
+import { Dropdown, DropdownButton, useDropdown } from '@/components/Dropdown';
 import { IconOSS } from '@/components/Icons';
+import { Label } from '@/components/Input';
 import { CProps } from '@/components/props';
-import { MiniButton } from '@/components/ui/Control';
-import { Dropdown, DropdownButton, useDropdown } from '@/components/ui/Dropdown';
-import { Label } from '@/components/ui/Input';
-import { ILibraryItemReference } from '@/models/library';
+import { ILibraryItemReference } from '@/features/library/models/library';
 import { prefixes } from '@/utils/constants';
 
 interface MiniSelectorOSSProps extends CProps.Styling {
diff --git a/rsconcept/frontend/src/components/select/PickConstituenta.tsx b/rsconcept/frontend/src/features/rsform/components/PickConstituenta.tsx
similarity index 88%
rename from rsconcept/frontend/src/components/select/PickConstituenta.tsx
rename to rsconcept/frontend/src/features/rsform/components/PickConstituenta.tsx
index bfa2c054..3b57040d 100644
--- a/rsconcept/frontend/src/components/select/PickConstituenta.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/PickConstituenta.tsx
@@ -3,17 +3,18 @@
 import clsx from 'clsx';
 import { useState } from 'react';
 
-import BadgeConstituenta from '@/components/info/BadgeConstituenta';
+import DataTable, { createColumnHelper, IConditionalStyle } from '@/components/DataTable';
 import { CProps } from '@/components/props';
-import DataTable, { createColumnHelper, IConditionalStyle } from '@/components/ui/DataTable';
-import { SearchBar } from '@/components/ui/SearchBar';
-import { NoData } from '@/components/ui/View';
-import { CstMatchMode } from '@/models/miscellaneous';
-import { IConstituenta } from '@/models/rsform';
-import { matchConstituenta } from '@/models/rsformAPI';
+import { SearchBar } from '@/components/shared/SearchBar';
+import { NoData } from '@/components/View';
 import { APP_COLORS } from '@/styling/color';
 import { describeConstituenta } from '@/utils/labels';
 
+import { IConstituenta } from '../models/rsform';
+import { matchConstituenta } from '../models/rsformAPI';
+import { CstMatchMode } from '../stores/cstSearch';
+import BadgeConstituenta from './BadgeConstituenta';
+
 interface PickConstituentaProps extends CProps.Styling {
   id?: string;
   items: IConstituenta[];
diff --git a/rsconcept/frontend/src/components/select/PickMultiConstituenta.tsx b/rsconcept/frontend/src/features/rsform/components/PickMultiConstituenta.tsx
similarity index 91%
rename from rsconcept/frontend/src/components/select/PickMultiConstituenta.tsx
rename to rsconcept/frontend/src/features/rsform/components/PickMultiConstituenta.tsx
index 3a7eb19a..16f2f510 100644
--- a/rsconcept/frontend/src/components/select/PickMultiConstituenta.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/PickMultiConstituenta.tsx
@@ -3,17 +3,17 @@
 import clsx from 'clsx';
 import { useState } from 'react';
 
-import BadgeConstituenta from '@/components/info/BadgeConstituenta';
+import DataTable, { createColumnHelper, RowSelectionState } from '@/components/DataTable';
 import { CProps } from '@/components/props';
-import DataTable, { createColumnHelper, RowSelectionState } from '@/components/ui/DataTable';
-import { SearchBar } from '@/components/ui/SearchBar';
-import { NoData } from '@/components/ui/View';
+import { SearchBar } from '@/components/shared/SearchBar';
+import { NoData } from '@/components/View';
 import { Graph } from '@/models/Graph';
-import { CstMatchMode } from '@/models/miscellaneous';
-import { ConstituentaID, IConstituenta, IRSForm } from '@/models/rsform';
-import { isBasicConcept, matchConstituenta } from '@/models/rsformAPI';
 import { describeConstituenta } from '@/utils/labels';
 
+import { ConstituentaID, IConstituenta, IRSForm } from '../models/rsform';
+import { isBasicConcept, matchConstituenta } from '../models/rsformAPI';
+import { CstMatchMode } from '../stores/cstSearch';
+import BadgeConstituenta from './BadgeConstituenta';
 import ToolbarGraphSelection from './ToolbarGraphSelection';
 
 interface PickMultiConstituentaProps extends CProps.Styling {
diff --git a/rsconcept/frontend/src/components/select/PickSchema.tsx b/rsconcept/frontend/src/features/rsform/components/PickSchema.tsx
similarity index 91%
rename from rsconcept/frontend/src/components/select/PickSchema.tsx
rename to rsconcept/frontend/src/features/rsform/components/PickSchema.tsx
index 89269733..bae4b858 100644
--- a/rsconcept/frontend/src/components/select/PickSchema.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/PickSchema.tsx
@@ -2,19 +2,19 @@ import clsx from 'clsx';
 import { useState } from 'react';
 import { useIntl } from 'react-intl';
 
+import { FlexColumn } from '@/components/Container';
+import { MiniButton } from '@/components/Control';
+import DataTable, { createColumnHelper, IConditionalStyle } from '@/components/DataTable';
+import { Dropdown, useDropdown } from '@/components/Dropdown';
 import { IconClose, IconFolderTree } from '@/components/Icons';
 import { CProps } from '@/components/props';
-import { FlexColumn } from '@/components/ui/Container';
-import { MiniButton } from '@/components/ui/Control';
-import DataTable, { createColumnHelper, IConditionalStyle } from '@/components/ui/DataTable';
-import { Dropdown, useDropdown } from '@/components/ui/Dropdown';
-import { SearchBar } from '@/components/ui/SearchBar';
-import { ILibraryItem, LibraryItemID, LibraryItemType } from '@/models/library';
-import { matchLibraryItem } from '@/models/libraryAPI';
+import { SearchBar } from '@/components/shared/SearchBar';
+import { ILibraryItem, LibraryItemID, LibraryItemType } from '@/features/library/models/library';
+import { matchLibraryItem } from '@/features/library/models/libraryAPI';
 import { APP_COLORS } from '@/styling/color';
 import { prefixes } from '@/utils/constants';
 
-import SelectLocation from './SelectLocation';
+import SelectLocation from '../../library/components/SelectLocation';
 
 interface PickSchemaProps extends CProps.Styling {
   id?: string;
diff --git a/rsconcept/frontend/src/components/select/PickSubstitutions.tsx b/rsconcept/frontend/src/features/rsform/components/PickSubstitutions.tsx
similarity index 94%
rename from rsconcept/frontend/src/components/select/PickSubstitutions.tsx
rename to rsconcept/frontend/src/features/rsform/components/PickSubstitutions.tsx
index 69f058ff..4d6c4f87 100644
--- a/rsconcept/frontend/src/components/select/PickSubstitutions.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/PickSubstitutions.tsx
@@ -4,20 +4,20 @@ import clsx from 'clsx';
 import { useState } from 'react';
 import { toast } from 'react-toastify';
 
+import { MiniButton } from '@/components/Control';
+import DataTable, { createColumnHelper, IConditionalStyle } from '@/components/DataTable';
 import { IconAccept, IconPageLeft, IconPageRight, IconRemove, IconReplace } from '@/components/Icons';
-import BadgeConstituenta from '@/components/info/BadgeConstituenta';
 import { CProps } from '@/components/props';
-import SelectConstituenta from '@/components/select/SelectConstituenta';
-import { MiniButton } from '@/components/ui/Control';
-import DataTable, { createColumnHelper, IConditionalStyle } from '@/components/ui/DataTable';
-import { NoData } from '@/components/ui/View';
-import { ILibraryItem } from '@/models/library';
-import { ICstSubstitute, IMultiSubstitution } from '@/models/oss';
-import { ConstituentaID, IConstituenta, IRSForm } from '@/models/rsform';
+import { NoData } from '@/components/View';
+import SelectLibraryItem from '@/features/library/components/SelectLibraryItem';
+import { ILibraryItem } from '@/features/library/models/library';
+import { ICstSubstitute, IMultiSubstitution } from '@/features/oss/models/oss';
 import { APP_COLORS } from '@/styling/color';
 import { errors } from '@/utils/labels';
 
-import SelectLibraryItem from './SelectLibraryItem';
+import { ConstituentaID, IConstituenta, IRSForm } from '../models/rsform';
+import BadgeConstituenta from './BadgeConstituenta';
+import SelectConstituenta from './SelectConstituenta';
 
 interface PickSubstitutionsProps extends CProps.Styling {
   value: ICstSubstitute[];
diff --git a/rsconcept/frontend/src/components/RSInput/RSInput.tsx b/rsconcept/frontend/src/features/rsform/components/RSInput/RSInput.tsx
similarity index 96%
rename from rsconcept/frontend/src/components/RSInput/RSInput.tsx
rename to rsconcept/frontend/src/features/rsform/components/RSInput/RSInput.tsx
index be583610..77f6e64f 100644
--- a/rsconcept/frontend/src/components/RSInput/RSInput.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/RSInput/RSInput.tsx
@@ -8,13 +8,13 @@ import clsx from 'clsx';
 import { EditorView } from 'codemirror';
 import { forwardRef, useRef } from 'react';
 
-import { Label } from '@/components/ui/Input';
-import { ConstituentaID, IRSForm } from '@/models/rsform';
-import { generateAlias, getCstTypePrefix, guessCstType } from '@/models/rsformAPI';
-import { extractGlobals } from '@/models/rslangAPI';
+import { Label } from '@/components/Input';
 import { usePreferencesStore } from '@/stores/preferences';
 import { APP_COLORS } from '@/styling/color';
 
+import { ConstituentaID, IRSForm } from '../../models/rsform';
+import { generateAlias, getCstTypePrefix, guessCstType } from '../../models/rsformAPI';
+import { extractGlobals } from '../../models/rslangAPI';
 import { ccBracketMatching } from './bracketMatching';
 import { rsNavigation } from './clickNavigation';
 import { RSLanguage } from './rslang';
diff --git a/rsconcept/frontend/src/components/RSInput/bracketMatching.ts b/rsconcept/frontend/src/features/rsform/components/RSInput/bracketMatching.ts
similarity index 100%
rename from rsconcept/frontend/src/components/RSInput/bracketMatching.ts
rename to rsconcept/frontend/src/features/rsform/components/RSInput/bracketMatching.ts
diff --git a/rsconcept/frontend/src/components/RSInput/clickNavigation.ts b/rsconcept/frontend/src/features/rsform/components/RSInput/clickNavigation.ts
similarity index 93%
rename from rsconcept/frontend/src/components/RSInput/clickNavigation.ts
rename to rsconcept/frontend/src/features/rsform/components/RSInput/clickNavigation.ts
index 8379a783..3e798266 100644
--- a/rsconcept/frontend/src/components/RSInput/clickNavigation.ts
+++ b/rsconcept/frontend/src/features/rsform/components/RSInput/clickNavigation.ts
@@ -1,9 +1,10 @@
 import { Extension } from '@codemirror/state';
 import { EditorView } from '@uiw/react-codemirror';
 
-import { ConstituentaID, IRSForm } from '@/models/rsform';
 import { findAliasAt } from '@/utils/codemirror';
 
+import { ConstituentaID, IRSForm } from '../../models/rsform';
+
 const navigationProducer = (schema: IRSForm, onOpenEdit: (cstID: ConstituentaID) => void) => {
   return EditorView.domEventHandlers({
     click: (event: MouseEvent, view: EditorView) => {
diff --git a/rsconcept/frontend/src/components/RSInput/index.tsx b/rsconcept/frontend/src/features/rsform/components/RSInput/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/RSInput/index.tsx
rename to rsconcept/frontend/src/features/rsform/components/RSInput/index.tsx
diff --git a/rsconcept/frontend/src/components/RSInput/rslang/highlight.ts b/rsconcept/frontend/src/features/rsform/components/RSInput/rslang/highlight.ts
similarity index 100%
rename from rsconcept/frontend/src/components/RSInput/rslang/highlight.ts
rename to rsconcept/frontend/src/features/rsform/components/RSInput/rslang/highlight.ts
diff --git a/rsconcept/frontend/src/components/RSInput/rslang/index.ts b/rsconcept/frontend/src/features/rsform/components/RSInput/rslang/index.ts
similarity index 100%
rename from rsconcept/frontend/src/components/RSInput/rslang/index.ts
rename to rsconcept/frontend/src/features/rsform/components/RSInput/rslang/index.ts
diff --git a/rsconcept/frontend/src/components/RSInput/rslang/parser.terms.ts b/rsconcept/frontend/src/features/rsform/components/RSInput/rslang/parser.terms.ts
similarity index 100%
rename from rsconcept/frontend/src/components/RSInput/rslang/parser.terms.ts
rename to rsconcept/frontend/src/features/rsform/components/RSInput/rslang/parser.terms.ts
diff --git a/rsconcept/frontend/src/components/RSInput/rslang/parser.test.ts b/rsconcept/frontend/src/features/rsform/components/RSInput/rslang/parser.test.ts
similarity index 100%
rename from rsconcept/frontend/src/components/RSInput/rslang/parser.test.ts
rename to rsconcept/frontend/src/features/rsform/components/RSInput/rslang/parser.test.ts
diff --git a/rsconcept/frontend/src/components/RSInput/rslang/parser.ts b/rsconcept/frontend/src/features/rsform/components/RSInput/rslang/parser.ts
similarity index 100%
rename from rsconcept/frontend/src/components/RSInput/rslang/parser.ts
rename to rsconcept/frontend/src/features/rsform/components/RSInput/rslang/parser.ts
diff --git a/rsconcept/frontend/src/components/RSInput/rslang/parserAST.terms.ts b/rsconcept/frontend/src/features/rsform/components/RSInput/rslang/parserAST.terms.ts
similarity index 100%
rename from rsconcept/frontend/src/components/RSInput/rslang/parserAST.terms.ts
rename to rsconcept/frontend/src/features/rsform/components/RSInput/rslang/parserAST.terms.ts
diff --git a/rsconcept/frontend/src/components/RSInput/rslang/parserAST.ts b/rsconcept/frontend/src/features/rsform/components/RSInput/rslang/parserAST.ts
similarity index 100%
rename from rsconcept/frontend/src/components/RSInput/rslang/parserAST.ts
rename to rsconcept/frontend/src/features/rsform/components/RSInput/rslang/parserAST.ts
diff --git a/rsconcept/frontend/src/components/RSInput/rslang/rslangAST.grammar b/rsconcept/frontend/src/features/rsform/components/RSInput/rslang/rslangAST.grammar
similarity index 100%
rename from rsconcept/frontend/src/components/RSInput/rslang/rslangAST.grammar
rename to rsconcept/frontend/src/features/rsform/components/RSInput/rslang/rslangAST.grammar
diff --git a/rsconcept/frontend/src/components/RSInput/rslang/rslangFast.grammar b/rsconcept/frontend/src/features/rsform/components/RSInput/rslang/rslangFast.grammar
similarity index 100%
rename from rsconcept/frontend/src/components/RSInput/rslang/rslangFast.grammar
rename to rsconcept/frontend/src/features/rsform/components/RSInput/rslang/rslangFast.grammar
diff --git a/rsconcept/frontend/src/components/RSInput/textEditing.ts b/rsconcept/frontend/src/features/rsform/components/RSInput/textEditing.ts
similarity index 99%
rename from rsconcept/frontend/src/components/RSInput/textEditing.ts
rename to rsconcept/frontend/src/features/rsform/components/RSInput/textEditing.ts
index e972e674..c637d45d 100644
--- a/rsconcept/frontend/src/components/RSInput/textEditing.ts
+++ b/rsconcept/frontend/src/features/rsform/components/RSInput/textEditing.ts
@@ -2,9 +2,10 @@
 
 import { ReactCodeMirrorRef } from '@uiw/react-codemirror';
 
-import { TokenID } from '@/models/rslang';
 import { CodeMirrorWrapper } from '@/utils/codemirror';
 
+import { TokenID } from '../../models/rslang';
+
 export function getSymbolSubstitute(keyCode: string, shiftPressed: boolean): string | undefined {
   // prettier-ignore
   if (shiftPressed) {
diff --git a/rsconcept/frontend/src/components/RSInput/tooltip.ts b/rsconcept/frontend/src/features/rsform/components/RSInput/tooltip.ts
similarity index 93%
rename from rsconcept/frontend/src/components/RSInput/tooltip.ts
rename to rsconcept/frontend/src/features/rsform/components/RSInput/tooltip.ts
index 69545683..ea38c29f 100644
--- a/rsconcept/frontend/src/components/RSInput/tooltip.ts
+++ b/rsconcept/frontend/src/features/rsform/components/RSInput/tooltip.ts
@@ -1,10 +1,11 @@
 import { Extension } from '@codemirror/state';
 import { hoverTooltip } from '@codemirror/view';
 
-import { IRSForm } from '@/models/rsform';
 import { findAliasAt } from '@/utils/codemirror';
 import { domTooltipConstituenta } from '@/utils/codemirror';
 
+import { IRSForm } from '../../models/rsform';
+
 const tooltipProducer = (schema: IRSForm, canClick?: boolean) => {
   return hoverTooltip((view, pos) => {
     const { alias, start, end } = findAliasAt(pos, view.state);
diff --git a/rsconcept/frontend/src/components/RefsInput/RefsInput.tsx b/rsconcept/frontend/src/features/rsform/components/RefsInput/RefsInput.tsx
similarity index 96%
rename from rsconcept/frontend/src/components/RefsInput/RefsInput.tsx
rename to rsconcept/frontend/src/features/rsform/components/RefsInput/RefsInput.tsx
index 86241617..6d9bdc76 100644
--- a/rsconcept/frontend/src/components/RefsInput/RefsInput.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/RefsInput/RefsInput.tsx
@@ -8,15 +8,14 @@ import clsx from 'clsx';
 import { EditorView } from 'codemirror';
 import { forwardRef, useRef, useState } from 'react';
 
-import { Label } from '@/components/ui/Input';
-import { ReferenceType } from '@/models/language';
-import { DialogType } from '@/models/miscellaneous';
-import { ConstituentaID, IRSForm } from '@/models/rsform';
-import { useDialogsStore } from '@/stores/dialogs';
+import { Label } from '@/components/Input';
+import { DialogType, useDialogsStore } from '@/stores/dialogs';
 import { usePreferencesStore } from '@/stores/preferences';
 import { APP_COLORS } from '@/styling/color';
 import { CodeMirrorWrapper } from '@/utils/codemirror';
 
+import { ReferenceType } from '../../models/language';
+import { ConstituentaID, IRSForm } from '../../models/rsform';
 import { refsNavigation } from './clickNavigation';
 import { NaturalLanguage, ReferenceTokens } from './parse';
 import { RefEntity } from './parse/parser.terms';
@@ -99,7 +98,7 @@ const RefsInput = forwardRef<ReactCodeMirrorRef, RefsInputInputProps>(
 
     const showEditReference = useDialogsStore(state => state.showEditReference);
     const activeDialog = useDialogsStore(state => state.active);
-    const isActive = activeDialog === DialogType.EDIT_REFERENCE;
+    const isActive = activeDialog === DialogType.EDIT_REFERENCE; // TODO: reconsider this dependency
 
     const [currentType, setCurrentType] = useState<ReferenceType>(ReferenceType.ENTITY);
     const [refText, setRefText] = useState('');
diff --git a/rsconcept/frontend/src/components/RefsInput/clickNavigation.ts b/rsconcept/frontend/src/features/rsform/components/RefsInput/clickNavigation.ts
similarity index 94%
rename from rsconcept/frontend/src/components/RefsInput/clickNavigation.ts
rename to rsconcept/frontend/src/features/rsform/components/RefsInput/clickNavigation.ts
index 48cbad4b..c556c6ad 100644
--- a/rsconcept/frontend/src/components/RefsInput/clickNavigation.ts
+++ b/rsconcept/frontend/src/features/rsform/components/RefsInput/clickNavigation.ts
@@ -1,9 +1,10 @@
 import { Extension } from '@codemirror/state';
 import { EditorView } from '@uiw/react-codemirror';
 
-import { ConstituentaID, IRSForm } from '@/models/rsform';
 import { findReferenceAt } from '@/utils/codemirror';
 
+import { ConstituentaID, IRSForm } from '../../models/rsform';
+
 const navigationProducer = (schema: IRSForm, onOpenEdit: (cstID: ConstituentaID) => void) => {
   return EditorView.domEventHandlers({
     click: (event: MouseEvent, view: EditorView) => {
diff --git a/rsconcept/frontend/src/components/RefsInput/index.tsx b/rsconcept/frontend/src/features/rsform/components/RefsInput/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/components/RefsInput/index.tsx
rename to rsconcept/frontend/src/features/rsform/components/RefsInput/index.tsx
diff --git a/rsconcept/frontend/src/components/RefsInput/parse/highlight.ts b/rsconcept/frontend/src/features/rsform/components/RefsInput/parse/highlight.ts
similarity index 100%
rename from rsconcept/frontend/src/components/RefsInput/parse/highlight.ts
rename to rsconcept/frontend/src/features/rsform/components/RefsInput/parse/highlight.ts
diff --git a/rsconcept/frontend/src/components/RefsInput/parse/index.ts b/rsconcept/frontend/src/features/rsform/components/RefsInput/parse/index.ts
similarity index 100%
rename from rsconcept/frontend/src/components/RefsInput/parse/index.ts
rename to rsconcept/frontend/src/features/rsform/components/RefsInput/parse/index.ts
diff --git a/rsconcept/frontend/src/components/RefsInput/parse/parser.terms.ts b/rsconcept/frontend/src/features/rsform/components/RefsInput/parse/parser.terms.ts
similarity index 100%
rename from rsconcept/frontend/src/components/RefsInput/parse/parser.terms.ts
rename to rsconcept/frontend/src/features/rsform/components/RefsInput/parse/parser.terms.ts
diff --git a/rsconcept/frontend/src/components/RefsInput/parse/parser.test.ts b/rsconcept/frontend/src/features/rsform/components/RefsInput/parse/parser.test.ts
similarity index 100%
rename from rsconcept/frontend/src/components/RefsInput/parse/parser.test.ts
rename to rsconcept/frontend/src/features/rsform/components/RefsInput/parse/parser.test.ts
diff --git a/rsconcept/frontend/src/components/RefsInput/parse/parser.ts b/rsconcept/frontend/src/features/rsform/components/RefsInput/parse/parser.ts
similarity index 100%
rename from rsconcept/frontend/src/components/RefsInput/parse/parser.ts
rename to rsconcept/frontend/src/features/rsform/components/RefsInput/parse/parser.ts
diff --git a/rsconcept/frontend/src/components/RefsInput/parse/refsText.grammar b/rsconcept/frontend/src/features/rsform/components/RefsInput/parse/refsText.grammar
similarity index 100%
rename from rsconcept/frontend/src/components/RefsInput/parse/refsText.grammar
rename to rsconcept/frontend/src/features/rsform/components/RefsInput/parse/refsText.grammar
diff --git a/rsconcept/frontend/src/components/RefsInput/tooltip.ts b/rsconcept/frontend/src/features/rsform/components/RefsInput/tooltip.ts
similarity index 93%
rename from rsconcept/frontend/src/components/RefsInput/tooltip.ts
rename to rsconcept/frontend/src/features/rsform/components/RefsInput/tooltip.ts
index 7d26b6ca..4a91032f 100644
--- a/rsconcept/frontend/src/components/RefsInput/tooltip.ts
+++ b/rsconcept/frontend/src/features/rsform/components/RefsInput/tooltip.ts
@@ -2,8 +2,6 @@ import { syntaxTree } from '@codemirror/language';
 import { Extension } from '@codemirror/state';
 import { hoverTooltip } from '@codemirror/view';
 
-import { IEntityReference, ISyntacticReference } from '@/models/language';
-import { IRSForm } from '@/models/rsform';
 import {
   domTooltipEntityReference,
   domTooltipSyntacticReference,
@@ -11,6 +9,8 @@ import {
   findReferenceAt
 } from '@/utils/codemirror';
 
+import { IEntityReference, ISyntacticReference } from '../../models/language';
+import { IRSForm } from '../../models/rsform';
 import { RefEntity } from './parse/parser.terms';
 
 export const tooltipProducer = (schema: IRSForm, canClick?: boolean) => {
diff --git a/rsconcept/frontend/src/components/select/SelectConstituenta.tsx b/rsconcept/frontend/src/features/rsform/components/SelectConstituenta.tsx
similarity index 86%
rename from rsconcept/frontend/src/components/select/SelectConstituenta.tsx
rename to rsconcept/frontend/src/features/rsform/components/SelectConstituenta.tsx
index c06bcf15..0abf5fb5 100644
--- a/rsconcept/frontend/src/components/select/SelectConstituenta.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/SelectConstituenta.tsx
@@ -2,13 +2,14 @@
 
 import clsx from 'clsx';
 
+import { SelectSingle } from '@/components/Input';
 import { CProps } from '@/components/props';
-import { SelectSingle } from '@/components/ui/Input';
-import { CstMatchMode } from '@/models/miscellaneous';
-import { ConstituentaID, IConstituenta } from '@/models/rsform';
-import { matchConstituenta } from '@/models/rsformAPI';
 import { describeConstituenta, describeConstituentaTerm } from '@/utils/labels';
 
+import { ConstituentaID, IConstituenta } from '../models/rsform';
+import { matchConstituenta } from '../models/rsformAPI';
+import { CstMatchMode } from '../stores/cstSearch';
+
 interface SelectConstituentaProps extends CProps.Styling {
   value?: IConstituenta;
   onChange: (newValue?: IConstituenta) => void;
diff --git a/rsconcept/frontend/src/features/rsform/components/SelectCstType.tsx b/rsconcept/frontend/src/features/rsform/components/SelectCstType.tsx
new file mode 100644
index 00000000..030e6b62
--- /dev/null
+++ b/rsconcept/frontend/src/features/rsform/components/SelectCstType.tsx
@@ -0,0 +1,31 @@
+import { SelectSingle } from '@/components/Input';
+import { CProps } from '@/components/props';
+import { labelCstType } from '@/utils/labels';
+
+import { CstType } from '../models/rsform';
+
+const SelectorCstType = Object.values(CstType).map(typeStr => ({
+  value: typeStr as CstType,
+  label: labelCstType(typeStr as CstType)
+}));
+
+interface SelectCstTypeProps extends CProps.Styling {
+  id?: string;
+  disabled?: boolean;
+  value: CstType;
+  onChange: (newValue: CstType) => void;
+}
+
+export function SelectCstType({ value, onChange, disabled = false, ...restProps }: SelectCstTypeProps) {
+  return (
+    <SelectSingle
+      id='dlg_cst_type'
+      placeholder='Выберите тип'
+      options={SelectorCstType}
+      value={{ value: value, label: labelCstType(value) }}
+      onChange={data => onChange(data?.value ?? CstType.BASE)}
+      isDisabled={disabled}
+      {...restProps}
+    />
+  );
+}
diff --git a/rsconcept/frontend/src/components/select/SelectMultiGrammeme.tsx b/rsconcept/frontend/src/features/rsform/components/SelectMultiGrammeme.tsx
similarity index 60%
rename from rsconcept/frontend/src/components/select/SelectMultiGrammeme.tsx
rename to rsconcept/frontend/src/features/rsform/components/SelectMultiGrammeme.tsx
index 37f15930..c6484038 100644
--- a/rsconcept/frontend/src/components/select/SelectMultiGrammeme.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/SelectMultiGrammeme.tsx
@@ -1,8 +1,8 @@
+import { SelectMulti, SelectMultiProps } from '@/components/Input';
 import { CProps } from '@/components/props';
-import { SelectMulti, SelectMultiProps } from '@/components/ui/Input';
-import { Grammeme } from '@/models/language';
-import { getCompatibleGrams } from '@/models/languageAPI';
-import { compareGrammemeOptions, IGrammemeOption, SelectorGrammemes } from '@/utils/selectors';
+
+import { Grammeme, IGrammemeOption } from '../models/language';
+import { getCompatibleGrams, grammemeCompare, supportedGrammeOptions } from '../models/languageAPI';
 
 interface SelectMultiGrammemeProps
   extends Omit<SelectMultiProps<IGrammemeOption>, 'value' | 'onChange'>,
@@ -16,13 +16,13 @@ function SelectMultiGrammeme({ value, onChange, ...restProps }: SelectMultiGramm
   const compatible = getCompatibleGrams(
     value.filter(data => Object.values(Grammeme).includes(data.value as Grammeme)).map(data => data.value as Grammeme)
   );
-  const options = SelectorGrammemes.filter(({ value }) => compatible.includes(value as Grammeme));
+  const options = supportedGrammeOptions.filter(({ value }) => compatible.includes(value as Grammeme));
 
   return (
     <SelectMulti
       options={options}
       value={value}
-      onChange={newValue => onChange([...newValue].sort(compareGrammemeOptions))}
+      onChange={newValue => onChange([...newValue].sort((left, right) => grammemeCompare(left.value, right.value)))}
       {...restProps}
     />
   );
diff --git a/rsconcept/frontend/src/components/select/SelectVersion.tsx b/rsconcept/frontend/src/features/rsform/components/SelectVersion.tsx
similarity index 89%
rename from rsconcept/frontend/src/components/select/SelectVersion.tsx
rename to rsconcept/frontend/src/features/rsform/components/SelectVersion.tsx
index 534f5224..010fb8b7 100644
--- a/rsconcept/frontend/src/components/select/SelectVersion.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/SelectVersion.tsx
@@ -2,9 +2,9 @@
 
 import clsx from 'clsx';
 
+import { SelectSingle } from '@/components/Input';
 import { CProps } from '@/components/props';
-import { SelectSingle } from '@/components/ui/Input';
-import { IVersionInfo, VersionID } from '@/models/library';
+import { IVersionInfo, VersionID } from '@/features/library/models/library';
 import { labelVersion } from '@/utils/labels';
 
 interface SelectVersionProps extends CProps.Styling {
diff --git a/rsconcept/frontend/src/features/rsform/components/SelectWordForm.tsx b/rsconcept/frontend/src/features/rsform/components/SelectWordForm.tsx
new file mode 100644
index 00000000..ebb0b132
--- /dev/null
+++ b/rsconcept/frontend/src/features/rsform/components/SelectWordForm.tsx
@@ -0,0 +1,57 @@
+'use client';
+
+import clsx from 'clsx';
+
+import { CProps } from '@/components/props';
+import { prefixes } from '@/utils/constants';
+
+import WordformButton from '../dialogs/DlgEditReference/WordformButton';
+import { Grammeme, IGrammemeOption } from '../models/language';
+import { supportedGrammeOptions } from '../models/languageAPI';
+
+/**
+ * Represents recommended wordforms data.
+ */
+const DefaultWordForms = [
+  { text: 'ед им', example: 'ручка', grams: [Grammeme.sing, Grammeme.nomn] },
+  { text: 'ед род', example: 'ручки', grams: [Grammeme.sing, Grammeme.gent] },
+  { text: 'ед дат', example: 'ручке', grams: [Grammeme.sing, Grammeme.datv] },
+  { text: 'ед вин', example: 'ручку', grams: [Grammeme.sing, Grammeme.accs] },
+  { text: 'ед твор', example: 'ручкой', grams: [Grammeme.sing, Grammeme.ablt] },
+  { text: 'ед пред', example: 'ручке', grams: [Grammeme.sing, Grammeme.loct] },
+
+  { text: 'мн им', example: 'ручки', grams: [Grammeme.plur, Grammeme.nomn] },
+  { text: 'мн род', example: 'ручек', grams: [Grammeme.plur, Grammeme.gent] },
+  { text: 'мн дат', example: 'ручкам', grams: [Grammeme.plur, Grammeme.datv] },
+  { text: 'мн вин', example: 'ручки', grams: [Grammeme.plur, Grammeme.accs] },
+  { text: 'мн твор', example: 'ручками', grams: [Grammeme.plur, Grammeme.ablt] },
+  { text: 'мн пред', example: 'ручках', grams: [Grammeme.plur, Grammeme.loct] }
+] as const;
+
+interface SelectWordFormProps extends CProps.Styling {
+  value: IGrammemeOption[];
+  onChange: React.Dispatch<React.SetStateAction<IGrammemeOption[]>>;
+}
+
+function SelectWordForm({ value, onChange, className, ...restProps }: SelectWordFormProps) {
+  function handleSelect(grams: Grammeme[]) {
+    onChange(supportedGrammeOptions.filter(({ value }) => grams.includes(value as Grammeme)));
+  }
+
+  return (
+    <div className={clsx('text-xs sm:text-sm', className)} {...restProps}>
+      {DefaultWordForms.slice(0, 12).map((data, index) => (
+        <WordformButton
+          key={`${prefixes.wordform_list}${index}`}
+          text={data.text}
+          example={data.example}
+          grams={data.grams}
+          isSelected={data.grams.every(gram => value.find(item => (item.value as Grammeme) === gram))}
+          onSelectGrams={handleSelect}
+        />
+      ))}
+    </div>
+  );
+}
+
+export default SelectWordForm;
diff --git a/rsconcept/frontend/src/components/select/ToolbarGraphSelection.tsx b/rsconcept/frontend/src/features/rsform/components/ToolbarGraphSelection.tsx
similarity index 98%
rename from rsconcept/frontend/src/components/select/ToolbarGraphSelection.tsx
rename to rsconcept/frontend/src/features/rsform/components/ToolbarGraphSelection.tsx
index 139af16e..b3847cb2 100644
--- a/rsconcept/frontend/src/components/select/ToolbarGraphSelection.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/ToolbarGraphSelection.tsx
@@ -1,5 +1,6 @@
 import clsx from 'clsx';
 
+import { MiniButton } from '@/components/Control';
 import {
   IconGraphCollapse,
   IconGraphCore,
@@ -12,7 +13,6 @@ import {
   IconReset
 } from '@/components/Icons';
 import { CProps } from '@/components/props';
-import { MiniButton } from '@/components/ui/Control';
 import { Graph } from '@/models/Graph';
 
 interface ToolbarGraphSelectionProps extends CProps.Styling {
diff --git a/rsconcept/frontend/src/dialogs/DlgCloneLibraryItem.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgCloneLibraryItem.tsx
similarity index 86%
rename from rsconcept/frontend/src/dialogs/DlgCloneLibraryItem.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgCloneLibraryItem.tsx
index 46319326..da4cdb50 100644
--- a/rsconcept/frontend/src/dialogs/DlgCloneLibraryItem.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgCloneLibraryItem.tsx
@@ -4,23 +4,23 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import clsx from 'clsx';
 import { Controller, useForm } from 'react-hook-form';
 
-import { useConceptNavigation } from '@/app/Navigation/NavigationContext';
-import { urls } from '@/app/urls';
-import { useAuthSuspense } from '@/backend/auth/useAuth';
-import { CloneLibraryItemSchema, ICloneLibraryItemDTO } from '@/backend/library/api';
-import { useCloneItem } from '@/backend/library/useCloneItem';
+import { urls, useConceptNavigation } from '@/app';
+import { MiniButton } from '@/components/Control';
 import { VisibilityIcon } from '@/components/DomainIcons';
-import SelectAccessPolicy from '@/components/select/SelectAccessPolicy';
-import SelectLocationContext from '@/components/select/SelectLocationContext';
-import SelectLocationHead from '@/components/select/SelectLocationHead';
-import { MiniButton } from '@/components/ui/Control';
-import { Checkbox, Label, TextArea, TextInput } from '@/components/ui/Input';
-import { ModalForm } from '@/components/ui/Modal';
-import { AccessPolicy, ILibraryItem, LocationHead } from '@/models/library';
-import { cloneTitle, combineLocation } from '@/models/libraryAPI';
-import { ConstituentaID } from '@/models/rsform';
+import { Checkbox, Label, TextArea, TextInput } from '@/components/Input';
+import { ModalForm } from '@/components/Modal';
+import { useAuthSuspense } from '@/features/auth/backend/useAuth';
+import { CloneLibraryItemSchema, ICloneLibraryItemDTO } from '@/features/library/backend/api';
+import { useCloneItem } from '@/features/library/backend/useCloneItem';
+import SelectAccessPolicy from '@/features/library/components/SelectAccessPolicy';
+import SelectLocationContext from '@/features/library/components/SelectLocationContext';
+import SelectLocationHead from '@/features/library/components/SelectLocationHead';
+import { AccessPolicy, ILibraryItem, LocationHead } from '@/features/library/models/library';
+import { cloneTitle, combineLocation } from '@/features/library/models/libraryAPI';
 import { useDialogsStore } from '@/stores/dialogs';
 
+import { ConstituentaID } from '../models/rsform';
+
 export interface DlgCloneLibraryItemProps {
   base: ILibraryItem;
   initialLocation: string;
diff --git a/rsconcept/frontend/src/dialogs/DlgCreateCst/DlgCreateCst.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgCreateCst/DlgCreateCst.tsx
similarity index 86%
rename from rsconcept/frontend/src/dialogs/DlgCreateCst/DlgCreateCst.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgCreateCst/DlgCreateCst.tsx
index 9618185b..9c766c30 100644
--- a/rsconcept/frontend/src/dialogs/DlgCreateCst/DlgCreateCst.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgCreateCst/DlgCreateCst.tsx
@@ -2,13 +2,13 @@
 
 import { useState } from 'react';
 
-import { ICstCreateDTO } from '@/backend/rsform/api';
-import { ModalForm } from '@/components/ui/Modal';
+import { ModalForm } from '@/components/Modal';
 import usePartialUpdate from '@/hooks/usePartialUpdate';
-import { CstType, IRSForm } from '@/models/rsform';
-import { generateAlias } from '@/models/rsformAPI';
 import { useDialogsStore } from '@/stores/dialogs';
 
+import { ICstCreateDTO } from '../../backend/api';
+import { CstType, IRSForm } from '../../models/rsform';
+import { generateAlias } from '../../models/rsformAPI';
 import FormCreateCst from './FormCreateCst';
 
 export interface DlgCreateCstProps {
diff --git a/rsconcept/frontend/src/dialogs/DlgCreateCst/FormCreateCst.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgCreateCst/FormCreateCst.tsx
similarity index 83%
rename from rsconcept/frontend/src/dialogs/DlgCreateCst/FormCreateCst.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgCreateCst/FormCreateCst.tsx
index 57afd43b..cfb218dc 100644
--- a/rsconcept/frontend/src/dialogs/DlgCreateCst/FormCreateCst.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgCreateCst/FormCreateCst.tsx
@@ -3,16 +3,16 @@
 import clsx from 'clsx';
 import { useEffect, useState } from 'react';
 
-import { ICstCreateDTO } from '@/backend/rsform/api';
-import BadgeHelp from '@/components/info/BadgeHelp';
-import RSInput from '@/components/RSInput';
-import { SelectSingle, TextArea, TextInput } from '@/components/ui/Input';
-import { HelpTopic } from '@/models/miscellaneous';
-import { CstType, IRSForm } from '@/models/rsform';
-import { generateAlias, isBaseSet, isBasicConcept, isFunctional, validateNewAlias } from '@/models/rsformAPI';
+import { TextArea, TextInput } from '@/components/Input';
+import BadgeHelp from '@/components/shared/BadgeHelp';
+import { HelpTopic } from '@/features/help/models/helpTopic';
 import { PARAMETER } from '@/utils/constants';
-import { labelCstType } from '@/utils/labels';
-import { SelectorCstType } from '@/utils/selectors';
+
+import { ICstCreateDTO } from '../../backend/api';
+import RSInput from '../../components/RSInput';
+import { SelectCstType } from '../../components/SelectCstType';
+import { CstType, IRSForm } from '../../models/rsform';
+import { generateAlias, isBaseSet, isBasicConcept, isFunctional, validateNewAlias } from '../../models/rsformAPI';
 
 interface FormCreateCstProps {
   schema: IRSForm;
@@ -46,14 +46,7 @@ function FormCreateCst({ schema, state, partialUpdate, setValidated }: FormCreat
   return (
     <>
       <div className='flex items-center self-center gap-3'>
-        <SelectSingle
-          id='dlg_cst_type'
-          placeholder='Выберите тип'
-          className='w-[16rem]'
-          options={SelectorCstType}
-          value={{ value: state.cst_type, label: labelCstType(state.cst_type) }}
-          onChange={data => handleTypeChange(data?.value ?? CstType.BASE)}
-        />
+        <SelectCstType id='dlg_cst_type' className='w-[16rem]' value={state.cst_type} onChange={handleTypeChange} />
         <TextInput
           id='dlg_cst_alias'
           dense
diff --git a/rsconcept/frontend/src/dialogs/DlgCreateCst/index.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgCreateCst/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/dialogs/DlgCreateCst/index.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgCreateCst/index.tsx
diff --git a/rsconcept/frontend/src/dialogs/DlgCreateVersion.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgCreateVersion.tsx
similarity index 82%
rename from rsconcept/frontend/src/dialogs/DlgCreateVersion.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgCreateVersion.tsx
index 495bc6d8..c0fc5b53 100644
--- a/rsconcept/frontend/src/dialogs/DlgCreateVersion.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgCreateVersion.tsx
@@ -4,16 +4,17 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import clsx from 'clsx';
 import { Controller, useForm, useWatch } from 'react-hook-form';
 
-import { IVersionCreateDTO, VersionCreateSchema } from '@/backend/library/api';
-import { useVersionCreate } from '@/backend/library/useVersionCreate';
-import { Checkbox, TextArea, TextInput } from '@/components/ui/Input';
-import { ModalForm } from '@/components/ui/Modal';
-import { IVersionInfo, LibraryItemID, VersionID } from '@/models/library';
-import { nextVersion } from '@/models/libraryAPI';
-import { ConstituentaID } from '@/models/rsform';
+import { Checkbox, TextArea, TextInput } from '@/components/Input';
+import { ModalForm } from '@/components/Modal';
+import { IVersionCreateDTO, VersionCreateSchema } from '@/features/library/backend/api';
+import { useVersionCreate } from '@/features/library/backend/useVersionCreate';
+import { IVersionInfo, LibraryItemID, VersionID } from '@/features/library/models/library';
+import { nextVersion } from '@/features/library/models/libraryAPI';
 import { useDialogsStore } from '@/stores/dialogs';
 import { errors } from '@/utils/labels';
 
+import { ConstituentaID } from '../models/rsform';
+
 export interface DlgCreateVersionProps {
   itemID: LibraryItemID;
   versions: IVersionInfo[];
diff --git a/rsconcept/frontend/src/dialogs/DlgCstTemplate/DlgCstTemplate.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgCstTemplate/DlgCstTemplate.tsx
similarity index 90%
rename from rsconcept/frontend/src/dialogs/DlgCstTemplate/DlgCstTemplate.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgCstTemplate/DlgCstTemplate.tsx
index c5d81ff2..595e17ec 100644
--- a/rsconcept/frontend/src/dialogs/DlgCstTemplate/DlgCstTemplate.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgCstTemplate/DlgCstTemplate.tsx
@@ -3,20 +3,20 @@
 import clsx from 'clsx';
 import { Suspense, useEffect, useState } from 'react';
 
-import { ICstCreateDTO } from '@/backend/rsform/api';
-import { useRSForm } from '@/backend/rsform/useRSForm';
-import Loader from '@/components/ui/Loader';
-import { ModalForm } from '@/components/ui/Modal';
-import { TabLabel, TabList, TabPanel, Tabs } from '@/components/ui/Tabs';
-import FormCreateCst from '@/dialogs/DlgCreateCst/FormCreateCst';
+import { Loader } from '@/components/Loader';
+import { ModalForm } from '@/components/Modal';
+import { TabLabel, TabList, TabPanel, Tabs } from '@/components/Tabs';
+import { HelpTopic } from '@/features/help/models/helpTopic';
 import usePartialUpdate from '@/hooks/usePartialUpdate';
-import { HelpTopic } from '@/models/miscellaneous';
-import { CstType, IRSForm } from '@/models/rsform';
-import { generateAlias, validateNewAlias } from '@/models/rsformAPI';
-import { inferTemplatedType, substituteTemplateArgs } from '@/models/rslangAPI';
 import { useDialogsStore } from '@/stores/dialogs';
 import { prompts } from '@/utils/labels';
 
+import { ICstCreateDTO } from '../../backend/api';
+import { useRSForm } from '../../backend/useRSForm';
+import { CstType, IRSForm } from '../../models/rsform';
+import { generateAlias, validateNewAlias } from '../../models/rsformAPI';
+import { inferTemplatedType, substituteTemplateArgs } from '../../models/rslangAPI';
+import FormCreateCst from '../DlgCreateCst/FormCreateCst';
 import TabArguments, { IArgumentsState } from './TabArguments';
 import TabTemplate, { ITemplateState } from './TabTemplate';
 
diff --git a/rsconcept/frontend/src/dialogs/DlgCstTemplate/TabArguments.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgCstTemplate/TabArguments.tsx
similarity index 93%
rename from rsconcept/frontend/src/dialogs/DlgCstTemplate/TabArguments.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgCstTemplate/TabArguments.tsx
index 9452771f..c2481d03 100644
--- a/rsconcept/frontend/src/dialogs/DlgCstTemplate/TabArguments.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgCstTemplate/TabArguments.tsx
@@ -4,16 +4,17 @@ import { createColumnHelper } from '@tanstack/react-table';
 import clsx from 'clsx';
 import { useEffect, useState } from 'react';
 
+import { MiniButton } from '@/components/Control';
+import DataTable, { IConditionalStyle } from '@/components/DataTable';
 import { IconAccept, IconRemove, IconReset } from '@/components/Icons';
-import RSInput from '@/components/RSInput';
-import PickConstituenta from '@/components/select/PickConstituenta';
-import { MiniButton } from '@/components/ui/Control';
-import DataTable, { IConditionalStyle } from '@/components/ui/DataTable';
-import { NoData } from '@/components/ui/View';
-import { IConstituenta, IRSForm } from '@/models/rsform';
-import { IArgumentValue } from '@/models/rslang';
+import { NoData } from '@/components/View';
 import { APP_COLORS } from '@/styling/color';
 
+import PickConstituenta from '../../components/PickConstituenta';
+import RSInput from '../../components/RSInput';
+import { IConstituenta, IRSForm } from '../../models/rsform';
+import { IArgumentValue } from '../../models/rslang';
+
 interface TabArgumentsProps {
   state: IArgumentsState;
   schema: IRSForm;
diff --git a/rsconcept/frontend/src/dialogs/DlgCstTemplate/TabTemplate.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgCstTemplate/TabTemplate.tsx
similarity index 89%
rename from rsconcept/frontend/src/dialogs/DlgCstTemplate/TabTemplate.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgCstTemplate/TabTemplate.tsx
index 38469648..6595eff6 100644
--- a/rsconcept/frontend/src/dialogs/DlgCstTemplate/TabTemplate.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgCstTemplate/TabTemplate.tsx
@@ -2,12 +2,13 @@
 
 import { Dispatch, useEffect, useState } from 'react';
 
-import { useTemplatesSuspense } from '@/backend/library/useTemplates';
-import RSInput from '@/components/RSInput';
-import PickConstituenta from '@/components/select/PickConstituenta';
-import { SelectSingle, TextArea } from '@/components/ui/Input';
-import { CATEGORY_CST_TYPE, IConstituenta, IRSForm } from '@/models/rsform';
-import { applyFilterCategory } from '@/models/rsformAPI';
+import { SelectSingle, TextArea } from '@/components/Input';
+import { useTemplatesSuspense } from '@/features/library/backend/useTemplates';
+import PickConstituenta from '@/features/rsform/components/PickConstituenta';
+
+import RSInput from '../../components/RSInput';
+import { CATEGORY_CST_TYPE, IConstituenta, IRSForm } from '../../models/rsform';
+import { applyFilterCategory } from '../../models/rsformAPI';
 
 export interface ITemplateState {
   templateID?: number;
diff --git a/rsconcept/frontend/src/dialogs/DlgCstTemplate/index.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgCstTemplate/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/dialogs/DlgCstTemplate/index.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgCstTemplate/index.tsx
diff --git a/rsconcept/frontend/src/dialogs/DlgDeleteCst/DlgDeleteCst.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgDeleteCst/DlgDeleteCst.tsx
similarity index 92%
rename from rsconcept/frontend/src/dialogs/DlgDeleteCst/DlgDeleteCst.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgDeleteCst/DlgDeleteCst.tsx
index 2a437bf6..84ab6aff 100644
--- a/rsconcept/frontend/src/dialogs/DlgDeleteCst/DlgDeleteCst.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgDeleteCst/DlgDeleteCst.tsx
@@ -3,12 +3,12 @@
 import clsx from 'clsx';
 import { useState } from 'react';
 
-import { Checkbox } from '@/components/ui/Input';
-import { ModalForm } from '@/components/ui/Modal';
-import { ConstituentaID, IRSForm } from '@/models/rsform';
+import { Checkbox } from '@/components/Input';
+import { ModalForm } from '@/components/Modal';
 import { useDialogsStore } from '@/stores/dialogs';
 import { prefixes } from '@/utils/constants';
 
+import { ConstituentaID, IRSForm } from '../../models/rsform';
 import ListConstituents from './ListConstituents';
 
 export interface DlgDeleteCstProps {
diff --git a/rsconcept/frontend/src/dialogs/DlgDeleteCst/ListConstituents.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgDeleteCst/ListConstituents.tsx
similarity index 92%
rename from rsconcept/frontend/src/dialogs/DlgDeleteCst/ListConstituents.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgDeleteCst/ListConstituents.tsx
index 5792d2a3..8c717121 100644
--- a/rsconcept/frontend/src/dialogs/DlgDeleteCst/ListConstituents.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgDeleteCst/ListConstituents.tsx
@@ -1,8 +1,9 @@
 import clsx from 'clsx';
 
-import { ConstituentaID, IRSForm } from '@/models/rsform';
 import { labelConstituenta } from '@/utils/labels';
 
+import { ConstituentaID, IRSForm } from '../../models/rsform';
+
 interface ListConstituentsProps {
   list: ConstituentaID[];
   schema: IRSForm;
diff --git a/rsconcept/frontend/src/dialogs/DlgDeleteCst/index.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgDeleteCst/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/dialogs/DlgDeleteCst/index.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgDeleteCst/index.tsx
diff --git a/rsconcept/frontend/src/dialogs/DlgEditEditors/DlgEditEditors.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditEditors/DlgEditEditors.tsx
similarity index 85%
rename from rsconcept/frontend/src/dialogs/DlgEditEditors/DlgEditEditors.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgEditEditors/DlgEditEditors.tsx
index 0530ce5a..6a76fa05 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditEditors/DlgEditEditors.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditEditors/DlgEditEditors.tsx
@@ -3,13 +3,13 @@
 import clsx from 'clsx';
 import { useState } from 'react';
 
-import { useUsers } from '@/backend/users/useUsers';
+import { MiniButton } from '@/components/Control';
 import { IconRemove } from '@/components/Icons';
-import SelectUser from '@/components/select/SelectUser';
-import { MiniButton } from '@/components/ui/Control';
-import { Label } from '@/components/ui/Input';
-import { ModalForm } from '@/components/ui/Modal';
-import { UserID } from '@/models/user';
+import { Label } from '@/components/Input';
+import { ModalForm } from '@/components/Modal';
+import { useUsers } from '@/features/users/backend/useUsers';
+import SelectUser from '@/features/users/components/SelectUser';
+import { UserID } from '@/features/users/models/user';
 import { useDialogsStore } from '@/stores/dialogs';
 
 import TableUsers from './TableUsers';
diff --git a/rsconcept/frontend/src/dialogs/DlgEditEditors/TableUsers.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditEditors/TableUsers.tsx
similarity index 86%
rename from rsconcept/frontend/src/dialogs/DlgEditEditors/TableUsers.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgEditEditors/TableUsers.tsx
index e8bb7ab6..0c043ee8 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditEditors/TableUsers.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditEditors/TableUsers.tsx
@@ -1,9 +1,9 @@
 'use client';
 
+import { MiniButton } from '@/components/Control';
+import DataTable, { createColumnHelper } from '@/components/DataTable';
 import { IconRemove } from '@/components/Icons';
-import { MiniButton } from '@/components/ui/Control';
-import DataTable, { createColumnHelper } from '@/components/ui/DataTable';
-import { IUserInfo, UserID } from '@/models/user';
+import { IUserInfo, UserID } from '@/features/users/models/user';
 
 interface TableUsersProps {
   items: IUserInfo[];
diff --git a/rsconcept/frontend/src/dialogs/DlgEditEditors/index.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditEditors/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/dialogs/DlgEditEditors/index.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgEditEditors/index.tsx
diff --git a/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditReference/DlgEditReference.tsx
similarity index 91%
rename from rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgEditReference/DlgEditReference.tsx
index 539bbb95..149d94cd 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditReference/DlgEditReference.tsx
@@ -3,14 +3,14 @@
 import clsx from 'clsx';
 import { useState } from 'react';
 
-import { ModalForm } from '@/components/ui/Modal';
-import { TabLabel, TabList, TabPanel, Tabs } from '@/components/ui/Tabs';
-import { ReferenceType } from '@/models/language';
-import { HelpTopic } from '@/models/miscellaneous';
-import { IRSForm } from '@/models/rsform';
+import { ModalForm } from '@/components/Modal';
+import { TabLabel, TabList, TabPanel, Tabs } from '@/components/Tabs';
+import { HelpTopic } from '@/features/help/models/helpTopic';
 import { useDialogsStore } from '@/stores/dialogs';
 import { labelReferenceType } from '@/utils/labels';
 
+import { ReferenceType } from '../../models/language';
+import { IRSForm } from '../../models/rsform';
 import TabEntityReference from './TabEntityReference';
 import TabSyntacticReference from './TabSyntacticReference';
 
diff --git a/rsconcept/frontend/src/dialogs/DlgEditReference/TabEntityReference.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditReference/TabEntityReference.tsx
similarity index 80%
rename from rsconcept/frontend/src/dialogs/DlgEditReference/TabEntityReference.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgEditReference/TabEntityReference.tsx
index bc987c37..03b33401 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditReference/TabEntityReference.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditReference/TabEntityReference.tsx
@@ -2,17 +2,16 @@
 
 import { useEffect, useState } from 'react';
 
-import PickConstituenta from '@/components/select/PickConstituenta';
-import SelectMultiGrammeme from '@/components/select/SelectMultiGrammeme';
-import SelectWordForm from '@/components/select/SelectWordForm';
-import { Label, TextInput } from '@/components/ui/Input';
-import { ReferenceType } from '@/models/language';
-import { parseEntityReference, parseGrammemes } from '@/models/languageAPI';
-import { CstMatchMode } from '@/models/miscellaneous';
-import { IConstituenta, IRSForm } from '@/models/rsform';
-import { matchConstituenta } from '@/models/rsformAPI';
-import { IGrammemeOption, SelectorGrammemes } from '@/utils/selectors';
+import { Label, TextInput } from '@/components/Input';
 
+import PickConstituenta from '../../components/PickConstituenta';
+import SelectMultiGrammeme from '../../components/SelectMultiGrammeme';
+import SelectWordForm from '../../components/SelectWordForm';
+import { IGrammemeOption, ReferenceType } from '../../models/language';
+import { parseEntityReference, parseGrammemes, supportedGrammeOptions } from '../../models/languageAPI';
+import { IConstituenta, IRSForm } from '../../models/rsform';
+import { matchConstituenta } from '../../models/rsformAPI';
+import { CstMatchMode } from '../../stores/cstSearch';
 import { IReferenceInputState } from './DlgEditReference';
 
 interface TabEntityReferenceProps {
@@ -34,7 +33,7 @@ function TabEntityReference({ initial, schema, onChangeValid, onChangeReference
       const ref = parseEntityReference(initial.refRaw);
       setAlias(ref.entity);
       const grams = parseGrammemes(ref.form);
-      setSelectedGrams(SelectorGrammemes.filter(data => grams.includes(data.value)));
+      setSelectedGrams(supportedGrammeOptions.filter(data => grams.includes(data.value)));
     }
   }, [initial, schema.items]);
 
diff --git a/rsconcept/frontend/src/dialogs/DlgEditReference/TabSyntacticReference.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditReference/TabSyntacticReference.tsx
similarity index 92%
rename from rsconcept/frontend/src/dialogs/DlgEditReference/TabSyntacticReference.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgEditReference/TabSyntacticReference.tsx
index 2a9f3314..95a9bcd4 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditReference/TabSyntacticReference.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditReference/TabSyntacticReference.tsx
@@ -2,10 +2,10 @@
 
 import { useEffect, useState } from 'react';
 
-import { TextInput } from '@/components/ui/Input';
-import { ReferenceType } from '@/models/language';
-import { parseSyntacticReference } from '@/models/languageAPI';
+import { TextInput } from '@/components/Input';
 
+import { ReferenceType } from '../../models/language';
+import { parseSyntacticReference } from '../../models/languageAPI';
 import { IReferenceInputState } from './DlgEditReference';
 
 interface TabSyntacticReferenceProps {
diff --git a/rsconcept/frontend/src/dialogs/DlgEditReference/WordformButton.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditReference/WordformButton.tsx
similarity index 85%
rename from rsconcept/frontend/src/dialogs/DlgEditReference/WordformButton.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgEditReference/WordformButton.tsx
index 9a87c4f6..39b56582 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditReference/WordformButton.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditReference/WordformButton.tsx
@@ -1,11 +1,11 @@
 import clsx from 'clsx';
 
-import { Grammeme } from '@/models/language';
+import { Grammeme } from '../../models/language';
 
 interface WordformButtonProps {
   text: string;
   example: string;
-  grams: Grammeme[];
+  grams: readonly Grammeme[];
   isSelected?: boolean;
   onSelectGrams: (grams: Grammeme[]) => void;
 }
@@ -15,7 +15,7 @@ function WordformButton({ text, example, grams, onSelectGrams, isSelected, ...re
     <button
       type='button'
       tabIndex={-1}
-      onClick={() => onSelectGrams(grams)}
+      onClick={() => onSelectGrams([...grams])}
       className={clsx(
         'min-w-[4.15rem] sm:min-w-[6.15rem]',
         'p-1',
diff --git a/rsconcept/frontend/src/dialogs/DlgEditReference/index.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditReference/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/dialogs/DlgEditReference/index.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgEditReference/index.tsx
diff --git a/rsconcept/frontend/src/dialogs/DlgEditVersions/DlgEditVersions.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditVersions/DlgEditVersions.tsx
similarity index 86%
rename from rsconcept/frontend/src/dialogs/DlgEditVersions/DlgEditVersions.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgEditVersions/DlgEditVersions.tsx
index 0bd81a3a..ae1d8081 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditVersions/DlgEditVersions.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditVersions/DlgEditVersions.tsx
@@ -5,19 +5,19 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { useMemo } from 'react';
 import { useForm, useWatch } from 'react-hook-form';
 
-import { IVersionUpdateDTO, VersionUpdateSchema } from '@/backend/library/api';
-import { useMutatingLibrary } from '@/backend/library/useMutatingLibrary';
-import { useVersionDelete } from '@/backend/library/useVersionDelete';
-import { useVersionUpdate } from '@/backend/library/useVersionUpdate';
-import { useRSFormSuspense } from '@/backend/rsform/useRSForm';
+import { MiniButton } from '@/components/Control';
 import { IconReset, IconSave } from '@/components/Icons';
-import { MiniButton } from '@/components/ui/Control';
-import { TextArea, TextInput } from '@/components/ui/Input';
-import { ModalView } from '@/components/ui/Modal';
-import { LibraryItemID, VersionID } from '@/models/library';
+import { TextArea, TextInput } from '@/components/Input';
+import { ModalView } from '@/components/Modal';
+import { IVersionUpdateDTO, VersionUpdateSchema } from '@/features/library/backend/api';
+import { useMutatingLibrary } from '@/features/library/backend/useMutatingLibrary';
+import { useVersionDelete } from '@/features/library/backend/useVersionDelete';
+import { useVersionUpdate } from '@/features/library/backend/useVersionUpdate';
+import { LibraryItemID, VersionID } from '@/features/library/models/library';
 import { useDialogsStore } from '@/stores/dialogs';
 import { errors } from '@/utils/labels';
 
+import { useRSFormSuspense } from '../../backend/useRSForm';
 import TableVersions from './TableVersions';
 
 export interface DlgEditVersionsProps {
diff --git a/rsconcept/frontend/src/dialogs/DlgEditVersions/TableVersions.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditVersions/TableVersions.tsx
similarity index 94%
rename from rsconcept/frontend/src/dialogs/DlgEditVersions/TableVersions.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgEditVersions/TableVersions.tsx
index a75ed2fe..e5877ee5 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditVersions/TableVersions.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditVersions/TableVersions.tsx
@@ -3,10 +3,10 @@
 import clsx from 'clsx';
 import { useIntl } from 'react-intl';
 
+import { MiniButton } from '@/components/Control';
+import DataTable, { createColumnHelper, IConditionalStyle } from '@/components/DataTable';
 import { IconRemove } from '@/components/Icons';
-import { MiniButton } from '@/components/ui/Control';
-import DataTable, { createColumnHelper, IConditionalStyle } from '@/components/ui/DataTable';
-import { IVersionInfo, VersionID } from '@/models/library';
+import { IVersionInfo, VersionID } from '@/features/library/models/library';
 import { APP_COLORS } from '@/styling/color';
 
 interface TableVersionsProps {
diff --git a/rsconcept/frontend/src/dialogs/DlgEditVersions/index.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditVersions/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/dialogs/DlgEditVersions/index.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgEditVersions/index.tsx
diff --git a/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditWordForms/DlgEditWordForms.tsx
similarity index 83%
rename from rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgEditWordForms/DlgEditWordForms.tsx
index 63c8ac65..4641f971 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditWordForms/DlgEditWordForms.tsx
@@ -3,23 +3,22 @@
 import clsx from 'clsx';
 import { useEffect, useState } from 'react';
 
-import { useGenerateLexeme } from '@/backend/cctext/useGenerateLexeme';
-import { useInflectText } from '@/backend/cctext/useInflectText';
-import { useIsProcessingCctext } from '@/backend/cctext/useIsProcessingCctext';
-import { useParseText } from '@/backend/cctext/useParseText';
+import { MiniButton } from '@/components/Control';
 import { IconAccept, IconMoveDown, IconMoveLeft, IconMoveRight, IconRemove } from '@/components/Icons';
-import SelectMultiGrammeme from '@/components/select/SelectMultiGrammeme';
-import { MiniButton } from '@/components/ui/Control';
-import { Label, TextArea } from '@/components/ui/Input';
-import { ModalForm } from '@/components/ui/Modal';
-import { Grammeme, IWordForm } from '@/models/language';
-import { parseGrammemes, wordFormEquals } from '@/models/languageAPI';
-import { HelpTopic } from '@/models/miscellaneous';
-import { IConstituenta, TermForm } from '@/models/rsform';
+import { Label, TextArea } from '@/components/Input';
+import { ModalForm } from '@/components/Modal';
+import { HelpTopic } from '@/features/help/models/helpTopic';
 import { useDialogsStore } from '@/stores/dialogs';
 import { prompts } from '@/utils/labels';
-import { IGrammemeOption, SelectorGrammemes, SelectorGrammemesList } from '@/utils/selectors';
 
+import { useGenerateLexeme } from '../../backend/cctext/useGenerateLexeme';
+import { useInflectText } from '../../backend/cctext/useInflectText';
+import { useIsProcessingCctext } from '../../backend/cctext/useIsProcessingCctext';
+import { useParseText } from '../../backend/cctext/useParseText';
+import SelectMultiGrammeme from '../../components/SelectMultiGrammeme';
+import { Grammeme, IGrammemeOption, IWordForm, supportedGrammemes } from '../../models/language';
+import { parseGrammemes, supportedGrammeOptions, wordFormEquals } from '../../models/languageAPI';
+import { IConstituenta, TermForm } from '../../models/rsform';
 import TableWordForms from './TableWordForms';
 
 export interface DlgEditWordFormsProps {
@@ -75,7 +74,7 @@ function DlgEditWordForms() {
 
   function handleSelectForm(form: IWordForm) {
     setInputText(form.text);
-    setInputGrams(SelectorGrammemes.filter(gram => form.grams.find(test => test === gram.value)));
+    setInputGrams(supportedGrammeOptions.filter(gram => form.grams.find(test => test === gram.value)));
   }
 
   function handleInflect() {
@@ -91,7 +90,7 @@ function DlgEditWordForms() {
   function handleParse() {
     parseText({ text: inputText }, response => {
       const grams = parseGrammemes(response.result);
-      setInputGrams(SelectorGrammemes.filter(gram => grams.find(test => test === gram.value)));
+      setInputGrams(supportedGrammeOptions.filter(gram => grams.find(test => test === gram.value)));
     });
   }
 
@@ -106,9 +105,7 @@ function DlgEditWordForms() {
       response.items.forEach(form => {
         const newForm: IWordForm = {
           text: form.text,
-          grams: parseGrammemes(form.grams).filter(gram =>
-            SelectorGrammemesList.find(item => item === (gram as Grammeme))
-          )
+          grams: parseGrammemes(form.grams).filter(gram => supportedGrammemes.find(item => item === (gram as Grammeme)))
         };
         if (newForm.grams.length === 2 && !lexeme.some(test => wordFormEquals(test, newForm))) {
           lexeme.push(newForm);
diff --git a/rsconcept/frontend/src/dialogs/DlgEditWordForms/TableWordForms.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditWordForms/TableWordForms.tsx
similarity index 87%
rename from rsconcept/frontend/src/dialogs/DlgEditWordForms/TableWordForms.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgEditWordForms/TableWordForms.tsx
index 1e2f4a46..46889bef 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditWordForms/TableWordForms.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditWordForms/TableWordForms.tsx
@@ -2,12 +2,13 @@
 
 import clsx from 'clsx';
 
+import { MiniButton } from '@/components/Control';
+import DataTable, { createColumnHelper } from '@/components/DataTable';
 import { IconRemove } from '@/components/Icons';
-import BadgeWordForm from '@/components/info/BadgeWordForm';
-import { MiniButton } from '@/components/ui/Control';
-import DataTable, { createColumnHelper } from '@/components/ui/DataTable';
-import { NoData } from '@/components/ui/View';
-import { IWordForm } from '@/models/language';
+import { NoData } from '@/components/View';
+
+import BadgeWordForm from '../../components/BadgeWordForm';
+import { IWordForm } from '../../models/language';
 
 interface TableWordFormsProps {
   forms: IWordForm[];
diff --git a/rsconcept/frontend/src/dialogs/DlgEditWordForms/index.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgEditWordForms/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/dialogs/DlgEditWordForms/index.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgEditWordForms/index.tsx
diff --git a/rsconcept/frontend/src/dialogs/DlgGraphParams.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgGraphParams.tsx
similarity index 93%
rename from rsconcept/frontend/src/dialogs/DlgGraphParams.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgGraphParams.tsx
index 4a6e8c9d..bfe8dda2 100644
--- a/rsconcept/frontend/src/dialogs/DlgGraphParams.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgGraphParams.tsx
@@ -2,13 +2,13 @@
 
 import { Controller, useForm } from 'react-hook-form';
 
-import { Checkbox } from '@/components/ui/Input';
-import { ModalForm } from '@/components/ui/Modal';
-import { GraphFilterParams } from '@/models/miscellaneous';
-import { CstType } from '@/models/rsform';
-import { useTermGraphStore } from '@/stores/termGraph';
+import { Checkbox } from '@/components/Input';
+import { ModalForm } from '@/components/Modal';
 import { labelCstType } from '@/utils/labels';
 
+import { CstType } from '../models/rsform';
+import { GraphFilterParams, useTermGraphStore } from '../stores/termGraph';
+
 function DlgGraphParams() {
   const params = useTermGraphStore(state => state.filter);
   const setParams = useTermGraphStore(state => state.setFilter);
diff --git a/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/DlgInlineSynthesis.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgInlineSynthesis/DlgInlineSynthesis.tsx
similarity index 89%
rename from rsconcept/frontend/src/dialogs/DlgInlineSynthesis/DlgInlineSynthesis.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgInlineSynthesis/DlgInlineSynthesis.tsx
index 632a87d0..91736459 100644
--- a/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/DlgInlineSynthesis.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgInlineSynthesis/DlgInlineSynthesis.tsx
@@ -3,16 +3,16 @@
 import clsx from 'clsx';
 import { Suspense, useEffect, useState } from 'react';
 
-import { IInlineSynthesisDTO } from '@/backend/rsform/api';
-import { useRSForm } from '@/backend/rsform/useRSForm';
-import Loader from '@/components/ui/Loader';
-import { ModalForm } from '@/components/ui/Modal';
-import { TabLabel, TabList, TabPanel, Tabs } from '@/components/ui/Tabs';
-import { LibraryItemID } from '@/models/library';
-import { ICstSubstitute } from '@/models/oss';
-import { ConstituentaID, IRSForm } from '@/models/rsform';
+import { Loader } from '@/components/Loader';
+import { ModalForm } from '@/components/Modal';
+import { TabLabel, TabList, TabPanel, Tabs } from '@/components/Tabs';
+import { LibraryItemID } from '@/features/library/models/library';
+import { ICstSubstitute } from '@/features/oss/models/oss';
+import { useRSForm } from '@/features/rsform/backend/useRSForm';
 import { useDialogsStore } from '@/stores/dialogs';
 
+import { IInlineSynthesisDTO } from '../../backend/api';
+import { ConstituentaID, IRSForm } from '../../models/rsform';
 import TabConstituents from './TabConstituents';
 import TabSource from './TabSource';
 import TabSubstitutions from './TabSubstitutions';
diff --git a/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/TabConstituents.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgInlineSynthesis/TabConstituents.tsx
similarity index 65%
rename from rsconcept/frontend/src/dialogs/DlgInlineSynthesis/TabConstituents.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgInlineSynthesis/TabConstituents.tsx
index 094ebe6c..b82d4582 100644
--- a/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/TabConstituents.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgInlineSynthesis/TabConstituents.tsx
@@ -1,9 +1,10 @@
 'use client';
 
-import { useRSFormSuspense } from '@/backend/rsform/useRSForm';
-import PickMultiConstituenta from '@/components/select/PickMultiConstituenta';
-import { LibraryItemID } from '@/models/library';
-import { ConstituentaID } from '@/models/rsform';
+import { LibraryItemID } from '@/features/library/models/library';
+
+import { useRSFormSuspense } from '../../backend/useRSForm';
+import PickMultiConstituenta from '../../components/PickMultiConstituenta';
+import { ConstituentaID } from '../../models/rsform';
 
 interface TabConstituentsProps {
   itemID: LibraryItemID;
diff --git a/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/TabSource.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgInlineSynthesis/TabSource.tsx
similarity index 74%
rename from rsconcept/frontend/src/dialogs/DlgInlineSynthesis/TabSource.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgInlineSynthesis/TabSource.tsx
index 72499dcc..7c692fe1 100644
--- a/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/TabSource.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgInlineSynthesis/TabSource.tsx
@@ -1,11 +1,12 @@
 'use client';
 
-import { useLibrary } from '@/backend/library/useLibrary';
-import PickSchema from '@/components/select/PickSchema';
-import { TextInput } from '@/components/ui/Input';
-import { LibraryItemID, LibraryItemType } from '@/models/library';
-import { IRSForm } from '@/models/rsform';
-import { sortItemsForInlineSynthesis } from '@/models/rsformAPI';
+import { TextInput } from '@/components/Input';
+import { useLibrary } from '@/features/library/backend/useLibrary';
+import { LibraryItemID, LibraryItemType } from '@/features/library/models/library';
+
+import PickSchema from '../../components/PickSchema';
+import { IRSForm } from '../../models/rsform';
+import { sortItemsForInlineSynthesis } from '../../models/rsformAPI';
 
 interface TabSourceProps {
   selected?: LibraryItemID;
diff --git a/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/TabSubstitutions.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgInlineSynthesis/TabSubstitutions.tsx
similarity index 70%
rename from rsconcept/frontend/src/dialogs/DlgInlineSynthesis/TabSubstitutions.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgInlineSynthesis/TabSubstitutions.tsx
index 62613800..3be9c1fc 100644
--- a/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/TabSubstitutions.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgInlineSynthesis/TabSubstitutions.tsx
@@ -1,10 +1,11 @@
 'use client';
 
-import { useRSFormSuspense } from '@/backend/rsform/useRSForm';
-import PickSubstitutions from '@/components/select/PickSubstitutions';
-import { LibraryItemID } from '@/models/library';
-import { ICstSubstitute } from '@/models/oss';
-import { ConstituentaID, IRSForm } from '@/models/rsform';
+import { LibraryItemID } from '@/features/library/models/library';
+import { ICstSubstitute } from '@/features/oss/models/oss';
+
+import { useRSFormSuspense } from '../../backend/useRSForm';
+import PickSubstitutions from '../../components/PickSubstitutions';
+import { ConstituentaID, IRSForm } from '../../models/rsform';
 
 interface TabSubstitutionsProps {
   receiver: IRSForm;
diff --git a/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/index.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgInlineSynthesis/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/dialogs/DlgInlineSynthesis/index.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgInlineSynthesis/index.tsx
diff --git a/rsconcept/frontend/src/dialogs/DlgRenameCst.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgRenameCst.tsx
similarity index 68%
rename from rsconcept/frontend/src/dialogs/DlgRenameCst.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgRenameCst.tsx
index 08c3b76b..bafc0ef0 100644
--- a/rsconcept/frontend/src/dialogs/DlgRenameCst.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgRenameCst.tsx
@@ -4,16 +4,16 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import clsx from 'clsx';
 import { useForm, useWatch } from 'react-hook-form';
 
-import { CstRenameSchema, ICstRenameDTO } from '@/backend/rsform/api';
-import { useCstRename } from '@/backend/rsform/useCstRename';
-import { SelectSingle, TextInput } from '@/components/ui/Input';
-import { ModalForm } from '@/components/ui/Modal';
-import { HelpTopic } from '@/models/miscellaneous';
-import { CstType, IConstituenta, IRSForm } from '@/models/rsform';
-import { generateAlias, validateNewAlias } from '@/models/rsformAPI';
+import { TextInput } from '@/components/Input';
+import { ModalForm } from '@/components/Modal';
+import { HelpTopic } from '@/features/help/models/helpTopic';
 import { useDialogsStore } from '@/stores/dialogs';
-import { labelCstType } from '@/utils/labels';
-import { SelectorCstType } from '@/utils/selectors';
+
+import { CstRenameSchema, ICstRenameDTO } from '../backend/api';
+import { useCstRename } from '../backend/useCstRename';
+import { SelectCstType } from '../components/SelectCstType';
+import { CstType, IConstituenta, IRSForm } from '../models/rsform';
+import { generateAlias, validateNewAlias } from '../models/rsformAPI';
 
 export interface DlgRenameCstProps {
   schema: IRSForm;
@@ -57,17 +57,12 @@ function DlgRenameCst() {
       className={clsx('w-[30rem]', 'py-6 pr-3 pl-6 flex gap-3 justify-center items-center ')}
       helpTopic={HelpTopic.CC_CONSTITUENTA}
     >
-      <SelectSingle
+      <SelectCstType
         id='dlg_cst_type'
-        placeholder='Выберите тип'
-        className='min-w-[16rem]'
-        isDisabled={target.is_inherited}
-        options={SelectorCstType}
-        value={{
-          value: cst_type,
-          label: labelCstType(cst_type)
-        }}
-        onChange={data => handleChangeType(data?.value ?? CstType.BASE)}
+        className='w-[16rem]'
+        value={cst_type}
+        onChange={handleChangeType}
+        disabled={target.is_inherited}
       />
       <TextInput
         id='dlg_cst_alias' //
diff --git a/rsconcept/frontend/src/dialogs/DlgShowAST/ASTFlow.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowAST/ASTFlow.tsx
similarity index 97%
rename from rsconcept/frontend/src/dialogs/DlgShowAST/ASTFlow.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgShowAST/ASTFlow.tsx
index b9fc590d..0cf347c4 100644
--- a/rsconcept/frontend/src/dialogs/DlgShowAST/ASTFlow.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowAST/ASTFlow.tsx
@@ -3,8 +3,7 @@
 import { useEffect } from 'react';
 import { Edge, MarkerType, Node, ReactFlow, useEdgesState, useNodesState } from 'reactflow';
 
-import { SyntaxTree } from '@/models/rslang';
-
+import { SyntaxTree } from '../../models/rslang';
 import { ASTEdgeTypes } from './graph/ASTEdgeTypes';
 import { applyLayout } from './graph/ASTLayout';
 import { ASTNodeTypes } from './graph/ASTNodeTypes';
diff --git a/rsconcept/frontend/src/dialogs/DlgShowAST/DlgShowAST.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowAST/DlgShowAST.tsx
similarity index 88%
rename from rsconcept/frontend/src/dialogs/DlgShowAST/DlgShowAST.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgShowAST/DlgShowAST.tsx
index 2cc39a3f..52a4da83 100644
--- a/rsconcept/frontend/src/dialogs/DlgShowAST/DlgShowAST.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowAST/DlgShowAST.tsx
@@ -3,12 +3,12 @@
 import { useState } from 'react';
 import { ReactFlowProvider } from 'reactflow';
 
-import { Overlay } from '@/components/ui/Container';
-import { ModalView } from '@/components/ui/Modal';
-import { HelpTopic } from '@/models/miscellaneous';
-import { SyntaxTree } from '@/models/rslang';
+import { Overlay } from '@/components/Container';
+import { ModalView } from '@/components/Modal';
+import { HelpTopic } from '@/features/help/models/helpTopic';
 import { useDialogsStore } from '@/stores/dialogs';
 
+import { SyntaxTree } from '../../models/rslang';
 import ASTFlow from './ASTFlow';
 
 export interface DlgShowASTProps {
diff --git a/rsconcept/frontend/src/dialogs/DlgShowAST/graph/ASTEdgeTypes.ts b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowAST/graph/ASTEdgeTypes.ts
similarity index 65%
rename from rsconcept/frontend/src/dialogs/DlgShowAST/graph/ASTEdgeTypes.ts
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgShowAST/graph/ASTEdgeTypes.ts
index 2e9588a2..d4370d89 100644
--- a/rsconcept/frontend/src/dialogs/DlgShowAST/graph/ASTEdgeTypes.ts
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowAST/graph/ASTEdgeTypes.ts
@@ -1,6 +1,6 @@
 import { EdgeTypes } from 'reactflow';
 
-import DynamicEdge from '@/components/graph/DynamicEdge';
+import DynamicEdge from '@/components/Flow/DynamicEdge';
 
 export const ASTEdgeTypes: EdgeTypes = {
   dynamic: DynamicEdge
diff --git a/rsconcept/frontend/src/dialogs/DlgShowAST/graph/ASTLayout.ts b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowAST/graph/ASTLayout.ts
similarity index 93%
rename from rsconcept/frontend/src/dialogs/DlgShowAST/graph/ASTLayout.ts
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgShowAST/graph/ASTLayout.ts
index 8a124cf5..d2fc57b0 100644
--- a/rsconcept/frontend/src/dialogs/DlgShowAST/graph/ASTLayout.ts
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowAST/graph/ASTLayout.ts
@@ -1,9 +1,10 @@
 import dagre from '@dagrejs/dagre';
 import { Edge, Node } from 'reactflow';
 
-import { ISyntaxTreeNode } from '@/models/rslang';
 import { PARAMETER } from '@/utils/constants';
 
+import { ISyntaxTreeNode } from '../../../models/rslang';
+
 export function applyLayout(nodes: Node<ISyntaxTreeNode>[], edges: Edge[]) {
   const dagreGraph = new dagre.graphlib.Graph().setDefaultEdgeLabel(() => ({}));
   dagreGraph.setGraph({
diff --git a/rsconcept/frontend/src/dialogs/DlgShowAST/graph/ASTNode.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowAST/graph/ASTNode.tsx
similarity index 96%
rename from rsconcept/frontend/src/dialogs/DlgShowAST/graph/ASTNode.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgShowAST/graph/ASTNode.tsx
index a5fcb880..56ecde16 100644
--- a/rsconcept/frontend/src/dialogs/DlgShowAST/graph/ASTNode.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowAST/graph/ASTNode.tsx
@@ -2,10 +2,11 @@
 
 import { Handle, Position } from 'reactflow';
 
-import { ISyntaxTreeNode } from '@/models/rslang';
 import { APP_COLORS, colorBgSyntaxTree } from '@/styling/color';
 import { labelSyntaxTree } from '@/utils/labels';
 
+import { ISyntaxTreeNode } from '../../../models/rslang';
+
 const FONT_SIZE_MAX = 14;
 const FONT_SIZE_MED = 12;
 
diff --git a/rsconcept/frontend/src/dialogs/DlgShowAST/graph/ASTNodeTypes.ts b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowAST/graph/ASTNodeTypes.ts
similarity index 100%
rename from rsconcept/frontend/src/dialogs/DlgShowAST/graph/ASTNodeTypes.ts
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgShowAST/graph/ASTNodeTypes.ts
diff --git a/rsconcept/frontend/src/dialogs/DlgShowAST/index.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowAST/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/dialogs/DlgShowAST/index.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgShowAST/index.tsx
diff --git a/rsconcept/frontend/src/dialogs/DlgShowQR.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowQR.tsx
similarity index 91%
rename from rsconcept/frontend/src/dialogs/DlgShowQR.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgShowQR.tsx
index 0a8aeefb..ee4f5f14 100644
--- a/rsconcept/frontend/src/dialogs/DlgShowQR.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowQR.tsx
@@ -3,7 +3,7 @@
 import clsx from 'clsx';
 import { QRCodeSVG } from 'qrcode.react';
 
-import { ModalView } from '@/components/ui/Modal';
+import { ModalView } from '@/components/Modal';
 import { useDialogsStore } from '@/stores/dialogs';
 
 export interface DlgShowQRProps {
diff --git a/rsconcept/frontend/src/dialogs/DlgShowTypeGraph/DlgShowTypeGraph.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/DlgShowTypeGraph.tsx
similarity index 84%
rename from rsconcept/frontend/src/dialogs/DlgShowTypeGraph/DlgShowTypeGraph.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/DlgShowTypeGraph.tsx
index 45940fe5..63a287a8 100644
--- a/rsconcept/frontend/src/dialogs/DlgShowTypeGraph/DlgShowTypeGraph.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/DlgShowTypeGraph.tsx
@@ -3,13 +3,13 @@
 import { toast } from 'react-toastify';
 import { ReactFlowProvider } from 'reactflow';
 
-import { ModalView } from '@/components/ui/Modal';
-import { HelpTopic } from '@/models/miscellaneous';
-import { ITypeInfo } from '@/models/rslang';
-import { TMGraph } from '@/models/TMGraph';
+import { ModalView } from '@/components/Modal';
+import { HelpTopic } from '@/features/help/models/helpTopic';
 import { useDialogsStore } from '@/stores/dialogs';
 import { errors } from '@/utils/labels';
 
+import { ITypeInfo } from '../../models/rslang';
+import { TMGraph } from '../../models/TMGraph';
 import MGraphFlow from './MGraphFlow';
 
 export interface DlgShowTypeGraphProps {
diff --git a/rsconcept/frontend/src/dialogs/DlgShowTypeGraph/MGraphFlow.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/MGraphFlow.tsx
similarity index 97%
rename from rsconcept/frontend/src/dialogs/DlgShowTypeGraph/MGraphFlow.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/MGraphFlow.tsx
index 41a1caff..3a78d7e9 100644
--- a/rsconcept/frontend/src/dialogs/DlgShowTypeGraph/MGraphFlow.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/MGraphFlow.tsx
@@ -3,8 +3,7 @@
 import { useEffect } from 'react';
 import { Edge, ReactFlow, useEdgesState, useNodesState } from 'reactflow';
 
-import { TMGraph } from '@/models/TMGraph';
-
+import { TMGraph } from '../../models/TMGraph';
 import { TMGraphEdgeTypes } from './graph/MGraphEdgeTypes';
 import { applyLayout } from './graph/MGraphLayout';
 import { TMGraphNodeTypes } from './graph/MGraphNodeTypes';
diff --git a/rsconcept/frontend/src/dialogs/DlgShowTypeGraph/graph/BooleanEdge.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/graph/BooleanEdge.tsx
similarity index 55%
rename from rsconcept/frontend/src/dialogs/DlgShowTypeGraph/graph/BooleanEdge.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/graph/BooleanEdge.tsx
index ef05b56b..2d32bacf 100644
--- a/rsconcept/frontend/src/dialogs/DlgShowTypeGraph/graph/BooleanEdge.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/graph/BooleanEdge.tsx
@@ -1,8 +1,8 @@
 import { StraightEdge } from 'reactflow';
 
-import { MGraphEdgeInternal } from '@/models/miscellaneous';
+import { MGraphEdgeProps } from './CartesianEdge';
 
-function BooleanEdge(props: MGraphEdgeInternal) {
+function BooleanEdge(props: MGraphEdgeProps) {
   return (
     <>
       <StraightEdge {...props} />
diff --git a/rsconcept/frontend/src/dialogs/DlgShowTypeGraph/graph/CartesianEdge.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/graph/CartesianEdge.tsx
similarity index 54%
rename from rsconcept/frontend/src/dialogs/DlgShowTypeGraph/graph/CartesianEdge.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/graph/CartesianEdge.tsx
index 7f236d0c..7e77f686 100644
--- a/rsconcept/frontend/src/dialogs/DlgShowTypeGraph/graph/CartesianEdge.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/graph/CartesianEdge.tsx
@@ -1,9 +1,15 @@
-import { SimpleBezierEdge } from 'reactflow';
+import { EdgeProps, SimpleBezierEdge } from 'reactflow';
 
-import { MGraphEdgeInternal } from '@/models/miscellaneous';
 import { APP_COLORS } from '@/styling/color';
 
-function CartesianEdge({ data, ...restProps }: MGraphEdgeInternal) {
+/**
+ * Represents graph TMGraph edge internal data.
+ */
+export interface MGraphEdgeProps extends EdgeProps {
+  data?: { indices: number[] };
+}
+
+function CartesianEdge({ data, ...restProps }: MGraphEdgeProps) {
   return (
     <>
       <SimpleBezierEdge
diff --git a/rsconcept/frontend/src/dialogs/DlgShowTypeGraph/graph/MGraphEdgeTypes.ts b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/graph/MGraphEdgeTypes.ts
similarity index 100%
rename from rsconcept/frontend/src/dialogs/DlgShowTypeGraph/graph/MGraphEdgeTypes.ts
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/graph/MGraphEdgeTypes.ts
diff --git a/rsconcept/frontend/src/dialogs/DlgShowTypeGraph/graph/MGraphLayout.ts b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/graph/MGraphLayout.ts
similarity index 94%
rename from rsconcept/frontend/src/dialogs/DlgShowTypeGraph/graph/MGraphLayout.ts
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/graph/MGraphLayout.ts
index fd7afcc3..038de3d9 100644
--- a/rsconcept/frontend/src/dialogs/DlgShowTypeGraph/graph/MGraphLayout.ts
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/graph/MGraphLayout.ts
@@ -1,7 +1,7 @@
 import dagre from '@dagrejs/dagre';
 import { Edge, Node } from 'reactflow';
 
-import { TMGraphNode } from '@/models/TMGraph';
+import { TMGraphNode } from '@/features/rsform/models/TMGraph';
 
 const NODE_WIDTH = 44;
 const NODE_HEIGHT = 44;
diff --git a/rsconcept/frontend/src/dialogs/DlgShowTypeGraph/graph/MGraphNode.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/graph/MGraphNode.tsx
similarity index 95%
rename from rsconcept/frontend/src/dialogs/DlgShowTypeGraph/graph/MGraphNode.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/graph/MGraphNode.tsx
index 0369f16c..e5f98551 100644
--- a/rsconcept/frontend/src/dialogs/DlgShowTypeGraph/graph/MGraphNode.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/graph/MGraphNode.tsx
@@ -2,7 +2,7 @@
 
 import { Handle, Position } from 'reactflow';
 
-import { TMGraphNode } from '@/models/TMGraph';
+import { TMGraphNode } from '@/features/rsform/models/TMGraph';
 import { APP_COLORS, colorBgTMGraphNode } from '@/styling/color';
 import { globals } from '@/utils/constants';
 
diff --git a/rsconcept/frontend/src/dialogs/DlgShowTypeGraph/graph/MGraphNodeTypes.ts b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/graph/MGraphNodeTypes.ts
similarity index 100%
rename from rsconcept/frontend/src/dialogs/DlgShowTypeGraph/graph/MGraphNodeTypes.ts
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/graph/MGraphNodeTypes.ts
diff --git a/rsconcept/frontend/src/dialogs/DlgShowTypeGraph/index.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/dialogs/DlgShowTypeGraph/index.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/index.tsx
diff --git a/rsconcept/frontend/src/dialogs/DlgSubstituteCst.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgSubstituteCst.tsx
similarity index 79%
rename from rsconcept/frontend/src/dialogs/DlgSubstituteCst.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgSubstituteCst.tsx
index ec849a97..828c67fa 100644
--- a/rsconcept/frontend/src/dialogs/DlgSubstituteCst.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgSubstituteCst.tsx
@@ -3,13 +3,14 @@
 import clsx from 'clsx';
 import { useState } from 'react';
 
-import PickSubstitutions from '@/components/select/PickSubstitutions';
-import { ModalForm } from '@/components/ui/Modal';
-import { HelpTopic } from '@/models/miscellaneous';
-import { ICstSubstitute, ICstSubstitutions } from '@/models/oss';
-import { IRSForm } from '@/models/rsform';
+import { ModalForm } from '@/components/Modal';
+import { HelpTopic } from '@/features/help/models/helpTopic';
+import { ICstSubstitute, ICstSubstitutions } from '@/features/oss/models/oss';
+import PickSubstitutions from '@/features/rsform/components/PickSubstitutions';
 import { useDialogsStore } from '@/stores/dialogs';
 
+import { IRSForm } from '../models/rsform';
+
 export interface DlgSubstituteCstProps {
   schema: IRSForm;
   onSubstitute: (data: ICstSubstitutions) => void;
diff --git a/rsconcept/frontend/src/dialogs/DlgUploadRSForm.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgUploadRSForm.tsx
similarity index 86%
rename from rsconcept/frontend/src/dialogs/DlgUploadRSForm.tsx
rename to rsconcept/frontend/src/features/rsform/dialogs/DlgUploadRSForm.tsx
index f78498ec..4b5c5e48 100644
--- a/rsconcept/frontend/src/dialogs/DlgUploadRSForm.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgUploadRSForm.tsx
@@ -2,10 +2,10 @@
 
 import { useState } from 'react';
 
-import { useUploadTRS } from '@/backend/rsform/useUploadTRS';
-import { Checkbox, FileInput } from '@/components/ui/Input';
-import { ModalForm } from '@/components/ui/Modal';
-import { LibraryItemID } from '@/models/library';
+import { Checkbox, FileInput } from '@/components/Input';
+import { ModalForm } from '@/components/Modal';
+import { LibraryItemID } from '@/features/library/models/library';
+import { useUploadTRS } from '@/features/rsform/backend/useUploadTRS';
 import { useDialogsStore } from '@/stores/dialogs';
 import { EXTEOR_TRS_FILE } from '@/utils/constants';
 
diff --git a/rsconcept/frontend/src/models/TMGraph.test.ts b/rsconcept/frontend/src/features/rsform/models/TMGraph.test.ts
similarity index 100%
rename from rsconcept/frontend/src/models/TMGraph.test.ts
rename to rsconcept/frontend/src/features/rsform/models/TMGraph.test.ts
diff --git a/rsconcept/frontend/src/models/TMGraph.ts b/rsconcept/frontend/src/features/rsform/models/TMGraph.ts
similarity index 100%
rename from rsconcept/frontend/src/models/TMGraph.ts
rename to rsconcept/frontend/src/features/rsform/models/TMGraph.ts
diff --git a/rsconcept/frontend/src/models/language.ts b/rsconcept/frontend/src/features/rsform/models/language.ts
similarity index 93%
rename from rsconcept/frontend/src/models/language.ts
rename to rsconcept/frontend/src/features/rsform/models/language.ts
index 7dbc3811..c56a14dd 100644
--- a/rsconcept/frontend/src/models/language.ts
+++ b/rsconcept/frontend/src/features/rsform/models/language.ts
@@ -214,6 +214,24 @@ export interface IWordForm {
   grams: GramData[];
 }
 
+/**
+ * Represents list of {@link Grammeme}s available in reference construction.
+ */
+// prettier-ignore
+export const supportedGrammemes = [
+  Grammeme.sing, Grammeme.plur,
+  Grammeme.nomn, Grammeme.gent, Grammeme.datv,
+  Grammeme.accs, Grammeme.ablt, Grammeme.loct,
+];
+
+/**
+ * Represents single option for {@link Grammeme} selector.
+ */
+export interface IGrammemeOption {
+  value: GramData;
+  label: string;
+}
+
 // ====== Reference resolution =====
 
 /**
diff --git a/rsconcept/frontend/src/models/languageAPI.test.ts b/rsconcept/frontend/src/features/rsform/models/languageAPI.test.ts
similarity index 100%
rename from rsconcept/frontend/src/models/languageAPI.test.ts
rename to rsconcept/frontend/src/features/rsform/models/languageAPI.test.ts
diff --git a/rsconcept/frontend/src/models/languageAPI.ts b/rsconcept/frontend/src/features/rsform/models/languageAPI.ts
similarity index 91%
rename from rsconcept/frontend/src/models/languageAPI.ts
rename to rsconcept/frontend/src/features/rsform/models/languageAPI.ts
index e3ef33ba..ae592a9d 100644
--- a/rsconcept/frontend/src/models/languageAPI.ts
+++ b/rsconcept/frontend/src/features/rsform/models/languageAPI.ts
@@ -2,14 +2,18 @@
  * Module: Natural language model API.
  */
 
+import { labelGrammeme } from '@/utils/labels';
+
 import {
   GramData,
   Grammeme,
   GrammemeGroups,
   IEntityReference,
+  IGrammemeOption,
   ISyntacticReference,
   IWordForm,
   NounGrams,
+  supportedGrammemes,
   VerbGrams
 } from './language';
 
@@ -116,3 +120,11 @@ export function parseSyntacticReference(text: string): ISyntacticReference {
     nominal: blocks[1].trim()
   };
 }
+
+/**
+ * Represents options for {@link Grammeme} selector.
+ */
+export const supportedGrammeOptions: IGrammemeOption[] = supportedGrammemes.map(gram => ({
+  value: gram,
+  label: labelGrammeme(gram)
+}));
diff --git a/rsconcept/frontend/src/models/rsform.ts b/rsconcept/frontend/src/features/rsform/models/rsform.ts
similarity index 98%
rename from rsconcept/frontend/src/models/rsform.ts
rename to rsconcept/frontend/src/features/rsform/models/rsform.ts
index e27963ba..9dd0fd18 100644
--- a/rsconcept/frontend/src/models/rsform.ts
+++ b/rsconcept/frontend/src/features/rsform/models/rsform.ts
@@ -2,9 +2,9 @@
  * Module: Models for formal representation for systems of concepts.
  */
 
+import { ILibraryItemReference, ILibraryItemVersioned, LibraryItemID } from '@/features/library/models/library';
 import { Graph } from '@/models/Graph';
 
-import { ILibraryItemReference, ILibraryItemVersioned, LibraryItemID } from './library';
 import { IArgumentInfo, ParsingStatus, ValueClass } from './rslang';
 
 /**
diff --git a/rsconcept/frontend/src/models/rsformAPI.ts b/rsconcept/frontend/src/features/rsform/models/rsformAPI.ts
similarity index 98%
rename from rsconcept/frontend/src/models/rsformAPI.ts
rename to rsconcept/frontend/src/features/rsform/models/rsformAPI.ts
index 5fc297e4..f674423f 100644
--- a/rsconcept/frontend/src/models/rsformAPI.ts
+++ b/rsconcept/frontend/src/features/rsform/models/rsformAPI.ts
@@ -2,10 +2,10 @@
  * Module: API for formal representation for systems of concepts.
  */
 
+import { BASIC_SCHEMAS, ILibraryItem } from '@/features/library/models/library';
 import { TextMatcher } from '@/utils/utils';
 
-import { BASIC_SCHEMAS, ILibraryItem } from './library';
-import { CstMatchMode } from './miscellaneous';
+import { CstMatchMode } from '../stores/cstSearch';
 import { CATEGORY_CST_TYPE, CstClass, CstType, ExpressionStatus, IConstituenta, IRSForm } from './rsform';
 import { ParsingStatus, ValueClass } from './rslang';
 
diff --git a/rsconcept/frontend/src/models/rslang.ts b/rsconcept/frontend/src/features/rsform/models/rslang.ts
similarity index 100%
rename from rsconcept/frontend/src/models/rslang.ts
rename to rsconcept/frontend/src/features/rsform/models/rslang.ts
diff --git a/rsconcept/frontend/src/models/rslangAPI.test.ts b/rsconcept/frontend/src/features/rsform/models/rslangAPI.test.ts
similarity index 100%
rename from rsconcept/frontend/src/models/rslangAPI.test.ts
rename to rsconcept/frontend/src/features/rsform/models/rslangAPI.test.ts
diff --git a/rsconcept/frontend/src/models/rslangAPI.ts b/rsconcept/frontend/src/features/rsform/models/rslangAPI.ts
similarity index 90%
rename from rsconcept/frontend/src/models/rslangAPI.ts
rename to rsconcept/frontend/src/features/rsform/models/rslangAPI.ts
index 4cac6b18..a046b216 100644
--- a/rsconcept/frontend/src/models/rslangAPI.ts
+++ b/rsconcept/frontend/src/features/rsform/models/rslangAPI.ts
@@ -2,8 +2,6 @@
  * Module: API for RSLanguage.
  */
 
-import { applyPattern } from '@/utils/utils';
-
 import { CstType } from './rsform';
 import { AliasMapping, IArgumentValue, IRSErrorDescription, RSErrorClass, RSErrorType } from './rslang';
 
@@ -14,6 +12,29 @@ const COMPLEX_SYMBOLS_REGEXP = /[∀∃×ℬ;|:]/g;
 const TYPIFICATION_SET = /^ℬ+\([ℬ\(X\d+\)×]*\)$/g;
 // cspell:enable
 
+/**
+ * Text substitution guided by mapping and regular expression.
+ */
+export function applyPattern(text: string, mapping: AliasMapping, pattern: RegExp): string {
+  if (text === '' || pattern === null) {
+    return text;
+  }
+  let posInput = 0;
+  let output = '';
+  const patternMatches = text.matchAll(pattern);
+  for (const segment of patternMatches) {
+    const entity = segment[0];
+    const start = segment.index ?? 0;
+    if (entity in mapping) {
+      output += text.substring(posInput, start);
+      output += mapping[entity];
+      posInput = start + segment[0].length;
+    }
+  }
+  output += text.substring(posInput);
+  return output;
+}
+
 /**
  * Extracts global variable names from a given expression.
  */
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx
similarity index 97%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx
index 75e3a47a..ac4df471 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx
@@ -3,8 +3,6 @@
 import clsx from 'clsx';
 import { useState } from 'react';
 
-import { useCstUpdate } from '@/backend/rsform/useCstUpdate';
-import { useMutatingRSForm } from '@/backend/rsform/useMutatingRSForm';
 import useWindowSize from '@/hooks/useWindowSize';
 import { useMainHeight } from '@/stores/appLayout';
 import { useDialogsStore } from '@/stores/dialogs';
@@ -13,6 +11,8 @@ import { usePreferencesStore } from '@/stores/preferences';
 import { globals } from '@/utils/constants';
 import { promptUnsaved } from '@/utils/utils';
 
+import { useCstUpdate } from '../../../backend/useCstUpdate';
+import { useMutatingRSForm } from '../../../backend/useMutatingRSForm';
 import { useRSEdit } from '../RSEditContext';
 import ViewConstituents from '../ViewConstituents';
 import EditorControls from './EditorControls';
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorControls.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/EditorControls.tsx
similarity index 89%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorControls.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/EditorControls.tsx
index f4c7e893..b99a3054 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorControls.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/EditorControls.tsx
@@ -1,14 +1,14 @@
 import clsx from 'clsx';
 
-import { useMutatingRSForm } from '@/backend/rsform/useMutatingRSForm';
+import { Overlay } from '@/components/Container';
+import { MiniButton } from '@/components/Control';
 import { IconEdit } from '@/components/Icons';
-import { Overlay } from '@/components/ui/Container';
-import { MiniButton } from '@/components/ui/Control';
-import { IConstituenta } from '@/models/rsform';
 import { useDialogsStore } from '@/stores/dialogs';
 import { useModificationStore } from '@/stores/modification';
 import { tooltips } from '@/utils/labels';
 
+import { useMutatingRSForm } from '../../../backend/useMutatingRSForm';
+import { IConstituenta } from '../../../models/rsform';
 import { useRSEdit } from '../RSEditContext';
 
 interface EditorControlsProps {
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
similarity index 93%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
index 99b162bc..3f55f7ac 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
@@ -6,23 +6,23 @@ import { useEffect, useLayoutEffect, useMemo, useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 import { toast } from 'react-toastify';
 
-import { CstUpdateSchema, ICstUpdateDTO } from '@/backend/rsform/api';
-import { useCstUpdate } from '@/backend/rsform/useCstUpdate';
-import { useMutatingRSForm } from '@/backend/rsform/useMutatingRSForm';
+import { Overlay } from '@/components/Container';
+import { SubmitButton } from '@/components/Control';
 import { IconChild, IconPredecessor, IconSave } from '@/components/Icons';
+import { TextArea } from '@/components/Input';
 import { CProps } from '@/components/props';
-import RefsInput from '@/components/RefsInput';
-import { Overlay } from '@/components/ui/Container';
-import { SubmitButton } from '@/components/ui/Control';
-import { TextArea } from '@/components/ui/Input';
-import { Indicator } from '@/components/ui/View';
-import { ConstituentaID, CstType, IConstituenta, IRSForm } from '@/models/rsform';
-import { isBaseSet, isBasicConcept, isFunctional } from '@/models/rsformAPI';
-import { IExpressionParse, ParsingStatus } from '@/models/rslang';
+import { Indicator } from '@/components/View';
 import { useDialogsStore } from '@/stores/dialogs';
 import { useModificationStore } from '@/stores/modification';
 import { errors, labelCstTypification, labelTypification } from '@/utils/labels';
 
+import { CstUpdateSchema, ICstUpdateDTO } from '../../../backend/api';
+import { useCstUpdate } from '../../../backend/useCstUpdate';
+import { useMutatingRSForm } from '../../../backend/useMutatingRSForm';
+import RefsInput from '../../../components/RefsInput';
+import { ConstituentaID, CstType, IConstituenta, IRSForm } from '../../../models/rsform';
+import { isBaseSet, isBasicConcept, isFunctional } from '../../../models/rsformAPI';
+import { IExpressionParse, ParsingStatus } from '../../../models/rslang';
 import EditorRSExpression from '../EditorRSExpression';
 
 interface FormConstituentaProps {
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ToolbarConstituenta.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/ToolbarConstituenta.tsx
similarity index 89%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ToolbarConstituenta.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/ToolbarConstituenta.tsx
index 4b929771..ebfd5a9f 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ToolbarConstituenta.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/ToolbarConstituenta.tsx
@@ -2,10 +2,9 @@
 
 import clsx from 'clsx';
 
-import { useConceptNavigation } from '@/app/Navigation/NavigationContext';
-import { urls } from '@/app/urls';
-import { useFindPredecessor } from '@/backend/oss/useFindPredecessor';
-import { useMutatingRSForm } from '@/backend/rsform/useMutatingRSForm';
+import { urls, useConceptNavigation } from '@/app';
+import { Overlay } from '@/components/Container';
+import { MiniButton } from '@/components/Control';
 import {
   IconClone,
   IconDestroy,
@@ -18,17 +17,17 @@ import {
   IconReset,
   IconSave
 } from '@/components/Icons';
-import BadgeHelp from '@/components/info/BadgeHelp';
-import MiniSelectorOSS from '@/components/select/MiniSelectorOSS';
-import { Overlay } from '@/components/ui/Container';
-import { MiniButton } from '@/components/ui/Control';
-import { HelpTopic } from '@/models/miscellaneous';
-import { ConstituentaID, IConstituenta } from '@/models/rsform';
+import BadgeHelp from '@/components/shared/BadgeHelp';
+import { HelpTopic } from '@/features/help/models/helpTopic';
+import { useFindPredecessor } from '@/features/oss/backend/useFindPredecessor';
 import { useModificationStore } from '@/stores/modification';
 import { usePreferencesStore } from '@/stores/preferences';
 import { PARAMETER } from '@/utils/constants';
 import { prepareTooltip, tooltips } from '@/utils/labels';
 
+import { useMutatingRSForm } from '../../../backend/useMutatingRSForm';
+import MiniSelectorOSS from '../../../components/MiniSelectorOSS';
+import { ConstituentaID, IConstituenta } from '../../../models/rsform';
 import { RSTabID, useRSEdit } from '../RSEditContext';
 
 interface ToolbarConstituentaProps {
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/index.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/index.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/index.tsx
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
similarity index 87%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
index 5eb5282c..6070e470 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
@@ -5,25 +5,24 @@ import { useEffect, useRef, useState } from 'react';
 import { toast } from 'react-toastify';
 
 import { DataCallback } from '@/backend/apiTransport';
-import { ICheckConstituentaDTO } from '@/backend/rsform/api';
-import { useCheckConstituenta } from '@/backend/rsform/useCheckConstituenta';
-import { useMutatingRSForm } from '@/backend/rsform/useMutatingRSForm';
-import BadgeHelp from '@/components/info/BadgeHelp';
+import { Overlay } from '@/components/Container';
 import { CProps } from '@/components/props';
-import RSInput from '@/components/RSInput';
-import { parser as rslangParser } from '@/components/RSInput/rslang/parserAST';
-import { RSTextWrapper } from '@/components/RSInput/textEditing';
-import { Overlay } from '@/components/ui/Container';
-import { HelpTopic } from '@/models/miscellaneous';
-import { ConstituentaID, IConstituenta } from '@/models/rsform';
-import { getDefinitionPrefix } from '@/models/rsformAPI';
-import { IExpressionParse, IRSErrorDescription } from '@/models/rslang';
-import { TokenID } from '@/models/rslang';
+import BadgeHelp from '@/components/shared/BadgeHelp';
+import { HelpTopic } from '@/features/help/models/helpTopic';
 import { useDialogsStore } from '@/stores/dialogs';
 import { usePreferencesStore } from '@/stores/preferences';
 import { transformAST } from '@/utils/codemirror';
 import { errors } from '@/utils/labels';
 
+import { ICheckConstituentaDTO } from '../../../backend/api';
+import { useCheckConstituenta } from '../../../backend/useCheckConstituenta';
+import { useMutatingRSForm } from '../../../backend/useMutatingRSForm';
+import RSInput from '../../../components/RSInput';
+import { parser as rslangParser } from '../../../components/RSInput/rslang/parserAST';
+import { RSTextWrapper } from '../../../components/RSInput/textEditing';
+import { ConstituentaID, IConstituenta } from '../../../models/rsform';
+import { getDefinitionPrefix } from '../../../models/rsformAPI';
+import { IExpressionParse, IRSErrorDescription, TokenID } from '../../../models/rslang';
 import { useRSEdit } from '../RSEditContext';
 import ParsingResult from './ParsingResult';
 import RSEditorControls from './RSEditControls';
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/ParsingResult.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/ParsingResult.tsx
similarity index 92%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/ParsingResult.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/ParsingResult.tsx
index e132d4b2..64dcfe3d 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/ParsingResult.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/ParsingResult.tsx
@@ -1,7 +1,8 @@
-import { IExpressionParse, IRSErrorDescription } from '@/models/rslang';
-import { getRSErrorPrefix } from '@/models/rslangAPI';
 import { describeRSError } from '@/utils/labels';
 
+import { IExpressionParse, IRSErrorDescription } from '../../../models/rslang';
+import { getRSErrorPrefix } from '../../../models/rslangAPI';
+
 interface ParsingResultProps {
   data: IExpressionParse | undefined;
   disabled?: boolean;
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/RSEditControls.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/RSEditControls.tsx
similarity index 98%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/RSEditControls.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/RSEditControls.tsx
index c6666896..15fde83b 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/RSEditControls.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/RSEditControls.tsx
@@ -1,8 +1,8 @@
 import clsx from 'clsx';
 
-import { TokenID } from '@/models/rslang';
 import { PARAMETER, prefixes } from '@/utils/constants';
 
+import { TokenID } from '../../../models/rslang';
 import RSLocalButton from './RSLocalButton';
 import RSTokenButton from './RSTokenButton';
 
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/RSLocalButton.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/RSLocalButton.tsx
similarity index 95%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/RSLocalButton.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/RSLocalButton.tsx
index 9ce07e23..a7cf64ee 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/RSLocalButton.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/RSLocalButton.tsx
@@ -1,9 +1,10 @@
 import clsx from 'clsx';
 
 import { CProps } from '@/components/props';
-import { TokenID } from '@/models/rslang';
 import { globals } from '@/utils/constants';
 
+import { TokenID } from '../../../models/rslang';
+
 interface RSLocalButtonProps extends CProps.Titled, CProps.Styling {
   text: string;
   disabled?: boolean;
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/RSTokenButton.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/RSTokenButton.tsx
similarity index 95%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/RSTokenButton.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/RSTokenButton.tsx
index bd7b229b..d9c51eee 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/RSTokenButton.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/RSTokenButton.tsx
@@ -1,9 +1,10 @@
 import clsx from 'clsx';
 
-import { TokenID } from '@/models/rslang';
 import { globals } from '@/utils/constants';
 import { describeToken, labelToken } from '@/utils/labels';
 
+import { TokenID } from '../../../models/rslang';
+
 interface RSTokenButtonProps {
   token: TokenID;
   disabled?: boolean;
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusBar.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/StatusBar.tsx
similarity index 87%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusBar.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/StatusBar.tsx
index 666a6a40..5943afa2 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusBar.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/StatusBar.tsx
@@ -3,15 +3,15 @@
 import clsx from 'clsx';
 
 import { StatusIcon } from '@/components/DomainIcons';
-import Loader from '@/components/ui/Loader';
-import { ExpressionStatus } from '@/models/rsform';
-import { type IConstituenta } from '@/models/rsform';
-import { inferStatus } from '@/models/rsformAPI';
-import { IExpressionParse, ParsingStatus } from '@/models/rslang';
+import { Loader } from '@/components/Loader';
 import { APP_COLORS, colorStatusBar } from '@/styling/color';
 import { globals } from '@/utils/constants';
 import { labelExpressionStatus, prepareTooltip } from '@/utils/labels';
 
+import { ExpressionStatus, IConstituenta } from '../../../models/rsform';
+import { inferStatus } from '../../../models/rsformAPI';
+import { IExpressionParse, ParsingStatus } from '../../../models/rslang';
+
 interface StatusBarProps {
   processing?: boolean;
   isModified?: boolean;
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/ToolbarRSExpression.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/ToolbarRSExpression.tsx
similarity index 89%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/ToolbarRSExpression.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/ToolbarRSExpression.tsx
index de4d4705..b78a13b3 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/ToolbarRSExpression.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/ToolbarRSExpression.tsx
@@ -1,10 +1,11 @@
-import { useMutatingRSForm } from '@/backend/rsform/useMutatingRSForm';
+import { Overlay } from '@/components/Container';
+import { MiniButton } from '@/components/Control';
 import { IconControls, IconTree, IconTypeGraph } from '@/components/Icons';
 import { CProps } from '@/components/props';
-import { Overlay } from '@/components/ui/Container';
-import { MiniButton } from '@/components/ui/Control';
 import { usePreferencesStore } from '@/stores/preferences';
 
+import { useMutatingRSForm } from '../../../backend/useMutatingRSForm';
+
 interface ToolbarRSExpressionProps {
   disabled?: boolean;
   showAST: (event: CProps.EventMouse) => void;
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/index.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/index.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/index.tsx
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/EditorLibraryItem.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/EditorLibraryItem.tsx
similarity index 83%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/EditorLibraryItem.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/EditorLibraryItem.tsx
index 76170c84..ca0bac1f 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/EditorLibraryItem.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/EditorLibraryItem.tsx
@@ -1,13 +1,10 @@
 import { Suspense } from 'react';
 import { useIntl } from 'react-intl';
 
-import { useConceptNavigation } from '@/app/Navigation/NavigationContext';
-import { urls } from '@/app/urls';
-import { useMutatingLibrary } from '@/backend/library/useMutatingLibrary';
-import { useSetEditors } from '@/backend/library/useSetEditors';
-import { useSetLocation } from '@/backend/library/useSetLocation';
-import { useSetOwner } from '@/backend/library/useSetOwner';
-import { useLabelUser } from '@/backend/users/useLabelUser';
+import { urls, useConceptNavigation } from '@/app';
+import { Overlay, Tooltip } from '@/components/Container';
+import { MiniButton } from '@/components/Control';
+import { useDropdown } from '@/components/Dropdown';
 import {
   IconDateCreate,
   IconDateUpdate,
@@ -16,23 +13,26 @@ import {
   IconFolderOpened,
   IconOwner
 } from '@/components/Icons';
-import InfoUsers from '@/components/info/InfoUsers';
+import { Loader } from '@/components/Loader';
 import { CProps } from '@/components/props';
-import SelectUser from '@/components/select/SelectUser';
-import { Overlay, Tooltip } from '@/components/ui/Container';
-import { MiniButton } from '@/components/ui/Control';
-import { useDropdown } from '@/components/ui/Dropdown';
-import Loader from '@/components/ui/Loader';
-import { ValueIcon } from '@/components/ui/View';
-import { ILibraryItemEditor } from '@/models/library';
-import { UserID, UserRole } from '@/models/user';
+import { ValueIcon } from '@/components/View';
+import { useMutatingLibrary } from '@/features/library/backend/useMutatingLibrary';
+import { useSetEditors } from '@/features/library/backend/useSetEditors';
+import { useSetLocation } from '@/features/library/backend/useSetLocation';
+import { useSetOwner } from '@/features/library/backend/useSetOwner';
+import { ILibraryItemEditor } from '@/features/library/models/library';
+import { useLibrarySearchStore } from '@/features/library/stores/librarySearch';
+import { useLabelUser } from '@/features/users/backend/useLabelUser';
+import SelectUser from '@/features/users/components/SelectUser';
+import { UserID, UserRole } from '@/features/users/models/user';
 import { useDialogsStore } from '@/stores/dialogs';
-import { useLibrarySearchStore } from '@/stores/librarySearch';
 import { useModificationStore } from '@/stores/modification';
 import { useRoleStore } from '@/stores/role';
 import { prefixes } from '@/utils/constants';
 import { prompts } from '@/utils/labels';
 
+import InfoUsers from './InfoUsers';
+
 interface EditorLibraryItemProps {
   controller: ILibraryItemEditor;
 }
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/EditorRSFormCard.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/EditorRSFormCard.tsx
similarity index 96%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/EditorRSFormCard.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/EditorRSFormCard.tsx
index dd0cd5d5..a6c0b6e3 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/EditorRSFormCard.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/EditorRSFormCard.tsx
@@ -2,7 +2,7 @@
 
 import clsx from 'clsx';
 
-import { FlexColumn } from '@/components/ui/Container';
+import { FlexColumn } from '@/components/Container';
 import { useModificationStore } from '@/stores/modification';
 import { globals } from '@/utils/constants';
 
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/FormRSForm.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/FormRSForm.tsx
similarity index 88%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/FormRSForm.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/FormRSForm.tsx
index cc8e5df4..6f2ceb1f 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/FormRSForm.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/FormRSForm.tsx
@@ -6,19 +6,18 @@ import clsx from 'clsx';
 import { useEffect } from 'react';
 import { useForm, useWatch } from 'react-hook-form';
 
-import { useConceptNavigation } from '@/app/Navigation/NavigationContext';
-import { urls } from '@/app/urls';
-import { IUpdateLibraryItemDTO, UpdateLibraryItemSchema } from '@/backend/library/api';
-import { useUpdateItem } from '@/backend/library/useUpdateItem';
-import { useMutatingRSForm } from '@/backend/rsform/useMutatingRSForm';
+import { urls, useConceptNavigation } from '@/app';
+import { SubmitButton } from '@/components/Control';
 import { IconSave } from '@/components/Icons';
-import SelectVersion from '@/components/select/SelectVersion';
-import { SubmitButton } from '@/components/ui/Control';
-import { Label, TextArea, TextInput } from '@/components/ui/Input';
-import { LibraryItemType, VersionID } from '@/models/library';
+import { Label, TextArea, TextInput } from '@/components/Input';
+import { IUpdateLibraryItemDTO, UpdateLibraryItemSchema } from '@/features/library/backend/api';
+import { useUpdateItem } from '@/features/library/backend/useUpdateItem';
+import { LibraryItemType, VersionID } from '@/features/library/models/library';
 import { useModificationStore } from '@/stores/modification';
 import { globals } from '@/utils/constants';
 
+import { useMutatingRSForm } from '../../../backend/useMutatingRSForm';
+import SelectVersion from '../../../components/SelectVersion';
 import { useRSEdit } from '../RSEditContext';
 import ToolbarItemAccess from './ToolbarItemAccess';
 import ToolbarVersioning from './ToolbarVersioning';
diff --git a/rsconcept/frontend/src/components/info/InfoUsers.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/InfoUsers.tsx
similarity index 85%
rename from rsconcept/frontend/src/components/info/InfoUsers.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/InfoUsers.tsx
index 8e4052a5..1011fb4c 100644
--- a/rsconcept/frontend/src/components/info/InfoUsers.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/InfoUsers.tsx
@@ -1,8 +1,8 @@
 import clsx from 'clsx';
 
-import { useLabelUser } from '@/backend/users/useLabelUser';
 import { CProps } from '@/components/props';
-import { UserID } from '@/models/user';
+import { useLabelUser } from '@/features/users/backend/useLabelUser';
+import { UserID } from '@/features/users/models/user';
 
 interface InfoUsersProps extends CProps.Styling {
   items: UserID[];
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/RSFormStats.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/RSFormStats.tsx
similarity index 97%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/RSFormStats.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/RSFormStats.tsx
index 888cc360..a24c4711 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/RSFormStats.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/RSFormStats.tsx
@@ -19,8 +19,9 @@ import {
   IconStatusProperty,
   IconTerminology
 } from '@/components/Icons';
-import { ValueStats } from '@/components/ui/View';
-import { type IRSFormStats } from '@/models/rsform';
+import { ValueStats } from '@/components/View';
+
+import { IRSFormStats } from '../../../models/rsform';
 
 interface RSFormStatsProps {
   isArchive: boolean;
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/ToolbarItemAccess.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/ToolbarItemAccess.tsx
similarity index 76%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/ToolbarItemAccess.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/ToolbarItemAccess.tsx
index d5347fb0..89db08fc 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/ToolbarItemAccess.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/ToolbarItemAccess.tsx
@@ -1,15 +1,15 @@
-import { useMutatingLibrary } from '@/backend/library/useMutatingLibrary';
-import { useSetAccessPolicy } from '@/backend/library/useSetAccessPolicy';
+import { Overlay } from '@/components/Container';
+import { MiniButton } from '@/components/Control';
 import { VisibilityIcon } from '@/components/DomainIcons';
 import { IconImmutable, IconMutable } from '@/components/Icons';
-import BadgeHelp from '@/components/info/BadgeHelp';
-import SelectAccessPolicy from '@/components/select/SelectAccessPolicy';
-import { Overlay } from '@/components/ui/Container';
-import { MiniButton } from '@/components/ui/Control';
-import { Label } from '@/components/ui/Input';
-import { AccessPolicy, ILibraryItemEditor } from '@/models/library';
-import { HelpTopic } from '@/models/miscellaneous';
-import { UserRole } from '@/models/user';
+import { Label } from '@/components/Input';
+import BadgeHelp from '@/components/shared/BadgeHelp';
+import { HelpTopic } from '@/features/help/models/helpTopic';
+import { useMutatingLibrary } from '@/features/library/backend/useMutatingLibrary';
+import { useSetAccessPolicy } from '@/features/library/backend/useSetAccessPolicy';
+import SelectAccessPolicy from '@/features/library/components/SelectAccessPolicy';
+import { AccessPolicy, ILibraryItemEditor } from '@/features/library/models/library';
+import { UserRole } from '@/features/users/models/user';
 import { useRoleStore } from '@/stores/role';
 import { PARAMETER } from '@/utils/constants';
 
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/ToolbarRSFormCard.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/ToolbarRSFormCard.tsx
similarity index 82%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/ToolbarRSFormCard.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/ToolbarRSFormCard.tsx
index 2b3a3e3f..e4cc1fd1 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/ToolbarRSFormCard.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/ToolbarRSFormCard.tsx
@@ -1,21 +1,21 @@
 'use client';
 
-import { useMutatingLibrary } from '@/backend/library/useMutatingLibrary';
+import { Overlay } from '@/components/Container';
+import { MiniButton } from '@/components/Control';
 import { IconDestroy, IconSave, IconShare } from '@/components/Icons';
-import BadgeHelp from '@/components/info/BadgeHelp';
-import MiniSelectorOSS from '@/components/select/MiniSelectorOSS';
-import { Overlay } from '@/components/ui/Container';
-import { MiniButton } from '@/components/ui/Control';
-import { AccessPolicy, ILibraryItemEditor, LibraryItemType } from '@/models/library';
-import { HelpTopic } from '@/models/miscellaneous';
-import { IRSForm } from '@/models/rsform';
-import { UserRole } from '@/models/user';
+import BadgeHelp from '@/components/shared/BadgeHelp';
+import { HelpTopic } from '@/features/help/models/helpTopic';
+import { useMutatingLibrary } from '@/features/library/backend/useMutatingLibrary';
+import { AccessPolicy, ILibraryItemEditor, LibraryItemType } from '@/features/library/models/library';
+import { UserRole } from '@/features/users/models/user';
 import { useModificationStore } from '@/stores/modification';
 import { useRoleStore } from '@/stores/role';
 import { PARAMETER } from '@/utils/constants';
 import { prepareTooltip, tooltips } from '@/utils/labels';
 import { sharePage } from '@/utils/utils';
 
+import MiniSelectorOSS from '../../../components/MiniSelectorOSS';
+import { IRSForm } from '../../../models/rsform';
 import { IRSEditContext } from '../RSEditContext';
 
 interface ToolbarRSFormCardProps {
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/ToolbarVersioning.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/ToolbarVersioning.tsx
similarity index 91%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/ToolbarVersioning.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/ToolbarVersioning.tsx
index 71defcb2..4c095fc1 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/ToolbarVersioning.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/ToolbarVersioning.tsx
@@ -1,11 +1,11 @@
 'use client';
 
-import { useVersionRestore } from '@/backend/library/useVersionRestore';
+import { Overlay } from '@/components/Container';
+import { MiniButton } from '@/components/Control';
 import { IconNewVersion, IconUpload, IconVersions } from '@/components/Icons';
-import BadgeHelp from '@/components/info/BadgeHelp';
-import { Overlay } from '@/components/ui/Container';
-import { MiniButton } from '@/components/ui/Control';
-import { HelpTopic } from '@/models/miscellaneous';
+import BadgeHelp from '@/components/shared/BadgeHelp';
+import { HelpTopic } from '@/features/help/models/helpTopic';
+import { useVersionRestore } from '@/features/library/backend/useVersionRestore';
 import { useDialogsStore } from '@/stores/dialogs';
 import { useModificationStore } from '@/stores/modification';
 import { PARAMETER } from '@/utils/constants';
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/index.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/index.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/index.tsx
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/EditorRSList.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSList/EditorRSList.tsx
similarity index 91%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorRSList/EditorRSList.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSList/EditorRSList.tsx
index 2430925a..2fc437b7 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/EditorRSList.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSList/EditorRSList.tsx
@@ -4,19 +4,19 @@ import fileDownload from 'js-file-download';
 import { useState } from 'react';
 import { toast } from 'react-toastify';
 
-import { useMutatingRSForm } from '@/backend/rsform/useMutatingRSForm';
+import { Overlay } from '@/components/Container';
+import { MiniButton } from '@/components/Control';
+import { type RowSelectionState } from '@/components/DataTable';
 import { IconCSV } from '@/components/Icons';
-import { Overlay } from '@/components/ui/Container';
-import { MiniButton } from '@/components/ui/Control';
-import { type RowSelectionState } from '@/components/ui/DataTable';
-import { SearchBar } from '@/components/ui/SearchBar';
-import { CstMatchMode } from '@/models/miscellaneous';
-import { ConstituentaID, CstType } from '@/models/rsform';
-import { matchConstituenta } from '@/models/rsformAPI';
+import { SearchBar } from '@/components/shared/SearchBar';
 import { useFitHeight } from '@/stores/appLayout';
 import { information } from '@/utils/labels';
 import { convertToCSV } from '@/utils/utils';
 
+import { useMutatingRSForm } from '../../../backend/useMutatingRSForm';
+import { ConstituentaID, CstType } from '../../../models/rsform';
+import { matchConstituenta } from '../../../models/rsformAPI';
+import { CstMatchMode } from '../../../stores/cstSearch';
 import { useRSEdit } from '../RSEditContext';
 import TableRSList from './TableRSList';
 import ToolbarRSList from './ToolbarRSList';
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/TableRSList.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSList/TableRSList.tsx
similarity index 93%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorRSList/TableRSList.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSList/TableRSList.tsx
index 2aaa9fd4..f3d0d2d0 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/TableRSList.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSList/TableRSList.tsx
@@ -3,17 +3,18 @@
 import clsx from 'clsx';
 import { useLayoutEffect, useState } from 'react';
 
-import BadgeConstituenta from '@/components/info/BadgeConstituenta';
+import { TextURL } from '@/components/Control';
+import DataTable, { createColumnHelper, RowSelectionState, VisibilityState } from '@/components/DataTable';
 import { CProps } from '@/components/props';
-import { TextURL } from '@/components/ui/Control';
-import DataTable, { createColumnHelper, RowSelectionState, VisibilityState } from '@/components/ui/DataTable';
-import { NoData, TextContent } from '@/components/ui/View';
+import { NoData, TextContent } from '@/components/View';
 import useWindowSize from '@/hooks/useWindowSize';
-import { ConstituentaID, IConstituenta } from '@/models/rsform';
 import { PARAMETER, prefixes } from '@/utils/constants';
 import { labelCstTypification } from '@/utils/labels';
 import { truncateToSymbol } from '@/utils/utils';
 
+import BadgeConstituenta from '../../../components/BadgeConstituenta';
+import { ConstituentaID, IConstituenta } from '../../../models/rsform';
+
 interface TableRSListProps {
   items?: IConstituenta[];
   enableSelection: boolean;
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/ToolbarRSList.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSList/ToolbarRSList.tsx
similarity index 90%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorRSList/ToolbarRSList.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSList/ToolbarRSList.tsx
index 892009db..0bf510d9 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/ToolbarRSList.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSList/ToolbarRSList.tsx
@@ -1,5 +1,7 @@
-import { useMutatingRSForm } from '@/backend/rsform/useMutatingRSForm';
+import { Overlay } from '@/components/Container';
+import { MiniButton } from '@/components/Control';
 import { CstTypeIcon } from '@/components/DomainIcons';
+import { Dropdown, DropdownButton, useDropdown } from '@/components/Dropdown';
 import {
   IconClone,
   IconDestroy,
@@ -9,16 +11,14 @@ import {
   IconOpenList,
   IconReset
 } from '@/components/Icons';
-import BadgeHelp from '@/components/info/BadgeHelp';
-import MiniSelectorOSS from '@/components/select/MiniSelectorOSS';
-import { Overlay } from '@/components/ui/Container';
-import { MiniButton } from '@/components/ui/Control';
-import { Dropdown, DropdownButton, useDropdown } from '@/components/ui/Dropdown';
-import { HelpTopic } from '@/models/miscellaneous';
-import { CstType } from '@/models/rsform';
+import BadgeHelp from '@/components/shared/BadgeHelp';
+import { HelpTopic } from '@/features/help/models/helpTopic';
 import { prefixes } from '@/utils/constants';
 import { getCstTypeShortcut, labelCstType, prepareTooltip } from '@/utils/labels';
 
+import { useMutatingRSForm } from '../../../backend/useMutatingRSForm';
+import MiniSelectorOSS from '../../../components/MiniSelectorOSS';
+import { CstType } from '../../../models/rsform';
 import { useRSEdit } from '../RSEditContext';
 
 function ToolbarRSList() {
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/index.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSList/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorRSList/index.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSList/index.tsx
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx
similarity index 100%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphSelectors.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/GraphSelectors.tsx
similarity index 68%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphSelectors.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/GraphSelectors.tsx
index 6d51ec06..9d820291 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphSelectors.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/GraphSelectors.tsx
@@ -1,13 +1,19 @@
-import BadgeHelp from '@/components/info/BadgeHelp';
-import { Overlay } from '@/components/ui/Container';
-import { SelectSingle } from '@/components/ui/Input';
-import { GraphColoring, HelpTopic } from '@/models/miscellaneous';
-import { IRSForm } from '@/models/rsform';
+import { Overlay } from '@/components/Container';
+import { SelectSingle } from '@/components/Input';
+import BadgeHelp from '@/components/shared/BadgeHelp';
+import { HelpTopic } from '@/features/help/models/helpTopic';
 import { mapLabelColoring } from '@/utils/labels';
-import { SelectorGraphColoring } from '@/utils/selectors';
 
+import { IRSForm } from '../../../models/rsform';
+import { GraphColoring } from '../../../stores/termGraph';
 import SchemasGuide from './SchemasGuide';
 
+/**
+ * Represents options for {@link GraphColoring} selector.
+ */
+const SelectorGraphColoring: { value: GraphColoring; label: string }[] = //
+  [...mapLabelColoring.entries()].map(item => ({ value: item[0], label: item[1] }));
+
 interface GraphSelectorsProps {
   schema: IRSForm;
   coloring: GraphColoring;
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/SchemasGuide.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/SchemasGuide.tsx
similarity index 89%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/SchemasGuide.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/SchemasGuide.tsx
index 9657fe63..571d525c 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/SchemasGuide.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/SchemasGuide.tsx
@@ -1,11 +1,12 @@
-import { useLibrary } from '@/backend/library/useLibrary';
+import { Tooltip } from '@/components/Container';
 import { IconHelp } from '@/components/Icons';
-import { Tooltip } from '@/components/ui/Container';
-import { LibraryItemID } from '@/models/library';
-import { IRSForm } from '@/models/rsform';
+import { useLibrary } from '@/features/library/backend/useLibrary';
+import { LibraryItemID } from '@/features/library/models/library';
 import { colorBgSchemas } from '@/styling/color';
 import { globals, prefixes } from '@/utils/constants';
 
+import { IRSForm } from '../../../models/rsform';
+
 interface SchemasGuideProps {
   schema: IRSForm;
 }
diff --git a/rsconcept/frontend/src/components/info/SelectedCounter.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/SelectedCounter.tsx
similarity index 90%
rename from rsconcept/frontend/src/components/info/SelectedCounter.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/SelectedCounter.tsx
index 35f37cbb..a8126f96 100644
--- a/rsconcept/frontend/src/components/info/SelectedCounter.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/SelectedCounter.tsx
@@ -1,4 +1,4 @@
-import { Overlay } from '@/components/ui/Container';
+import { Overlay } from '@/components/Container';
 
 interface SelectedCounterProps {
   totalCount: number;
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/TGFlow.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/TGFlow.tsx
similarity index 84%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/TGFlow.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/TGFlow.tsx
index 3c533f56..5b50e533 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/TGFlow.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/TGFlow.tsx
@@ -19,28 +19,27 @@ import {
 import { useStoreApi } from 'reactflow';
 import { useDebounce } from 'use-debounce';
 
-import { useMutatingRSForm } from '@/backend/rsform/useMutatingRSForm';
-import InfoConstituenta from '@/components/info/InfoConstituenta';
-import SelectedCounter from '@/components/info/SelectedCounter';
+import { Overlay } from '@/components/Container';
 import { CProps } from '@/components/props';
-import ToolbarGraphSelection from '@/components/select/ToolbarGraphSelection';
-import { Overlay } from '@/components/ui/Container';
-import { produceFilteredGraph } from '@/models/miscellaneousAPI';
-import { ConstituentaID, CstType, IConstituenta } from '@/models/rsform';
-import { isBasicConcept } from '@/models/rsformAPI';
 import { useMainHeight } from '@/stores/appLayout';
 import { useDialogsStore } from '@/stores/dialogs';
-import { useTermGraphStore } from '@/stores/termGraph';
 import { APP_COLORS, colorBgGraphNode } from '@/styling/color';
 import { PARAMETER } from '@/utils/constants';
 import { errors } from '@/utils/labels';
 
+import { useMutatingRSForm } from '../../../backend/useMutatingRSForm';
+import InfoConstituenta from '../../../components/InfoConstituenta';
+import ToolbarGraphSelection from '../../../components/ToolbarGraphSelection';
+import { ConstituentaID, CstType, IConstituenta, IRSForm } from '../../../models/rsform';
+import { isBasicConcept } from '../../../models/rsformAPI';
+import { GraphFilterParams, useTermGraphStore } from '../../../stores/termGraph';
 import { useRSEdit } from '../RSEditContext';
 import { TGEdgeTypes } from './graph/TGEdgeTypes';
 import { applyLayout } from './graph/TGLayout';
 import { TGNodeData } from './graph/TGNode';
 import { TGNodeTypes } from './graph/TGNodeTypes';
 import GraphSelectors from './GraphSelectors';
+import SelectedCounter from './SelectedCounter';
 import ToolbarFocusedCst from './ToolbarFocusedCst';
 import ToolbarTermGraph from './ToolbarTermGraph';
 import ViewHidden from './ViewHidden';
@@ -404,3 +403,63 @@ function TGFlow() {
 }
 
 export default TGFlow;
+
+// ====== Internals =========
+function produceFilteredGraph(schema: IRSForm, params: GraphFilterParams, focusCst: IConstituenta | undefined) {
+  const filtered = schema.graph.clone();
+  const allowedTypes: CstType[] = (() => {
+    const result: CstType[] = [];
+    if (params.allowBase) result.push(CstType.BASE);
+    if (params.allowStruct) result.push(CstType.STRUCTURED);
+    if (params.allowTerm) result.push(CstType.TERM);
+    if (params.allowAxiom) result.push(CstType.AXIOM);
+    if (params.allowFunction) result.push(CstType.FUNCTION);
+    if (params.allowPredicate) result.push(CstType.PREDICATE);
+    if (params.allowConstant) result.push(CstType.CONSTANT);
+    if (params.allowTheorem) result.push(CstType.THEOREM);
+    return result;
+  })();
+
+  if (params.noHermits) {
+    filtered.removeIsolated();
+  }
+  if (params.noTemplates) {
+    schema.items.forEach(cst => {
+      if (cst !== focusCst && cst.is_template) {
+        filtered.foldNode(cst.id);
+      }
+    });
+  }
+  if (allowedTypes.length < Object.values(CstType).length) {
+    schema.items.forEach(cst => {
+      if (cst !== focusCst && !allowedTypes.includes(cst.cst_type)) {
+        filtered.foldNode(cst.id);
+      }
+    });
+  }
+  if (!focusCst && params.foldDerived) {
+    schema.items.forEach(cst => {
+      if (cst.spawner) {
+        filtered.foldNode(cst.id);
+      }
+    });
+  }
+  if (focusCst) {
+    const includes: ConstituentaID[] = [
+      focusCst.id,
+      ...focusCst.spawn,
+      ...(params.focusShowInputs ? schema.graph.expandInputs([focusCst.id]) : []),
+      ...(params.focusShowOutputs ? schema.graph.expandOutputs([focusCst.id]) : [])
+    ];
+    schema.items.forEach(cst => {
+      if (!includes.includes(cst.id)) {
+        filtered.foldNode(cst.id);
+      }
+    });
+  }
+  if (params.noTransitive) {
+    filtered.transitiveReduction();
+  }
+
+  return filtered;
+}
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ToolbarFocusedCst.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/ToolbarFocusedCst.tsx
similarity index 94%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ToolbarFocusedCst.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/ToolbarFocusedCst.tsx
index 4e26550a..58cf3e50 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ToolbarFocusedCst.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/ToolbarFocusedCst.tsx
@@ -1,10 +1,10 @@
 'use client';
 
+import { MiniButton } from '@/components/Control';
 import { IconGraphInputs, IconGraphOutputs, IconReset } from '@/components/Icons';
-import { MiniButton } from '@/components/ui/Control';
-import { IConstituenta } from '@/models/rsform';
 import { APP_COLORS } from '@/styling/color';
 
+import { IConstituenta } from '../../../models/rsform';
 import { useRSEdit } from '../RSEditContext';
 
 interface ToolbarFocusedCstProps {
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ToolbarTermGraph.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/ToolbarTermGraph.tsx
similarity index 92%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ToolbarTermGraph.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/ToolbarTermGraph.tsx
index 7a8f644f..6a3614aa 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ToolbarTermGraph.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/ToolbarTermGraph.tsx
@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 
-import { useMutatingRSForm } from '@/backend/rsform/useMutatingRSForm';
+import { MiniButton } from '@/components/Control';
 import {
   IconClustering,
   IconClusteringOff,
@@ -13,13 +13,13 @@ import {
   IconTextOff,
   IconTypeGraph
 } from '@/components/Icons';
-import BadgeHelp from '@/components/info/BadgeHelp';
-import MiniSelectorOSS from '@/components/select/MiniSelectorOSS';
-import { MiniButton } from '@/components/ui/Control';
-import { HelpTopic } from '@/models/miscellaneous';
+import BadgeHelp from '@/components/shared/BadgeHelp';
+import { HelpTopic } from '@/features/help/models/helpTopic';
 import { useDialogsStore } from '@/stores/dialogs';
 import { PARAMETER } from '@/utils/constants';
 
+import { useMutatingRSForm } from '../../../backend/useMutatingRSForm';
+import MiniSelectorOSS from '../../../components/MiniSelectorOSS';
 import { useRSEdit } from '../RSEditContext';
 
 interface ToolbarTermGraphProps {
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx
similarity index 93%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx
index 973e4a04..f029b46a 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx
@@ -2,19 +2,18 @@
 
 import clsx from 'clsx';
 
+import { Overlay } from '@/components/Container';
+import { MiniButton } from '@/components/Control';
 import { IconDropArrow, IconDropArrowUp } from '@/components/Icons';
 import { CProps } from '@/components/props';
-import { Overlay } from '@/components/ui/Container';
-import { MiniButton } from '@/components/ui/Control';
 import useWindowSize from '@/hooks/useWindowSize';
-import { GraphColoring } from '@/models/miscellaneous';
-import { ConstituentaID, IRSForm } from '@/models/rsform';
 import { useFitHeight } from '@/stores/appLayout';
-import { useTermGraphStore } from '@/stores/termGraph';
 import { useTooltipsStore } from '@/stores/tooltips';
 import { APP_COLORS, colorBgGraphNode } from '@/styling/color';
 import { globals, PARAMETER, prefixes } from '@/utils/constants';
 
+import { ConstituentaID, IRSForm } from '../../../models/rsform';
+import { GraphColoring, useTermGraphStore } from '../../../stores/termGraph';
 import { useRSEdit } from '../RSEditContext';
 
 interface ViewHiddenProps {
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/graph/TGEdgeTypes.ts b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/graph/TGEdgeTypes.ts
similarity index 65%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/graph/TGEdgeTypes.ts
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/graph/TGEdgeTypes.ts
index 30c6d5be..dbedbe4f 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/graph/TGEdgeTypes.ts
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/graph/TGEdgeTypes.ts
@@ -1,6 +1,6 @@
 import { EdgeTypes } from 'reactflow';
 
-import DynamicEdge from '@/components/graph/DynamicEdge';
+import DynamicEdge from '@/components/Flow/DynamicEdge';
 
 export const TGEdgeTypes: EdgeTypes = {
   termEdge: DynamicEdge
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/graph/TGLayout.ts b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/graph/TGLayout.ts
similarity index 100%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/graph/TGLayout.ts
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/graph/TGLayout.ts
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/graph/TGNode.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/graph/TGNode.tsx
similarity index 100%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/graph/TGNode.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/graph/TGNode.tsx
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/graph/TGNodeTypes.ts b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/graph/TGNodeTypes.ts
similarity index 100%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/graph/TGNodeTypes.ts
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/graph/TGNodeTypes.ts
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/index.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/index.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/index.tsx
diff --git a/rsconcept/frontend/src/pages/RSFormPage/MenuRSTabs.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/MenuRSTabs.tsx
similarity index 93%
rename from rsconcept/frontend/src/pages/RSFormPage/MenuRSTabs.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/MenuRSTabs.tsx
index 62895336..7b994d7f 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/MenuRSTabs.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/MenuRSTabs.tsx
@@ -2,16 +2,10 @@
 
 import fileDownload from 'js-file-download';
 
-import { useConceptNavigation } from '@/app/Navigation/NavigationContext';
-import { urls } from '@/app/urls';
-import { useAuthSuspense } from '@/backend/auth/useAuth';
-import { useCstSubstitute } from '@/backend/rsform/useCstSubstitute';
-import { useDownloadRSForm } from '@/backend/rsform/useDownloadRSForm';
-import { useInlineSynthesis } from '@/backend/rsform/useInlineSynthesis';
-import { useMutatingRSForm } from '@/backend/rsform/useMutatingRSForm';
-import { useProduceStructure } from '@/backend/rsform/useProduceStructure';
-import { useResetAliases } from '@/backend/rsform/useResetAliases';
-import { useRestoreOrder } from '@/backend/rsform/useRestoreOrder';
+import { urls, useConceptNavigation } from '@/app';
+import { Divider } from '@/components/Container';
+import { Button } from '@/components/Control';
+import { Dropdown, DropdownButton, useDropdown } from '@/components/Dropdown';
 import {
   IconAdmin,
   IconAlert,
@@ -37,13 +31,10 @@ import {
   IconTemplates,
   IconUpload
 } from '@/components/Icons';
-import { Divider } from '@/components/ui/Container';
-import { Button } from '@/components/ui/Control';
-import { Dropdown, DropdownButton, useDropdown } from '@/components/ui/Dropdown';
-import { AccessPolicy, LocationHead } from '@/models/library';
-import { CstType } from '@/models/rsform';
-import { UserRole } from '@/models/user';
-import { OssTabID } from '@/pages/OssPage/OssEditContext';
+import { useAuthSuspense } from '@/features/auth/backend/useAuth';
+import { AccessPolicy, LocationHead } from '@/features/library/models/library';
+import { OssTabID } from '@/features/oss/pages/OssPage/OssEditContext';
+import { UserRole } from '@/features/users/models/user';
 import { useDialogsStore } from '@/stores/dialogs';
 import { useModificationStore } from '@/stores/modification';
 import { useRoleStore } from '@/stores/role';
@@ -51,6 +42,14 @@ import { EXTEOR_TRS_FILE } from '@/utils/constants';
 import { describeAccessMode, labelAccessMode, tooltips } from '@/utils/labels';
 import { generatePageQR, promptUnsaved, sharePage } from '@/utils/utils';
 
+import { useCstSubstitute } from '../../backend/useCstSubstitute';
+import { useDownloadRSForm } from '../../backend/useDownloadRSForm';
+import { useInlineSynthesis } from '../../backend/useInlineSynthesis';
+import { useMutatingRSForm } from '../../backend/useMutatingRSForm';
+import { useProduceStructure } from '../../backend/useProduceStructure';
+import { useResetAliases } from '../../backend/useResetAliases';
+import { useRestoreOrder } from '../../backend/useRestoreOrder';
+import { CstType } from '../../models/rsform';
 import { useRSEdit } from './RSEditContext';
 
 function MenuRSTabs() {
diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSEditContext.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/RSEditContext.tsx
similarity index 93%
rename from rsconcept/frontend/src/pages/RSFormPage/RSEditContext.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/RSEditContext.tsx
index e2f35759..8aaec866 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/RSEditContext.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/RSEditContext.tsx
@@ -2,21 +2,14 @@
 
 import { createContext, useContext, useEffect, useState } from 'react';
 
-import { useConceptNavigation } from '@/app/Navigation/NavigationContext';
-import { urls } from '@/app/urls';
-import { useAuthSuspense } from '@/backend/auth/useAuth';
-import { useDeleteItem } from '@/backend/library/useDeleteItem';
-import { ICstCreateDTO } from '@/backend/rsform/api';
-import { useCstCreate } from '@/backend/rsform/useCstCreate';
-import { useCstDelete } from '@/backend/rsform/useCstDelete';
-import { useCstMove } from '@/backend/rsform/useCstMove';
-import { useRSFormSuspense } from '@/backend/rsform/useRSForm';
-import { ILibraryItemEditor, LibraryItemID, VersionID } from '@/models/library';
-import { ConstituentaID, CstType, IConstituenta, IRSForm } from '@/models/rsform';
-import { generateAlias } from '@/models/rsformAPI';
-import { UserRole } from '@/models/user';
+import { urls, useConceptNavigation } from '@/app';
+import { useAuthSuspense } from '@/features/auth/backend/useAuth';
+import { useDeleteItem } from '@/features/library/backend/useDeleteItem';
+import { ILibraryItemEditor, LibraryItemID, VersionID } from '@/features/library/models/library';
+import { useLibrarySearchStore } from '@/features/library/stores/librarySearch';
+import { OssTabID } from '@/features/oss/pages/OssPage/OssEditContext';
+import { UserRole } from '@/features/users/models/user';
 import { useDialogsStore } from '@/stores/dialogs';
-import { useLibrarySearchStore } from '@/stores/librarySearch';
 import { useModificationStore } from '@/stores/modification';
 import { usePreferencesStore } from '@/stores/preferences';
 import { useRoleStore } from '@/stores/role';
@@ -24,7 +17,13 @@ import { PARAMETER, prefixes } from '@/utils/constants';
 import { prompts } from '@/utils/labels';
 import { promptUnsaved } from '@/utils/utils';
 
-import { OssTabID } from '../OssPage/OssEditContext';
+import { ICstCreateDTO } from '../../backend/api';
+import { useCstCreate } from '../../backend/useCstCreate';
+import { useCstDelete } from '../../backend/useCstDelete';
+import { useCstMove } from '../../backend/useCstMove';
+import { useRSFormSuspense } from '../../backend/useRSForm';
+import { ConstituentaID, CstType, IConstituenta, IRSForm } from '../../models/rsform';
+import { generateAlias } from '../../models/rsformAPI';
 
 export enum RSTabID {
   CARD = 0,
diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSFormPage.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/RSFormPage.tsx
similarity index 87%
rename from rsconcept/frontend/src/pages/RSFormPage/RSFormPage.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/RSFormPage.tsx
index df5b93c4..68617a61 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/RSFormPage.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/RSFormPage.tsx
@@ -1,18 +1,17 @@
 'use client';
 
-import axios from 'axios';
 import { useEffect } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
 import { useParams } from 'react-router';
 import { z } from 'zod';
 
-import { useBlockNavigation, useConceptNavigation } from '@/app/Navigation/NavigationContext';
-import { urls } from '@/app/urls';
-import { ErrorData } from '@/components/info/InfoError';
-import { Divider } from '@/components/ui/Container';
-import { TextURL } from '@/components/ui/Control';
+import { urls, useBlockNavigation, useConceptNavigation } from '@/app';
+import { isAxiosError } from '@/backend/apiTransport';
+import { Divider } from '@/components/Container';
+import { TextURL } from '@/components/Control';
+import { ErrorData } from '@/components/InfoError';
+import { LibraryItemID } from '@/features/library/models/library';
 import useQueryStrings from '@/hooks/useQueryStrings';
-import { LibraryItemID } from '@/models/library';
 import { useModificationStore } from '@/stores/modification';
 
 import { RSEditState, RSTabID } from './RSEditContext';
@@ -75,7 +74,7 @@ function ProcessError({
   isArchive: boolean;
   itemID?: LibraryItemID;
 }): React.ReactElement | null {
-  if (axios.isAxiosError(error) && error.response) {
+  if (isAxiosError(error) && error.response) {
     if (error.response.status === 404) {
       return (
         <div className='flex flex-col items-center p-2 mx-auto'>
diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/RSTabs.tsx
similarity index 96%
rename from rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/RSTabs.tsx
index d61912b4..c04272c7 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/RSTabs.tsx
@@ -4,13 +4,13 @@ import clsx from 'clsx';
 import { useEffect } from 'react';
 
 import { useConceptNavigation } from '@/app/Navigation/NavigationContext';
-import { Overlay } from '@/components/ui/Container';
-import { TabLabel, TabList, TabPanel, Tabs } from '@/components/ui/Tabs';
-import { ConstituentaID } from '@/models/rsform';
+import { Overlay } from '@/components/Container';
+import { TabLabel, TabList, TabPanel, Tabs } from '@/components/Tabs';
 import { useAppLayoutStore } from '@/stores/appLayout';
 import { useModificationStore } from '@/stores/modification';
 import { labelVersion } from '@/utils/labels';
 
+import { ConstituentaID } from '../../models/rsform';
 import EditorConstituenta from './EditorConstituenta';
 import EditorRSForm from './EditorRSFormCard';
 import EditorRSList from './EditorRSList';
diff --git a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx
similarity index 63%
rename from rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx
index c325c562..df1fcb03 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx
@@ -2,15 +2,15 @@
 
 import { useEffect } from 'react';
 
+import { MiniButton } from '@/components/Control';
 import { IconChild } from '@/components/Icons';
-import SelectGraphFilter from '@/components/select/SelectGraphFilter';
-import SelectMatchMode from '@/components/select/SelectMatchMode';
-import { MiniButton } from '@/components/ui/Control';
-import { SearchBar } from '@/components/ui/SearchBar';
-import { applyGraphQuery } from '@/models/miscellaneousAPI';
-import { ConstituentaID, IConstituenta, IRSForm } from '@/models/rsform';
-import { matchConstituenta } from '@/models/rsformAPI';
-import { useCstSearchStore } from '@/stores/cstSearch';
+import { SearchBar } from '@/components/shared/SearchBar';
+
+import { ConstituentaID, IConstituenta, IRSForm } from '../../../models/rsform';
+import { matchConstituenta } from '../../../models/rsformAPI';
+import SelectMatchMode from '../../../pages/RSFormPage/ViewConstituents/SelectMatchMode';
+import { DependencyMode, useCstSearchStore } from '../../../stores/cstSearch';
+import SelectGraphFilter from './SelectGraphFilter';
 
 interface ConstituentsSearchProps {
   schema: IRSForm;
@@ -76,3 +76,35 @@ function ConstituentsSearch({ schema, activeID, activeExpression, dense, onChang
 }
 
 export default ConstituentsSearch;
+
+// ====== Internals =========
+/**
+ * Filter list of  {@link ILibraryItem} to a given graph query.
+ */
+export function applyGraphQuery(target: IRSForm, start: number, mode: DependencyMode): IConstituenta[] {
+  if (mode === DependencyMode.ALL) {
+    return target.items;
+  }
+  const ids: number[] | undefined = (() => {
+    switch (mode) {
+      case DependencyMode.OUTPUTS: {
+        return target.graph.nodes.get(start)?.outputs;
+      }
+      case DependencyMode.INPUTS: {
+        return target.graph.nodes.get(start)?.inputs;
+      }
+      case DependencyMode.EXPAND_OUTPUTS: {
+        return target.graph.expandAllOutputs([start]);
+      }
+      case DependencyMode.EXPAND_INPUTS: {
+        return target.graph.expandAllInputs([start]);
+      }
+    }
+    return undefined;
+  })();
+  if (ids) {
+    return target.items.filter(cst => ids.find(id => id === cst.id));
+  } else {
+    return target.items;
+  }
+}
diff --git a/rsconcept/frontend/src/components/select/SelectGraphFilter.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/ViewConstituents/SelectGraphFilter.tsx
similarity index 94%
rename from rsconcept/frontend/src/components/select/SelectGraphFilter.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/ViewConstituents/SelectGraphFilter.tsx
index 2db4992f..c1bab7e0 100644
--- a/rsconcept/frontend/src/components/select/SelectGraphFilter.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/ViewConstituents/SelectGraphFilter.tsx
@@ -1,14 +1,15 @@
 'use client';
 
+import { SelectorButton } from '@/components/Control';
 import { DependencyIcon } from '@/components/DomainIcons';
+import { Dropdown, DropdownButton, useDropdown } from '@/components/Dropdown';
 import { CProps } from '@/components/props';
-import { SelectorButton } from '@/components/ui/Control';
-import { Dropdown, DropdownButton, useDropdown } from '@/components/ui/Dropdown';
 import useWindowSize from '@/hooks/useWindowSize';
-import { DependencyMode } from '@/models/miscellaneous';
 import { prefixes } from '@/utils/constants';
 import { describeCstSource, labelCstSource } from '@/utils/labels';
 
+import { DependencyMode } from '../../../stores/cstSearch';
+
 interface SelectGraphFilterProps extends CProps.Styling {
   value: DependencyMode;
   onChange: (value: DependencyMode) => void;
diff --git a/rsconcept/frontend/src/components/select/SelectMatchMode.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/ViewConstituents/SelectMatchMode.tsx
similarity index 94%
rename from rsconcept/frontend/src/components/select/SelectMatchMode.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/ViewConstituents/SelectMatchMode.tsx
index 05b1cce5..f7859156 100644
--- a/rsconcept/frontend/src/components/select/SelectMatchMode.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/ViewConstituents/SelectMatchMode.tsx
@@ -1,14 +1,15 @@
 'use client';
 
+import { SelectorButton } from '@/components/Control';
 import { MatchModeIcon } from '@/components/DomainIcons';
+import { Dropdown, DropdownButton, useDropdown } from '@/components/Dropdown';
 import { CProps } from '@/components/props';
-import { SelectorButton } from '@/components/ui/Control';
-import { Dropdown, DropdownButton, useDropdown } from '@/components/ui/Dropdown';
 import useWindowSize from '@/hooks/useWindowSize';
-import { CstMatchMode } from '@/models/miscellaneous';
 import { prefixes } from '@/utils/constants';
 import { describeCstMatchMode, labelCstMatchMode } from '@/utils/labels';
 
+import { CstMatchMode } from '../../../stores/cstSearch';
+
 interface SelectMatchModeProps extends CProps.Styling {
   value: CstMatchMode;
   onChange: (value: CstMatchMode) => void;
diff --git a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/TableSideConstituents.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/ViewConstituents/TableSideConstituents.tsx
similarity index 93%
rename from rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/TableSideConstituents.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/ViewConstituents/TableSideConstituents.tsx
index 39bac663..e9084beb 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/TableSideConstituents.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/ViewConstituents/TableSideConstituents.tsx
@@ -2,14 +2,15 @@
 
 import { useEffect } from 'react';
 
-import BadgeConstituenta from '@/components/info/BadgeConstituenta';
-import DataTable, { createColumnHelper, IConditionalStyle } from '@/components/ui/DataTable';
-import { NoData, TextContent } from '@/components/ui/View';
-import { ConstituentaID, IConstituenta } from '@/models/rsform';
+import DataTable, { createColumnHelper, IConditionalStyle } from '@/components/DataTable';
+import { NoData, TextContent } from '@/components/View';
 import { APP_COLORS } from '@/styling/color';
 import { PARAMETER, prefixes } from '@/utils/constants';
 import { describeConstituenta } from '@/utils/labels';
 
+import BadgeConstituenta from '../../../components/BadgeConstituenta';
+import { ConstituentaID, IConstituenta } from '../../../models/rsform';
+
 const DESCRIPTION_MAX_SYMBOLS = 280;
 
 interface TableSideConstituentsProps {
diff --git a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ViewConstituents.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/ViewConstituents/ViewConstituents.tsx
similarity index 94%
rename from rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ViewConstituents.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/ViewConstituents/ViewConstituents.tsx
index 9be5a7bc..0946f3a4 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ViewConstituents.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/ViewConstituents/ViewConstituents.tsx
@@ -3,13 +3,13 @@
 import clsx from 'clsx';
 import { useState } from 'react';
 
+import { UserRole } from '@/features/users/models/user';
 import useWindowSize from '@/hooks/useWindowSize';
-import { IConstituenta } from '@/models/rsform';
-import { UserRole } from '@/models/user';
 import { useFitHeight } from '@/stores/appLayout';
 import { useRoleStore } from '@/stores/role';
 import { PARAMETER } from '@/utils/constants';
 
+import { IConstituenta } from '../../../models/rsform';
 import { useRSEdit } from '../RSEditContext';
 import ConstituentsSearch from './ConstituentsSearch';
 import TableSideConstituents from './TableSideConstituents';
diff --git a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/index.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/ViewConstituents/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/index.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/ViewConstituents/index.tsx
diff --git a/rsconcept/frontend/src/pages/RSFormPage/index.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/pages/RSFormPage/index.tsx
rename to rsconcept/frontend/src/features/rsform/pages/RSFormPage/index.tsx
diff --git a/rsconcept/frontend/src/stores/cstSearch.ts b/rsconcept/frontend/src/features/rsform/stores/cstSearch.ts
similarity index 79%
rename from rsconcept/frontend/src/stores/cstSearch.ts
rename to rsconcept/frontend/src/features/rsform/stores/cstSearch.ts
index 68b519a3..3f4e1715 100644
--- a/rsconcept/frontend/src/stores/cstSearch.ts
+++ b/rsconcept/frontend/src/features/rsform/stores/cstSearch.ts
@@ -1,7 +1,27 @@
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';
 
-import { CstMatchMode, DependencyMode } from '@/models/miscellaneous';
+/**
+ * Represents graph dependency mode.
+ */
+export enum DependencyMode {
+  ALL = 0,
+  OUTPUTS,
+  INPUTS,
+  EXPAND_OUTPUTS,
+  EXPAND_INPUTS
+}
+
+/**
+ * Represents {@link IConstituenta} matching mode.
+ */
+export enum CstMatchMode {
+  ALL = 1,
+  EXPR,
+  TERM,
+  TEXT,
+  NAME
+}
 
 interface CstSearchStore {
   query: string;
diff --git a/rsconcept/frontend/src/stores/termGraph.ts b/rsconcept/frontend/src/features/rsform/stores/termGraph.ts
similarity index 66%
rename from rsconcept/frontend/src/stores/termGraph.ts
rename to rsconcept/frontend/src/features/rsform/stores/termGraph.ts
index 8224690a..ca899a23 100644
--- a/rsconcept/frontend/src/stores/termGraph.ts
+++ b/rsconcept/frontend/src/features/rsform/stores/termGraph.ts
@@ -1,7 +1,33 @@
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';
 
-import { GraphColoring, GraphFilterParams } from '@/models/miscellaneous';
+/**
+ * Represents graph node coloring scheme.
+ */
+export type GraphColoring = 'none' | 'status' | 'type' | 'schemas';
+
+/**
+ * Represents parameters for GraphEditor.
+ */
+export interface GraphFilterParams {
+  noHermits: boolean;
+  noTransitive: boolean;
+  noTemplates: boolean;
+  noText: boolean;
+  foldDerived: boolean;
+
+  focusShowInputs: boolean;
+  focusShowOutputs: boolean;
+
+  allowBase: boolean;
+  allowStruct: boolean;
+  allowTerm: boolean;
+  allowAxiom: boolean;
+  allowFunction: boolean;
+  allowPredicate: boolean;
+  allowConstant: boolean;
+  allowTheorem: boolean;
+}
 
 interface TermGraphStore {
   filter: GraphFilterParams;
diff --git a/rsconcept/frontend/src/backend/users/api.ts b/rsconcept/frontend/src/features/users/backend/api.ts
similarity index 97%
rename from rsconcept/frontend/src/backend/users/api.ts
rename to rsconcept/frontend/src/features/users/backend/api.ts
index 83604031..05ef30a1 100644
--- a/rsconcept/frontend/src/backend/users/api.ts
+++ b/rsconcept/frontend/src/features/users/backend/api.ts
@@ -3,10 +3,11 @@ import { z } from 'zod';
 
 import { axiosGet, axiosPatch, axiosPost } from '@/backend/apiTransport';
 import { DELAYS } from '@/backend/configuration';
-import { IUserInfo, IUserProfile } from '@/models/user';
 import { patterns } from '@/utils/constants';
 import { errors, information } from '@/utils/labels';
 
+import { IUserInfo, IUserProfile } from '../models/user';
+
 /**
  * Represents signup data, used to create new users.
  */
diff --git a/rsconcept/frontend/src/backend/users/useLabelUser.tsx b/rsconcept/frontend/src/features/users/backend/useLabelUser.tsx
similarity index 100%
rename from rsconcept/frontend/src/backend/users/useLabelUser.tsx
rename to rsconcept/frontend/src/features/users/backend/useLabelUser.tsx
diff --git a/rsconcept/frontend/src/backend/users/useProfile.tsx b/rsconcept/frontend/src/features/users/backend/useProfile.tsx
similarity index 100%
rename from rsconcept/frontend/src/backend/users/useProfile.tsx
rename to rsconcept/frontend/src/features/users/backend/useProfile.tsx
diff --git a/rsconcept/frontend/src/backend/users/useSignup.tsx b/rsconcept/frontend/src/features/users/backend/useSignup.tsx
similarity index 85%
rename from rsconcept/frontend/src/backend/users/useSignup.tsx
rename to rsconcept/frontend/src/features/users/backend/useSignup.tsx
index 0a1b924c..8f5b00ab 100644
--- a/rsconcept/frontend/src/backend/users/useSignup.tsx
+++ b/rsconcept/frontend/src/features/users/backend/useSignup.tsx
@@ -1,8 +1,9 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
 import { DataCallback } from '@/backend/apiTransport';
-import { IUserSignupDTO, usersApi } from '@/backend/users/api';
-import { IUserProfile } from '@/models/user';
+
+import { IUserProfile } from '../models/user';
+import { IUserSignupDTO, usersApi } from './api';
 
 export const useSignup = () => {
   const client = useQueryClient();
diff --git a/rsconcept/frontend/src/backend/users/useUpdateProfile.tsx b/rsconcept/frontend/src/features/users/backend/useUpdateProfile.tsx
similarity index 88%
rename from rsconcept/frontend/src/backend/users/useUpdateProfile.tsx
rename to rsconcept/frontend/src/features/users/backend/useUpdateProfile.tsx
index ae28a59d..e05058e0 100644
--- a/rsconcept/frontend/src/backend/users/useUpdateProfile.tsx
+++ b/rsconcept/frontend/src/features/users/backend/useUpdateProfile.tsx
@@ -1,8 +1,8 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { IUserProfile } from '@/models/user';
+import { DataCallback } from '@/backend/apiTransport';
 
-import { DataCallback } from '../apiTransport';
+import { IUserProfile } from '../models/user';
 import { IUpdateProfileDTO, usersApi } from './api';
 
 export const useUpdateProfile = () => {
diff --git a/rsconcept/frontend/src/backend/users/useUsers.tsx b/rsconcept/frontend/src/features/users/backend/useUsers.tsx
similarity index 100%
rename from rsconcept/frontend/src/backend/users/useUsers.tsx
rename to rsconcept/frontend/src/features/users/backend/useUsers.tsx
diff --git a/rsconcept/frontend/src/components/select/SelectUser.tsx b/rsconcept/frontend/src/features/users/components/SelectUser.tsx
similarity index 84%
rename from rsconcept/frontend/src/components/select/SelectUser.tsx
rename to rsconcept/frontend/src/features/users/components/SelectUser.tsx
index 8cfdf0a2..b888b062 100644
--- a/rsconcept/frontend/src/components/select/SelectUser.tsx
+++ b/rsconcept/frontend/src/features/users/components/SelectUser.tsx
@@ -2,12 +2,13 @@
 
 import clsx from 'clsx';
 
-import { useLabelUser } from '@/backend/users/useLabelUser';
-import { useUsers } from '@/backend/users/useUsers';
+import { SelectSingle } from '@/components/Input';
 import { CProps } from '@/components/props';
-import { SelectSingle } from '@/components/ui/Input';
-import { UserID } from '@/models/user';
-import { matchUser } from '@/models/userAPI';
+
+import { useLabelUser } from '../backend/useLabelUser';
+import { useUsers } from '../backend/useUsers';
+import { UserID } from '../models/user';
+import { matchUser } from '../models/userAPI';
 
 interface SelectUserProps extends CProps.Styling {
   value?: UserID;
diff --git a/rsconcept/frontend/src/models/user.ts b/rsconcept/frontend/src/features/users/models/user.ts
similarity index 77%
rename from rsconcept/frontend/src/models/user.ts
rename to rsconcept/frontend/src/features/users/models/user.ts
index 56a75e3a..d11e15c5 100644
--- a/rsconcept/frontend/src/models/user.ts
+++ b/rsconcept/frontend/src/features/users/models/user.ts
@@ -2,8 +2,6 @@
  * Module: Models for Users.
  */
 
-import { LibraryItemID } from './library';
-
 /**
  * Represents {@link User} identifier type.
  */
@@ -22,16 +20,6 @@ export interface IUser {
   last_name: string;
 }
 
-/**
- * Represents CurrentUser information.
- */
-export interface ICurrentUser {
-  id: UserID | null;
-  username: string;
-  is_staff: boolean;
-  editor: LibraryItemID[];
-}
-
 /**
  * Represents user profile for viewing and editing {@link IUser}.
  */
diff --git a/rsconcept/frontend/src/models/userAPI.ts b/rsconcept/frontend/src/features/users/models/userAPI.ts
similarity index 100%
rename from rsconcept/frontend/src/models/userAPI.ts
rename to rsconcept/frontend/src/features/users/models/userAPI.ts
diff --git a/rsconcept/frontend/src/pages/RegisterPage/FormSignup.tsx b/rsconcept/frontend/src/features/users/pages/RegisterPage/FormSignup.tsx
similarity index 88%
rename from rsconcept/frontend/src/pages/RegisterPage/FormSignup.tsx
rename to rsconcept/frontend/src/features/users/pages/RegisterPage/FormSignup.tsx
index 0f764c97..455c7195 100644
--- a/rsconcept/frontend/src/pages/RegisterPage/FormSignup.tsx
+++ b/rsconcept/frontend/src/features/users/pages/RegisterPage/FormSignup.tsx
@@ -1,24 +1,24 @@
 'use client';
 
 import { zodResolver } from '@hookform/resolvers/zod';
-import axios from 'axios';
 import clsx from 'clsx';
 import { useState } from 'react';
 import { useForm } from 'react-hook-form';
 
-import { useBlockNavigation, useConceptNavigation } from '@/app/Navigation/NavigationContext';
-import { urls } from '@/app/urls';
-import { IUserSignupDTO, UserSignupSchema } from '@/backend/users/api';
-import { useSignup } from '@/backend/users/useSignup';
+import { urls, useBlockNavigation, useConceptNavigation } from '@/app';
+import { isAxiosError } from '@/backend/apiTransport';
+import { FlexColumn, Overlay, Tooltip } from '@/components/Container';
+import { Button, SubmitButton, TextURL } from '@/components/Control';
 import { IconHelp } from '@/components/Icons';
-import { ErrorData } from '@/components/info/InfoError';
-import { FlexColumn, Overlay, Tooltip } from '@/components/ui/Container';
-import { Button, SubmitButton, TextURL } from '@/components/ui/Control';
-import { Checkbox, TextInput } from '@/components/ui/Input';
-import { PrettyJson } from '@/components/ui/View';
-import { HelpTopic } from '@/models/miscellaneous';
+import { ErrorData } from '@/components/InfoError';
+import { Checkbox, TextInput } from '@/components/Input';
+import { PrettyJson } from '@/components/View';
+import { HelpTopic } from '@/features/help/models/helpTopic';
 import { globals, patterns } from '@/utils/constants';
 
+import { IUserSignupDTO, UserSignupSchema } from '../../backend/api';
+import { useSignup } from '../../backend/useSignup';
+
 function FormSignup() {
   const router = useConceptNavigation();
   const { signup, isPending, error: serverError, reset: clearServerError } = useSignup();
@@ -156,7 +156,7 @@ export default FormSignup;
 
 // ====== Internals =========
 function ServerError({ error }: { error: ErrorData }): React.ReactElement {
-  if (axios.isAxiosError(error) && error.response && error.response.status === 400) {
+  if (isAxiosError(error) && error.response && error.response.status === 400) {
     if ('email' in error.response.data) {
       return (
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
diff --git a/rsconcept/frontend/src/pages/RegisterPage/RegisterPage.tsx b/rsconcept/frontend/src/features/users/pages/RegisterPage/RegisterPage.tsx
similarity index 60%
rename from rsconcept/frontend/src/pages/RegisterPage/RegisterPage.tsx
rename to rsconcept/frontend/src/features/users/pages/RegisterPage/RegisterPage.tsx
index 3570eb29..aa1c6e90 100644
--- a/rsconcept/frontend/src/pages/RegisterPage/RegisterPage.tsx
+++ b/rsconcept/frontend/src/features/users/pages/RegisterPage/RegisterPage.tsx
@@ -1,5 +1,5 @@
-import { useAuthSuspense } from '@/backend/auth/useAuth';
-import ExpectedAnonymous from '@/components/ExpectedAnonymous';
+import { useAuthSuspense } from '@/features/auth/backend/useAuth';
+import ExpectedAnonymous from '@/features/auth/components/ExpectedAnonymous';
 
 import FormSignup from './FormSignup';
 
diff --git a/rsconcept/frontend/src/pages/RegisterPage/index.tsx b/rsconcept/frontend/src/features/users/pages/RegisterPage/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/pages/RegisterPage/index.tsx
rename to rsconcept/frontend/src/features/users/pages/RegisterPage/index.tsx
diff --git a/rsconcept/frontend/src/pages/UserProfilePage/EditorPassword.tsx b/rsconcept/frontend/src/features/users/pages/UserProfilePage/EditorPassword.tsx
similarity index 78%
rename from rsconcept/frontend/src/pages/UserProfilePage/EditorPassword.tsx
rename to rsconcept/frontend/src/features/users/pages/UserProfilePage/EditorPassword.tsx
index 6cb6be88..bc8ce92d 100644
--- a/rsconcept/frontend/src/pages/UserProfilePage/EditorPassword.tsx
+++ b/rsconcept/frontend/src/features/users/pages/UserProfilePage/EditorPassword.tsx
@@ -1,18 +1,17 @@
 'use client';
 
 import { zodResolver } from '@hookform/resolvers/zod';
-import axios from 'axios';
 import clsx from 'clsx';
 import { useForm } from 'react-hook-form';
 
-import { useConceptNavigation } from '@/app/Navigation/NavigationContext';
-import { urls } from '@/app/urls';
-import { ChangePasswordSchema, IChangePasswordDTO } from '@/backend/auth/api';
-import { useChangePassword } from '@/backend/auth/useChangePassword';
-import { ErrorData } from '@/components/info/InfoError';
-import { FlexColumn } from '@/components/ui/Container';
-import { SubmitButton } from '@/components/ui/Control';
-import { TextInput } from '@/components/ui/Input';
+import { urls, useConceptNavigation } from '@/app';
+import { isAxiosError } from '@/backend/apiTransport';
+import { FlexColumn } from '@/components/Container';
+import { SubmitButton } from '@/components/Control';
+import { ErrorData } from '@/components/InfoError';
+import { TextInput } from '@/components/Input';
+import { ChangePasswordSchema, IChangePasswordDTO } from '@/features/auth/backend/api';
+import { useChangePassword } from '@/features/auth/backend/useChangePassword';
 
 function EditorPassword() {
   const router = useConceptNavigation();
@@ -80,7 +79,7 @@ export default EditorPassword;
 
 // ====== Internals =========
 function ServerError({ error }: { error: ErrorData }): React.ReactElement {
-  if (axios.isAxiosError(error) && error.response && error.response.status === 400) {
+  if (isAxiosError(error) && error.response && error.response.status === 400) {
     return <div className='text-sm select-text text-warn-600'>Неверно введен старый пароль</div>;
   }
   throw error as Error;
diff --git a/rsconcept/frontend/src/pages/UserProfilePage/EditorProfile.tsx b/rsconcept/frontend/src/features/users/pages/UserProfilePage/EditorProfile.tsx
similarity index 80%
rename from rsconcept/frontend/src/pages/UserProfilePage/EditorProfile.tsx
rename to rsconcept/frontend/src/features/users/pages/UserProfilePage/EditorProfile.tsx
index 581e11ab..f772ddf7 100644
--- a/rsconcept/frontend/src/pages/UserProfilePage/EditorProfile.tsx
+++ b/rsconcept/frontend/src/features/users/pages/UserProfilePage/EditorProfile.tsx
@@ -1,16 +1,17 @@
 'use client';
 
 import { zodResolver } from '@hookform/resolvers/zod';
-import axios from 'axios';
 import { useForm } from 'react-hook-form';
 
-import { useBlockNavigation } from '@/app/Navigation/NavigationContext';
-import { IUpdateProfileDTO, UpdateProfileSchema } from '@/backend/users/api';
-import { useProfileSuspense } from '@/backend/users/useProfile';
-import { useUpdateProfile } from '@/backend/users/useUpdateProfile';
-import { ErrorData } from '@/components/info/InfoError';
-import { SubmitButton } from '@/components/ui/Control';
-import { TextInput } from '@/components/ui/Input';
+import { useBlockNavigation } from '@/app';
+import { isAxiosError } from '@/backend/apiTransport';
+import { SubmitButton } from '@/components/Control';
+import { ErrorData } from '@/components/InfoError';
+import { TextInput } from '@/components/Input';
+
+import { IUpdateProfileDTO, UpdateProfileSchema } from '../../backend/api';
+import { useProfileSuspense } from '../../backend/useProfile';
+import { useUpdateProfile } from '../../backend/useUpdateProfile';
 
 function EditorProfile() {
   const { profile } = useProfileSuspense();
@@ -83,7 +84,7 @@ export default EditorProfile;
 
 // ====== Internals =========
 function ServerError({ error }: { error: ErrorData }): React.ReactElement {
-  if (axios.isAxiosError(error) && error.response && error.response.status === 400) {
+  if (isAxiosError(error) && error.response && error.response.status === 400) {
     if ('email' in error.response.data) {
       return (
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
diff --git a/rsconcept/frontend/src/pages/UserProfilePage/UserProfilePage.tsx b/rsconcept/frontend/src/features/users/pages/UserProfilePage/UserProfilePage.tsx
similarity index 87%
rename from rsconcept/frontend/src/pages/UserProfilePage/UserProfilePage.tsx
rename to rsconcept/frontend/src/features/users/pages/UserProfilePage/UserProfilePage.tsx
index 1aa936dc..98109c8d 100644
--- a/rsconcept/frontend/src/pages/UserProfilePage/UserProfilePage.tsx
+++ b/rsconcept/frontend/src/features/users/pages/UserProfilePage/UserProfilePage.tsx
@@ -1,4 +1,4 @@
-import RequireAuth from '@/components/RequireAuth';
+import RequireAuth from '@/features/auth/components/RequireAuth';
 
 import EditorPassword from './EditorPassword';
 import EditorProfile from './EditorProfile';
diff --git a/rsconcept/frontend/src/pages/UserProfilePage/index.tsx b/rsconcept/frontend/src/features/users/pages/UserProfilePage/index.tsx
similarity index 100%
rename from rsconcept/frontend/src/pages/UserProfilePage/index.tsx
rename to rsconcept/frontend/src/features/users/pages/UserProfilePage/index.tsx
diff --git a/rsconcept/frontend/src/models/miscellaneousAPI.ts b/rsconcept/frontend/src/models/miscellaneousAPI.ts
deleted file mode 100644
index 95e4d5cc..00000000
--- a/rsconcept/frontend/src/models/miscellaneousAPI.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-/**
- * Module: API for miscellaneous frontend model types. Future targets for refactoring aimed at extracting modules.
- */
-import { PARAMETER } from '@/utils/constants';
-
-import { DependencyMode, GraphFilterParams, Position2D } from './miscellaneous';
-import { IOperationPosition, IOperationSchema, OperationID, OperationType } from './oss';
-import { ConstituentaID, CstType, IConstituenta, IRSForm } from './rsform';
-
-/**
- * Filter list of  {@link ILibraryItem} to a given graph query.
- */
-export function applyGraphQuery(target: IRSForm, start: number, mode: DependencyMode): IConstituenta[] {
-  if (mode === DependencyMode.ALL) {
-    return target.items;
-  }
-  const ids: number[] | undefined = (() => {
-    switch (mode) {
-      case DependencyMode.OUTPUTS: {
-        return target.graph.nodes.get(start)?.outputs;
-      }
-      case DependencyMode.INPUTS: {
-        return target.graph.nodes.get(start)?.inputs;
-      }
-      case DependencyMode.EXPAND_OUTPUTS: {
-        return target.graph.expandAllOutputs([start]);
-      }
-      case DependencyMode.EXPAND_INPUTS: {
-        return target.graph.expandAllInputs([start]);
-      }
-    }
-    return undefined;
-  })();
-  if (ids) {
-    return target.items.filter(cst => ids.find(id => id === cst.id));
-  } else {
-    return target.items;
-  }
-}
-
-/**
- * Calculate insert position for a new {@link IOperation}
- */
-export function calculateInsertPosition(
-  oss: IOperationSchema,
-  operationType: OperationType,
-  argumentsOps: OperationID[],
-  positions: IOperationPosition[],
-  defaultPosition: Position2D
-): Position2D {
-  const result = defaultPosition;
-  if (positions.length === 0) {
-    return result;
-  }
-
-  if (operationType === OperationType.INPUT) {
-    let inputsNodes = positions.filter(pos =>
-      oss.items.find(operation => operation.operation_type === OperationType.INPUT && operation.id === pos.id)
-    );
-    if (inputsNodes.length > 0) {
-      inputsNodes = positions;
-    }
-    const maxX = Math.max(...inputsNodes.map(node => node.position_x));
-    const minY = Math.min(...inputsNodes.map(node => node.position_y));
-    result.x = maxX + PARAMETER.ossDistanceX;
-    result.y = minY;
-  } else {
-    const argNodes = positions.filter(pos => argumentsOps.includes(pos.id));
-    const maxY = Math.max(...argNodes.map(node => node.position_y));
-    const minX = Math.min(...argNodes.map(node => node.position_x));
-    const maxX = Math.max(...argNodes.map(node => node.position_x));
-    result.x = Math.ceil((maxX + minX) / 2 / PARAMETER.ossGridSize) * PARAMETER.ossGridSize;
-    result.y = maxY + PARAMETER.ossDistanceY;
-  }
-
-  let flagIntersect = false;
-  do {
-    flagIntersect = positions.some(
-      position =>
-        Math.abs(position.position_x - result.x) < PARAMETER.ossMinDistance &&
-        Math.abs(position.position_y - result.y) < PARAMETER.ossMinDistance
-    );
-    if (flagIntersect) {
-      result.x += PARAMETER.ossMinDistance;
-      result.y += PARAMETER.ossMinDistance;
-    }
-  } while (flagIntersect);
-  return result;
-}
-
-export function produceFilteredGraph(schema: IRSForm, params: GraphFilterParams, focusCst: IConstituenta | undefined) {
-  const filtered = schema.graph.clone();
-  const allowedTypes: CstType[] = (() => {
-    const result: CstType[] = [];
-    if (params.allowBase) result.push(CstType.BASE);
-    if (params.allowStruct) result.push(CstType.STRUCTURED);
-    if (params.allowTerm) result.push(CstType.TERM);
-    if (params.allowAxiom) result.push(CstType.AXIOM);
-    if (params.allowFunction) result.push(CstType.FUNCTION);
-    if (params.allowPredicate) result.push(CstType.PREDICATE);
-    if (params.allowConstant) result.push(CstType.CONSTANT);
-    if (params.allowTheorem) result.push(CstType.THEOREM);
-    return result;
-  })();
-
-  if (params.noHermits) {
-    filtered.removeIsolated();
-  }
-  if (params.noTemplates) {
-    schema.items.forEach(cst => {
-      if (cst !== focusCst && cst.is_template) {
-        filtered.foldNode(cst.id);
-      }
-    });
-  }
-  if (allowedTypes.length < Object.values(CstType).length) {
-    schema.items.forEach(cst => {
-      if (cst !== focusCst && !allowedTypes.includes(cst.cst_type)) {
-        filtered.foldNode(cst.id);
-      }
-    });
-  }
-  if (!focusCst && params.foldDerived) {
-    schema.items.forEach(cst => {
-      if (cst.spawner) {
-        filtered.foldNode(cst.id);
-      }
-    });
-  }
-  if (focusCst) {
-    const includes: ConstituentaID[] = [
-      focusCst.id,
-      ...focusCst.spawn,
-      ...(params.focusShowInputs ? schema.graph.expandInputs([focusCst.id]) : []),
-      ...(params.focusShowOutputs ? schema.graph.expandOutputs([focusCst.id]) : [])
-    ];
-    schema.items.forEach(cst => {
-      if (!includes.includes(cst.id)) {
-        filtered.foldNode(cst.id);
-      }
-    });
-  }
-  if (params.noTransitive) {
-    filtered.transitiveReduction();
-  }
-
-  return filtered;
-}
diff --git a/rsconcept/frontend/src/stores/dialogs.ts b/rsconcept/frontend/src/stores/dialogs.ts
index 2b2bf779..62db4701 100644
--- a/rsconcept/frontend/src/stores/dialogs.ts
+++ b/rsconcept/frontend/src/stores/dialogs.ts
@@ -1,28 +1,56 @@
 import { create } from 'zustand';
 
-import { DlgChangeInputSchemaProps } from '@/dialogs/DlgChangeInputSchema';
-import { DlgChangeLocationProps } from '@/dialogs/DlgChangeLocation';
-import { DlgCloneLibraryItemProps } from '@/dialogs/DlgCloneLibraryItem';
-import { DlgCreateCstProps } from '@/dialogs/DlgCreateCst/DlgCreateCst';
-import { DlgCreateOperationProps } from '@/dialogs/DlgCreateOperation/DlgCreateOperation';
-import { DlgCreateVersionProps } from '@/dialogs/DlgCreateVersion';
-import { DlgCstTemplateProps } from '@/dialogs/DlgCstTemplate/DlgCstTemplate';
-import { DlgDeleteCstProps } from '@/dialogs/DlgDeleteCst/DlgDeleteCst';
-import { DlgDeleteOperationProps } from '@/dialogs/DlgDeleteOperation';
-import { DlgEditEditorsProps } from '@/dialogs/DlgEditEditors/DlgEditEditors';
-import { DlgEditOperationProps } from '@/dialogs/DlgEditOperation/DlgEditOperation';
-import { DlgEditReferenceProps } from '@/dialogs/DlgEditReference/DlgEditReference';
-import { DlgEditVersionsProps } from '@/dialogs/DlgEditVersions/DlgEditVersions';
-import { DlgEditWordFormsProps } from '@/dialogs/DlgEditWordForms/DlgEditWordForms';
-import { DlgInlineSynthesisProps } from '@/dialogs/DlgInlineSynthesis/DlgInlineSynthesis';
-import { DlgRelocateConstituentsProps } from '@/dialogs/DlgRelocateConstituents';
-import { DlgRenameCstProps } from '@/dialogs/DlgRenameCst';
-import { DlgShowASTProps } from '@/dialogs/DlgShowAST/DlgShowAST';
-import { DlgShowQRProps } from '@/dialogs/DlgShowQR';
-import { DlgShowTypeGraphProps } from '@/dialogs/DlgShowTypeGraph/DlgShowTypeGraph';
-import { DlgSubstituteCstProps } from '@/dialogs/DlgSubstituteCst';
-import { DlgUploadRSFormProps } from '@/dialogs/DlgUploadRSForm';
-import { DialogType } from '@/models/miscellaneous';
+import { DlgChangeLocationProps } from '@/features/library/dialogs/DlgChangeLocation';
+import { DlgChangeInputSchemaProps } from '@/features/oss/dialogs/DlgChangeInputSchema';
+import { DlgCreateOperationProps } from '@/features/oss/dialogs/DlgCreateOperation/DlgCreateOperation';
+import { DlgDeleteOperationProps } from '@/features/oss/dialogs/DlgDeleteOperation';
+import { DlgEditOperationProps } from '@/features/oss/dialogs/DlgEditOperation/DlgEditOperation';
+import { DlgRelocateConstituentsProps } from '@/features/oss/dialogs/DlgRelocateConstituents';
+import { DlgCloneLibraryItemProps } from '@/features/rsform/dialogs/DlgCloneLibraryItem';
+import { DlgCreateCstProps } from '@/features/rsform/dialogs/DlgCreateCst/DlgCreateCst';
+import { DlgCreateVersionProps } from '@/features/rsform/dialogs/DlgCreateVersion';
+import { DlgCstTemplateProps } from '@/features/rsform/dialogs/DlgCstTemplate/DlgCstTemplate';
+import { DlgDeleteCstProps } from '@/features/rsform/dialogs/DlgDeleteCst/DlgDeleteCst';
+import { DlgEditEditorsProps } from '@/features/rsform/dialogs/DlgEditEditors/DlgEditEditors';
+import { DlgEditReferenceProps } from '@/features/rsform/dialogs/DlgEditReference/DlgEditReference';
+import { DlgEditVersionsProps } from '@/features/rsform/dialogs/DlgEditVersions/DlgEditVersions';
+import { DlgEditWordFormsProps } from '@/features/rsform/dialogs/DlgEditWordForms/DlgEditWordForms';
+import { DlgInlineSynthesisProps } from '@/features/rsform/dialogs/DlgInlineSynthesis/DlgInlineSynthesis';
+import { DlgRenameCstProps } from '@/features/rsform/dialogs/DlgRenameCst';
+import { DlgShowASTProps } from '@/features/rsform/dialogs/DlgShowAST/DlgShowAST';
+import { DlgShowQRProps } from '@/features/rsform/dialogs/DlgShowQR';
+import { DlgShowTypeGraphProps } from '@/features/rsform/dialogs/DlgShowTypeGraph/DlgShowTypeGraph';
+import { DlgSubstituteCstProps } from '@/features/rsform/dialogs/DlgSubstituteCst';
+import { DlgUploadRSFormProps } from '@/features/rsform/dialogs/DlgUploadRSForm';
+
+/**
+ * Represents global dialog.
+ */
+export enum DialogType {
+  CONSTITUENTA_TEMPLATE = 1,
+  CREATE_CONSTITUENTA,
+  CREATE_OPERATION,
+  DELETE_CONSTITUENTA,
+  EDIT_EDITORS,
+  EDIT_OPERATION,
+  EDIT_REFERENCE,
+  EDIT_VERSIONS,
+  EDIT_WORD_FORMS,
+  INLINE_SYNTHESIS,
+  SHOW_AST,
+  SHOW_TYPE_GRAPH,
+  CHANGE_INPUT_SCHEMA,
+  CHANGE_LOCATION,
+  CLONE_LIBRARY_ITEM,
+  CREATE_VERSION,
+  DELETE_OPERATION,
+  GRAPH_PARAMETERS,
+  RELOCATE_CONSTITUENTS,
+  RENAME_CONSTITUENTA,
+  SHOW_QR_CODE,
+  SUBSTITUTE_CONSTITUENTS,
+  UPLOAD_RSFORM
+}
 
 interface DialogsStore {
   active: DialogType | undefined;
diff --git a/rsconcept/frontend/src/stores/role.ts b/rsconcept/frontend/src/stores/role.ts
index f9dce63c..e022891b 100644
--- a/rsconcept/frontend/src/stores/role.ts
+++ b/rsconcept/frontend/src/stores/role.ts
@@ -1,6 +1,6 @@
 import { create } from 'zustand';
 
-import { UserRole } from '@/models/user';
+import { UserRole } from '@/features/users/models/user';
 
 export interface RoleFlags {
   isOwner: boolean;
diff --git a/rsconcept/frontend/src/stores/tooltips.ts b/rsconcept/frontend/src/stores/tooltips.ts
index 2ad6449f..38db9c18 100644
--- a/rsconcept/frontend/src/stores/tooltips.ts
+++ b/rsconcept/frontend/src/stores/tooltips.ts
@@ -1,6 +1,6 @@
 import { create } from 'zustand';
 
-import { IConstituenta } from '@/models/rsform';
+import { IConstituenta } from '@/features/rsform/models/rsform';
 
 interface TooltipsStore {
   activeCst: IConstituenta | undefined;
diff --git a/rsconcept/frontend/src/styling/color.ts b/rsconcept/frontend/src/styling/color.ts
index 5990636a..5f8b7324 100644
--- a/rsconcept/frontend/src/styling/color.ts
+++ b/rsconcept/frontend/src/styling/color.ts
@@ -2,11 +2,11 @@
  * Module: Single place for all color definitions in code (see index.css for full defs).
  */
 
-import { GramData, Grammeme, NounGrams, PartOfSpeech, VerbGrams } from '@/models/language';
-import { GraphColoring } from '@/models/miscellaneous';
-import { CstClass, ExpressionStatus, IConstituenta } from '@/models/rsform';
-import { ISyntaxTreeNode, TokenID } from '@/models/rslang';
-import { TMGraphNode } from '@/models/TMGraph';
+import { GramData, Grammeme, NounGrams, PartOfSpeech, VerbGrams } from '@/features/rsform/models/language';
+import { CstClass, ExpressionStatus, IConstituenta } from '@/features/rsform/models/rsform';
+import { ISyntaxTreeNode, TokenID } from '@/features/rsform/models/rslang';
+import { TMGraphNode } from '@/features/rsform/models/TMGraph';
+import { GraphColoring } from '@/features/rsform/stores/termGraph';
 import { PARAMETER } from '@/utils/constants';
 
 /** Semantic colors for application. */
diff --git a/rsconcept/frontend/src/utils/codemirror.ts b/rsconcept/frontend/src/utils/codemirror.ts
index 05520694..adf778f2 100644
--- a/rsconcept/frontend/src/utils/codemirror.ts
+++ b/rsconcept/frontend/src/utils/codemirror.ts
@@ -6,14 +6,14 @@ import { NodeType, Tree, TreeCursor } from '@lezer/common';
 import { EditorState, ReactCodeMirrorRef, SelectionRange, TooltipView } from '@uiw/react-codemirror';
 import clsx from 'clsx';
 
-import { ReferenceTokens } from '@/components/RefsInput/parse';
-import { RefEntity } from '@/components/RefsInput/parse/parser.terms';
-import { GlobalTokens } from '@/components/RSInput/rslang';
-import { IEntityReference, ISyntacticReference } from '@/models/language';
-import { parseEntityReference, parseGrammemes, parseSyntacticReference } from '@/models/languageAPI';
-import { IConstituenta } from '@/models/rsform';
-import { isBasicConcept } from '@/models/rsformAPI';
-import { SyntaxTree } from '@/models/rslang';
+import { ReferenceTokens } from '@/features/rsform/components/RefsInput/parse';
+import { RefEntity } from '@/features/rsform/components/RefsInput/parse/parser.terms';
+import { GlobalTokens } from '@/features/rsform/components/RSInput/rslang';
+import { IEntityReference, ISyntacticReference } from '@/features/rsform/models/language';
+import { parseEntityReference, parseGrammemes, parseSyntacticReference } from '@/features/rsform/models/languageAPI';
+import { IConstituenta } from '@/features/rsform/models/rsform';
+import { isBasicConcept } from '@/features/rsform/models/rsformAPI';
+import { SyntaxTree } from '@/features/rsform/models/rslang';
 import { APP_COLORS, colorFgGrammeme } from '@/styling/color';
 
 import { PARAMETER } from './constants';
diff --git a/rsconcept/frontend/src/utils/labels.ts b/rsconcept/frontend/src/utils/labels.ts
index 66485ed6..32cb06f0 100644
--- a/rsconcept/frontend/src/utils/labels.ts
+++ b/rsconcept/frontend/src/utils/labels.ts
@@ -4,13 +4,12 @@
  * Label is a short text used to represent an entity.
  * Description is a long description used in tooltips.
  */
-import { FolderNode } from '@/models/FolderTree';
-import { GramData, Grammeme, ReferenceType } from '@/models/language';
-import { AccessPolicy, LibraryItemType, LocationHead } from '@/models/library';
-import { validateLocation } from '@/models/libraryAPI';
-import { CstMatchMode, DependencyMode, GraphColoring, HelpTopic } from '@/models/miscellaneous';
-import { ISubstitutionErrorDescription, OperationType, SubstitutionErrorType } from '@/models/oss';
-import { CstClass, CstType, ExpressionStatus, IConstituenta, IRSForm } from '@/models/rsform';
+import { HelpTopic } from '@/features/help/models/helpTopic';
+import { AccessPolicy, LibraryItemType, LocationHead } from '@/features/library/models/library';
+import { validateLocation } from '@/features/library/models/libraryAPI';
+import { ISubstitutionErrorDescription, OperationType, SubstitutionErrorType } from '@/features/oss/models/oss';
+import { GramData, Grammeme, ReferenceType } from '@/features/rsform/models/language';
+import { CstClass, CstType, ExpressionStatus, IConstituenta, IRSForm } from '@/features/rsform/models/rsform';
 import {
   IArgumentInfo,
   IRSErrorDescription,
@@ -18,8 +17,11 @@ import {
   ParsingStatus,
   RSErrorType,
   TokenID
-} from '@/models/rslang';
-import { UserRole } from '@/models/user';
+} from '@/features/rsform/models/rslang';
+import { CstMatchMode, DependencyMode } from '@/features/rsform/stores/cstSearch';
+import { GraphColoring } from '@/features/rsform/stores/termGraph';
+import { UserRole } from '@/features/users/models/user';
+import { FolderNode } from '@/models/FolderTree';
 
 import { PARAMETER } from './constants';
 
diff --git a/rsconcept/frontend/src/utils/selectors.ts b/rsconcept/frontend/src/utils/selectors.ts
deleted file mode 100644
index 5a399377..00000000
--- a/rsconcept/frontend/src/utils/selectors.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * Module: Mappings for selector UI elements. Do not confuse with html selectors
- */
-
-import { type GramData, Grammeme, ReferenceType } from '@/models/language';
-import { grammemeCompare } from '@/models/languageAPI';
-import { GraphColoring } from '@/models/miscellaneous';
-import { CstType } from '@/models/rsform';
-
-import { labelGrammeme, labelReferenceType, mapLabelColoring } from './labels';
-import { labelCstType } from './labels';
-
-/**
- * Represents options for {@link GraphColoring} selector.
- */
-export const SelectorGraphColoring: { value: GraphColoring; label: string }[] = //
-  [...mapLabelColoring.entries()].map(item => ({ value: item[0], label: item[1] }));
-
-/**
- * Represents options for {@link CstType} selector.
- */
-export const SelectorCstType = Object.values(CstType).map(typeStr => ({
-  value: typeStr as CstType,
-  label: labelCstType(typeStr as CstType)
-}));
-
-/**
- * Represents single option for {@link Grammeme} selector.
- */
-export interface IGrammemeOption {
-  value: GramData;
-  label: string;
-}
-
-/**
- * Compares {@link IGrammemeOption} based on Grammeme comparison.
- */
-export function compareGrammemeOptions(left: IGrammemeOption, right: IGrammemeOption): number {
-  return grammemeCompare(left.value, right.value);
-}
-
-/**
- * Represents list of {@link Grammeme}s available in reference construction.
- */
-// prettier-ignore
-export const SelectorGrammemesList = [
-  Grammeme.sing, Grammeme.plur,
-  Grammeme.nomn, Grammeme.gent, Grammeme.datv,
-  Grammeme.accs, Grammeme.ablt, Grammeme.loct,
-];
-
-/**
- * Represents options for {@link Grammeme} selector.
- */
-export const SelectorGrammemes: IGrammemeOption[] = SelectorGrammemesList.map(gram => ({
-  value: gram,
-  label: labelGrammeme(gram)
-}));
-
-/**
- * Represents options for {@link ReferenceType} selector.
- */
-export const SelectorReferenceType = Object.values(ReferenceType).map(typeStr => ({
-  value: typeStr as ReferenceType,
-  label: labelReferenceType(typeStr as ReferenceType)
-}));
-
-/**
- * Represents recommended wordforms data.
- */
-export const DefaultWordForms = [
-  { text: 'ед им', example: 'ручка', grams: [Grammeme.sing, Grammeme.nomn] },
-  { text: 'ед род', example: 'ручки', grams: [Grammeme.sing, Grammeme.gent] },
-  { text: 'ед дат', example: 'ручке', grams: [Grammeme.sing, Grammeme.datv] },
-  { text: 'ед вин', example: 'ручку', grams: [Grammeme.sing, Grammeme.accs] },
-  { text: 'ед твор', example: 'ручкой', grams: [Grammeme.sing, Grammeme.ablt] },
-  { text: 'ед пред', example: 'ручке', grams: [Grammeme.sing, Grammeme.loct] },
-
-  { text: 'мн им', example: 'ручки', grams: [Grammeme.plur, Grammeme.nomn] },
-  { text: 'мн род', example: 'ручек', grams: [Grammeme.plur, Grammeme.gent] },
-  { text: 'мн дат', example: 'ручкам', grams: [Grammeme.plur, Grammeme.datv] },
-  { text: 'мн вин', example: 'ручки', grams: [Grammeme.plur, Grammeme.accs] },
-  { text: 'мн твор', example: 'ручками', grams: [Grammeme.plur, Grammeme.ablt] },
-  { text: 'мн пред', example: 'ручках', grams: [Grammeme.plur, Grammeme.loct] }
-];
diff --git a/rsconcept/frontend/src/utils/utils.ts b/rsconcept/frontend/src/utils/utils.ts
index be484e0d..b479a8c7 100644
--- a/rsconcept/frontend/src/utils/utils.ts
+++ b/rsconcept/frontend/src/utils/utils.ts
@@ -2,11 +2,9 @@
  * Module: Utility functions.
  */
 
-import axios, { AxiosError, AxiosHeaderValue, AxiosResponse } from 'axios';
+import { AxiosError, AxiosHeaderValue, AxiosResponse, isAxiosError } from 'axios';
 import { toast } from 'react-toastify';
 
-import { AliasMapping } from '@/models/rslang';
-
 import { information, prompts } from './labels';
 
 /**
@@ -46,29 +44,6 @@ export class TextMatcher {
   }
 }
 
-/**
- * Text substitution guided by mapping and regular expression.
- */
-export function applyPattern(text: string, mapping: AliasMapping, pattern: RegExp): string {
-  if (text === '' || pattern === null) {
-    return text;
-  }
-  let posInput = 0;
-  let output = '';
-  const patternMatches = text.matchAll(pattern);
-  for (const segment of patternMatches) {
-    const entity = segment[0];
-    const start = segment.index ?? 0;
-    if (entity in mapping) {
-      output += text.substring(posInput, start);
-      output += mapping[entity];
-      posInput = start + segment[0].length;
-    }
-  }
-  output += text.substring(posInput);
-  return output;
-}
-
 /**
  * Truncate text to last word up to max symbols. Add ellipsis if truncated.
  */
@@ -158,7 +133,7 @@ export function tripleToggleColor(value: boolean | undefined): string {
  * Extract error message from error object.
  */
 export function extractErrorMessage(error: Error | AxiosError): string {
-  if (axios.isAxiosError(error)) {
+  if (isAxiosError(error)) {
     if (error.response && error.response.status === 400) {
       const data = error.response.data as Record<string, unknown>;
       const keys = Object.keys(data);