diff --git a/src/App.js b/src/App.js
index c4383e9..41e52be 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,5 +1,5 @@
-import { Main } from "./components/Main/Main";
+import { MainLayout } from "./components/layouts/MainLayout/MainLayout";
 
 export default function App() {
-  return <Main />;
+  return <MainLayout />;
 }
diff --git a/src/components/Input/Input.js b/src/components/common/atoms/Input/Input.js
similarity index 100%
rename from src/components/Input/Input.js
rename to src/components/common/atoms/Input/Input.js
diff --git a/src/components/Input/Input.module.scss b/src/components/common/atoms/Input/Input.module.scss
similarity index 100%
rename from src/components/Input/Input.module.scss
rename to src/components/common/atoms/Input/Input.module.scss
diff --git a/src/components/Results/Results.js b/src/components/features/results/Results/Results.js
similarity index 87%
rename from src/components/Results/Results.js
rename to src/components/features/results/Results/Results.js
index 44f3db0..c6703a1 100644
--- a/src/components/Results/Results.js
+++ b/src/components/features/results/Results/Results.js
@@ -1,6 +1,6 @@
 import { TranslationBlock } from "../TranslationBlock/TranslationBlock";
 import styles from "./Results.module.scss";
-import { useSearch } from "../../context/SearchContext";
+import { useSearch } from "../../../../context/SearchContext";
 
 export function Results() {
   const { searchResults } = useSearch();
diff --git a/src/components/Results/Results.module.scss b/src/components/features/results/Results/Results.module.scss
similarity index 100%
rename from src/components/Results/Results.module.scss
rename to src/components/features/results/Results/Results.module.scss
diff --git a/src/components/TranslationBlock/TranslationBlock.js b/src/components/features/results/TranslationBlock/TranslationBlock.js
similarity index 95%
rename from src/components/TranslationBlock/TranslationBlock.js
rename to src/components/features/results/TranslationBlock/TranslationBlock.js
index a7e726f..7f3340c 100644
--- a/src/components/TranslationBlock/TranslationBlock.js
+++ b/src/components/features/results/TranslationBlock/TranslationBlock.js
@@ -2,7 +2,7 @@ import { TranslationBlockHeader } from "../TranslationBlockHeader/TranslationBlo
 import { TranslationSubject } from "../TranslationSubject/TranslationSubject";
 import { TranslationOption } from "../TranslationOption/TranslationOption";
 import styles from "./TranslationBlock.module.scss";
-import { useSearchDispatch } from "../../context/SearchContext";
+import { useSearchDispatch } from "../../../../context/SearchContext";
 
 export function TranslationBlock({ translationBlock: tb }) {
   const dispatch = useSearchDispatch();
diff --git a/src/components/TranslationBlock/TranslationBlock.module.scss b/src/components/features/results/TranslationBlock/TranslationBlock.module.scss
similarity index 100%
rename from src/components/TranslationBlock/TranslationBlock.module.scss
rename to src/components/features/results/TranslationBlock/TranslationBlock.module.scss
diff --git a/src/components/TranslationBlockHeader/TranslationBlockHeader.js b/src/components/features/results/TranslationBlockHeader/TranslationBlockHeader.js
similarity index 100%
rename from src/components/TranslationBlockHeader/TranslationBlockHeader.js
rename to src/components/features/results/TranslationBlockHeader/TranslationBlockHeader.js
diff --git a/src/components/TranslationBlockHeader/TranslationBlockHeader.module.scss b/src/components/features/results/TranslationBlockHeader/TranslationBlockHeader.module.scss
similarity index 100%
rename from src/components/TranslationBlockHeader/TranslationBlockHeader.module.scss
rename to src/components/features/results/TranslationBlockHeader/TranslationBlockHeader.module.scss
diff --git a/src/components/TranslationOption/TranslationOption.js b/src/components/features/results/TranslationOption/TranslationOption.js
similarity index 100%
rename from src/components/TranslationOption/TranslationOption.js
rename to src/components/features/results/TranslationOption/TranslationOption.js
diff --git a/src/components/TranslationOption/TranslationOption.module.scss b/src/components/features/results/TranslationOption/TranslationOption.module.scss
similarity index 100%
rename from src/components/TranslationOption/TranslationOption.module.scss
rename to src/components/features/results/TranslationOption/TranslationOption.module.scss
diff --git a/src/components/TranslationSubject/TranslationSubject.js b/src/components/features/results/TranslationSubject/TranslationSubject.js
similarity index 100%
rename from src/components/TranslationSubject/TranslationSubject.js
rename to src/components/features/results/TranslationSubject/TranslationSubject.js
diff --git a/src/components/TranslationSubject/TranslationSubject.module.scss b/src/components/features/results/TranslationSubject/TranslationSubject.module.scss
similarity index 100%
rename from src/components/TranslationSubject/TranslationSubject.module.scss
rename to src/components/features/results/TranslationSubject/TranslationSubject.module.scss
diff --git a/src/components/Search/Search.js b/src/components/features/search/Search/Search.js
similarity index 94%
rename from src/components/Search/Search.js
rename to src/components/features/search/Search/Search.js
index 5fc80a9..e261b94 100644
--- a/src/components/Search/Search.js
+++ b/src/components/features/search/Search/Search.js
@@ -1,8 +1,11 @@
 import { useState, useEffect } from "react";
-import { Input } from "../Input/Input";
+import { Input } from "../../../common/atoms/Input/Input";
 import { SearchOptions } from "../SearchOptions/SearchOptions";
 import styles from "./Search.module.scss";
-import { useSearchDispatch, useSearch } from "../../context/SearchContext";
+import {
+  useSearchDispatch,
+  useSearch,
+} from "../../../../context/SearchContext";
 
 export function Search() {
   const [query, setQuery] = useState("");
diff --git a/src/components/Search/Search.module.scss b/src/components/features/search/Search/Search.module.scss
similarity index 100%
rename from src/components/Search/Search.module.scss
rename to src/components/features/search/Search/Search.module.scss
diff --git a/src/components/SearchOptions/SearchOptions.js b/src/components/features/search/SearchOptions/SearchOptions.js
similarity index 90%
rename from src/components/SearchOptions/SearchOptions.js
rename to src/components/features/search/SearchOptions/SearchOptions.js
index a9ba7b1..b2ed2fa 100644
--- a/src/components/SearchOptions/SearchOptions.js
+++ b/src/components/features/search/SearchOptions/SearchOptions.js
@@ -1,4 +1,4 @@
-import { useSearchDispatch } from "../../context/SearchContext";
+import { useSearchDispatch } from "../../../../context/SearchContext";
 import styles from "./SearchOptions.module.scss";
 
 export function SearchOptions({ options, selectedIndex }) {
diff --git a/src/components/SearchOptions/SearchOptions.module.scss b/src/components/features/search/SearchOptions/SearchOptions.module.scss
similarity index 100%
rename from src/components/SearchOptions/SearchOptions.module.scss
rename to src/components/features/search/SearchOptions/SearchOptions.module.scss
diff --git a/src/components/Main/Main.js b/src/components/layouts/MainLayout/MainLayout.js
similarity index 50%
rename from src/components/Main/Main.js
rename to src/components/layouts/MainLayout/MainLayout.js
index 8315fb9..8db2d12 100644
--- a/src/components/Main/Main.js
+++ b/src/components/layouts/MainLayout/MainLayout.js
@@ -1,10 +1,9 @@
-import { useState } from "react";
-import { Search } from "../Search/Search";
-import { Results } from "../Results/Results";
-import styles from "./Main.module.scss";
-import SearchProvider from "../../context/SearchContext";
+import { Search } from "../../features/search/Search/Search";
+import { Results } from "../../features/results/Results/Results";
+import styles from "./MainLayout.module.scss";
+import SearchProvider from "../../../context/SearchContext";
 
-export function Main() {
+export function MainLayout() {
   return (
     <SearchProvider>
       <div className={styles.wrapper}>
diff --git a/src/components/Main/Main.module.scss b/src/components/layouts/MainLayout/MainLayout.module.scss
similarity index 100%
rename from src/components/Main/Main.module.scss
rename to src/components/layouts/MainLayout/MainLayout.module.scss