diff --git a/src/entities/content/ui/DetailMovieContentContainer.tsx b/src/entities/content/ui/DetailMovieContentContainer.tsx
index 68e05f6..0cb8f37 100644
--- a/src/entities/content/ui/DetailMovieContentContainer.tsx
+++ b/src/entities/content/ui/DetailMovieContentContainer.tsx
@@ -1,7 +1,7 @@
 'use client'
 
 import { generateContents } from '@/entities/mock/generate'
-import { DetailContentForm } from '@/features/detail/DetailContentForm'
+import { DetailContentForm } from '@/features/detail/ui'
 import { OneMovieContent } from '@/widgets/content'
 
 import styles from './detail-movie-content-container.module.scss'
diff --git a/src/features/auth/ConfirmField.tsx b/src/features/auth/ui/ConfirmField.tsx
similarity index 100%
rename from src/features/auth/ConfirmField.tsx
rename to src/features/auth/ui/ConfirmField.tsx
diff --git a/src/features/auth/GuestButtons.tsx b/src/features/auth/ui/GuestButtons.tsx
similarity index 100%
rename from src/features/auth/GuestButtons.tsx
rename to src/features/auth/ui/GuestButtons.tsx
diff --git a/src/features/auth/SignForm.module.scss b/src/features/auth/ui/SignForm.module.scss
similarity index 100%
rename from src/features/auth/SignForm.module.scss
rename to src/features/auth/ui/SignForm.module.scss
diff --git a/src/features/auth/SignInForm.tsx b/src/features/auth/ui/SignInForm.tsx
similarity index 93%
rename from src/features/auth/SignInForm.tsx
rename to src/features/auth/ui/SignInForm.tsx
index 77f122b..da82b9b 100644
--- a/src/features/auth/SignInForm.tsx
+++ b/src/features/auth/ui/SignInForm.tsx
@@ -3,10 +3,10 @@
 import { KeyRound, Mail } from 'lucide-react'
 import { ChangeEventHandler, useState } from 'react'
 
-import { SubmitButton } from '@/features/auth/SubmitButton'
 import { TextFiled } from '@/shared/ui/TextFiled'
 
 import styles from './SignForm.module.scss'
+import { SubmitButton } from './SubmitButton'
 
 export function SignInForm() {
   const [id, setId] = useState(() => '')
diff --git a/src/features/auth/SignUpForm.tsx b/src/features/auth/ui/SignUpForm.tsx
similarity index 93%
rename from src/features/auth/SignUpForm.tsx
rename to src/features/auth/ui/SignUpForm.tsx
index dc3e2a9..7cb158f 100644
--- a/src/features/auth/SignUpForm.tsx
+++ b/src/features/auth/ui/SignUpForm.tsx
@@ -3,11 +3,12 @@
 import { KeyRound, KeySquare, Mail, UserRound } from 'lucide-react'
 import { ChangeEventHandler, useState } from 'react'
 
-import { ConfirmField } from '@/features/auth/ConfirmField'
-import styles from '@/features/auth/SignForm.module.scss'
-import { SubmitButton } from '@/features/auth/SubmitButton'
 import { TextFiled } from '@/shared/ui/TextFiled'
 
+import { ConfirmField } from './ConfirmField'
+import styles from './SignForm.module.scss'
+import { SubmitButton } from './SubmitButton'
+
 export function SignUpForm() {
   const [nickname, setNickname] = useState(() => '')
   const [email, setEmail] = useState(() => '')
diff --git a/src/features/auth/SubmitButton.tsx b/src/features/auth/ui/SubmitButton.tsx
similarity index 100%
rename from src/features/auth/SubmitButton.tsx
rename to src/features/auth/ui/SubmitButton.tsx
diff --git a/src/features/auth/UserButton.tsx b/src/features/auth/ui/UserButton.tsx
similarity index 100%
rename from src/features/auth/UserButton.tsx
rename to src/features/auth/ui/UserButton.tsx
diff --git a/src/features/auth/confirm-field.module.scss b/src/features/auth/ui/confirm-field.module.scss
similarity index 100%
rename from src/features/auth/confirm-field.module.scss
rename to src/features/auth/ui/confirm-field.module.scss
diff --git a/src/features/auth/guest-buttons.module.scss b/src/features/auth/ui/guest-buttons.module.scss
similarity index 100%
rename from src/features/auth/guest-buttons.module.scss
rename to src/features/auth/ui/guest-buttons.module.scss
diff --git a/src/features/auth/index.ts b/src/features/auth/ui/index.ts
similarity index 51%
rename from src/features/auth/index.ts
rename to src/features/auth/ui/index.ts
index 0754a6a..f0a002f 100644
--- a/src/features/auth/index.ts
+++ b/src/features/auth/ui/index.ts
@@ -1,4 +1,4 @@
 export { GuestButtons } from './GuestButtons'
-export {} from './SignInForm'
-export {} from './SignUpForm'
+export { SignInForm } from './SignInForm'
+export { SignUpForm } from './SignUpForm'
 export { UserButton } from './UserButton'
diff --git a/src/features/auth/submit-button.module.scss b/src/features/auth/ui/submit-button.module.scss
similarity index 100%
rename from src/features/auth/submit-button.module.scss
rename to src/features/auth/ui/submit-button.module.scss
diff --git a/src/features/auth/user-button.module.scss b/src/features/auth/ui/user-button.module.scss
similarity index 100%
rename from src/features/auth/user-button.module.scss
rename to src/features/auth/ui/user-button.module.scss
diff --git a/src/features/detail/DetailContentForm.tsx b/src/features/detail/ui/DetailContentForm.tsx
similarity index 100%
rename from src/features/detail/DetailContentForm.tsx
rename to src/features/detail/ui/DetailContentForm.tsx
diff --git a/src/features/detail/detail-content-form.module.scss b/src/features/detail/ui/detail-content-form.module.scss
similarity index 100%
rename from src/features/detail/detail-content-form.module.scss
rename to src/features/detail/ui/detail-content-form.module.scss
diff --git a/src/features/detail/index.ts b/src/features/detail/ui/index.ts
similarity index 100%
rename from src/features/detail/index.ts
rename to src/features/detail/ui/index.ts
diff --git a/src/features/search/HeaderSearchBar.tsx b/src/features/search/ui/HeaderSearchBar.tsx
similarity index 97%
rename from src/features/search/HeaderSearchBar.tsx
rename to src/features/search/ui/HeaderSearchBar.tsx
index 23a4b9c..f8d7957 100644
--- a/src/features/search/HeaderSearchBar.tsx
+++ b/src/features/search/ui/HeaderSearchBar.tsx
@@ -6,7 +6,7 @@ import { useRouter } from 'next/navigation'
 import { useState } from 'react'
 
 import { SITE_PATH } from '@/shared/constants'
-import { quando } from '@/shared/font/quando'
+import { quando } from '@/shared/font'
 
 import styles from './header-search-bar.module.scss'
 
diff --git a/src/features/search/header-search-bar.module.scss b/src/features/search/ui/header-search-bar.module.scss
similarity index 100%
rename from src/features/search/header-search-bar.module.scss
rename to src/features/search/ui/header-search-bar.module.scss
diff --git a/src/features/search/index.ts b/src/features/search/ui/index.ts
similarity index 100%
rename from src/features/search/index.ts
rename to src/features/search/ui/index.ts
diff --git a/src/widgets/auth/SignInSection.tsx b/src/widgets/auth/SignInSection.tsx
index 3bab5b5..1b0e884 100644
--- a/src/widgets/auth/SignInSection.tsx
+++ b/src/widgets/auth/SignInSection.tsx
@@ -1,4 +1,4 @@
-import { SignInForm } from '@/features/auth/SignInForm'
+import { SignInForm } from '@/features/auth/ui'
 import { SignLottie } from '@/widgets/auth/SignLottie'
 
 import styles from './sign-section.module.scss'
diff --git a/src/widgets/auth/SignUpSection.tsx b/src/widgets/auth/SignUpSection.tsx
index 40df7a2..fb487c0 100644
--- a/src/widgets/auth/SignUpSection.tsx
+++ b/src/widgets/auth/SignUpSection.tsx
@@ -1,7 +1,7 @@
-import { SignUpForm } from '@/features/auth/SignUpForm'
-import { SignLottie } from '@/widgets/auth/SignLottie'
+import { SignUpForm } from '@/features/auth/ui'
 
 import styles from './sign-section.module.scss'
+import { SignLottie } from './SignLottie'
 
 export function SignUpSection() {
   return (
diff --git a/src/widgets/layout/Header.tsx b/src/widgets/layout/Header.tsx
index 8f39d30..b197450 100644
--- a/src/widgets/layout/Header.tsx
+++ b/src/widgets/layout/Header.tsx
@@ -2,7 +2,7 @@
 
 import classNames from 'classnames'
 
-import { HeaderSearchBar } from '@/features/search'
+import { HeaderSearchBar } from '@/features/search/ui'
 import { useScrollDown } from '@/shared/hook'
 
 import styles from './header.module.scss'
diff --git a/src/widgets/layout/UserStatusButton.tsx b/src/widgets/layout/UserStatusButton.tsx
index 4e1f681..5f77ab2 100644
--- a/src/widgets/layout/UserStatusButton.tsx
+++ b/src/widgets/layout/UserStatusButton.tsx
@@ -1,4 +1,4 @@
-import { GuestButtons, UserButton } from '@/features/auth'
+import { GuestButtons, UserButton } from '@/features/auth/ui'
 
 type Props = {
   isLogin: boolean