diff --git a/src/components/AskPage.svelte b/src/components/AskPage/AskPage.svelte
similarity index 61%
rename from src/components/AskPage.svelte
rename to src/components/AskPage/AskPage.svelte
index b4c8e455..36ad2ced 100644
--- a/src/components/AskPage.svelte
+++ b/src/components/AskPage/AskPage.svelte
@@ -1,46 +1,52 @@
 <script context="module">
   import ChevronDown24 from "carbon-icons-svelte/lib/ChevronDown24";
-	import TextEditor from "./TextEditor.svelte";
+  import TextEditor from "../TextEditor/index.svelte";
 
-  let questionTitle = '';
+  let questionTitle = "";
   let questionTags = [];
-  let questionDescription = '';
+  let questionDescription = "";
   let facultyFilterOpened = true;
 
   const faculties = [
-    'ИЭКСУ', 'ИМБТ', 'ИМИ', 'ИПТДМ', 'ИИИР', 'ГФ', 'ХТФ', 'ИДЗО', 'УИИ', 'УНИ'
+    "ИЭКСУ",
+    "ИМБТ",
+    "ИМИ",
+    "ИПТДМ",
+    "ИИИР",
+    "ГФ",
+    "ХТФ",
+    "ИДЗО",
+    "УИИ",
+    "УНИ",
   ];
 
   function handleFacultyFilters() {
-    console.log('clicking')
+    console.log("clicking");
     facultyFilterOpened = facultyFilterOpened ? false : true;
   }
   let things = [
-		{ id: 1, color: 'darkblue' },
-		{ id: 2, color: 'indigo' },
-		{ id: 3, color: 'deeppink' },
-		{ id: 4, color: 'salmon' },
-		{ id: 5, color: 'gold' }
-	];
+    { id: 1, color: "darkblue" },
+    { id: 2, color: "indigo" },
+    { id: 3, color: "deeppink" },
+    { id: 4, color: "salmon" },
+    { id: 5, color: "gold" },
+  ];
 
-	function handleClick() {
+  function handleClick() {
     things = things.slice(1);
-    console.log('things', things)
-	}
+    console.log("things", things);
+  }
 </script>
 
 <svelte:head>
-	<title>Спросить собшество вопрос</title>
+  <title>Спросить собшество вопрос</title>
 </svelte:head>
 
-
 <div class="lg:w-3/5 mx-auto md:mx-10 lg:mb-20">
   <h2 class="pb-2">Спросить собшество вопрос</h2>
   <div class="my-1 px-1">
     <div class="mb-5">
-      <button on:click={handleClick}>
-        Remove first thing
-      </button>
+      <button on:click={handleClick}> Remove first thing </button>
       {#each things as thing}
         <p style="color: {thing.color}">{thing.id}</p>
       {/each}
@@ -48,14 +54,18 @@
         class="flex border rounded-lg border-grey py-1 px-3 focus:outline-none focus:border-gray-400 focus:bg-gray-200"
         on:click={handleFacultyFilters}
       >
-        <span>Факултеты</span> <ChevronDown24 class="ml-2" />
+        <span>Факултеты</span>
+        <ChevronDown24 class="ml-2" />
       </button>
 
       {#if facultyFilterOpened}
         <div class="w-48 bg-white border border-grey rounded-lg mt-2 py-2">
           {#each faculties as faculty}
             <div class="block px-4 py-2 border-b">
-              <input type="checkbox" class="border border-gray checked:bg-blue-600 checked:border-transparent mr-1 cursor-pointer">
+              <input
+                type="checkbox"
+                class="border border-gray checked:bg-blue-600 checked:border-transparent mr-1 cursor-pointer"
+              />
               <span>{faculty}</span>
             </div>
           {/each}
@@ -72,12 +82,12 @@
       type="text"
       name="discussion[title]"
       id="discussion_title"
-      value="{questionTitle}"
-    >
+      value={questionTitle}
+    />
   </div>
 
   <TextEditor
-    value="{questionDescription}"
+    value={questionDescription}
     placeholder="Задайте вопрос или начните разговор"
   />
-</div>
\ No newline at end of file
+</div>
diff --git a/src/components/Chip.svelte b/src/components/Chip/index.svelte
similarity index 92%
rename from src/components/Chip.svelte
rename to src/components/Chip/index.svelte
index 2ef206ad..b19943b2 100644
--- a/src/components/Chip.svelte
+++ b/src/components/Chip/index.svelte
@@ -1,5 +1,5 @@
 <script>
-	export let value;
+  export let value;
 </script>
 
 <p>{value}</p>
@@ -19,4 +19,4 @@
     border-radius: 2em;
     margin: 6px 0 0;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/Footer.svelte b/src/components/Footer/index.svelte
similarity index 100%
rename from src/components/Footer.svelte
rename to src/components/Footer/index.svelte
diff --git a/src/components/HashTags.svelte b/src/components/HashTags/index.svelte
similarity index 100%
rename from src/components/HashTags.svelte
rename to src/components/HashTags/index.svelte
diff --git a/src/components/Hoverable.svelte b/src/components/Hoverable/index.svelte
similarity index 100%
rename from src/components/Hoverable.svelte
rename to src/components/Hoverable/index.svelte
diff --git a/src/components/LeftNav.svelte b/src/components/LeftNav/index.svelte
similarity index 98%
rename from src/components/LeftNav.svelte
rename to src/components/LeftNav/index.svelte
index fce97e20..3065b37b 100644
--- a/src/components/LeftNav.svelte
+++ b/src/components/LeftNav/index.svelte
@@ -1,5 +1,5 @@
 <script>
-  import NewQuestion from "./NewQuestion.svelte";
+  import NewQuestion from "../NewQuestion/index.svelte";
   import Home32 from "carbon-icons-svelte/lib/Home32";
   import SendAlt32 from "carbon-icons-svelte/lib/SendAlt32";
   import UserAvatar32 from "carbon-icons-svelte/lib/UserAvatar32";
diff --git a/src/components/Nav.svelte b/src/components/Nav.svelte
deleted file mode 100644
index d85554e7..00000000
--- a/src/components/Nav.svelte
+++ /dev/null
@@ -1,96 +0,0 @@
-<script>
-	import Space from "./Space.svelte";
-	import NewQuestion from "./NewQuestion.svelte";
-	export let segment;
-</script>
-
-<style>
-	nav {
-		border-bottom: 1px solid rgba(255, 62, 0, 0.1);
-		font-weight: 300;
-		padding: 0 1em;
-		display: flex;
-		position: sticky;
-		top: 0px;
-		background-color: #fff;
-		z-index: 1;
-	}
-
-	ul {
-		margin: 0;
-		padding: 0;
-	}
-
-	/* clearfix */
-	ul::after {
-		content: "";
-		display: block;
-		clear: both;
-	}
-
-	li {
-		display: block;
-		float: left;
-	}
-
-	[aria-current] {
-		position: relative;
-		display: inline-block;
-	}
-
-	[aria-current]::after {
-		position: absolute;
-		content: "";
-		width: calc(100% - 1em);
-		height: 2px;
-		background-color: #3182ce;
-		display: block;
-		bottom: -1px;
-	}
-
-	a {
-		text-decoration: none;
-		padding: 1em 0.5em;
-	}
-</style>
-
-<nav>
-	<ul>
-		<li>
-			<a
-				class="block"
-				aria-current={segment === undefined || segment === 'discussion' ? 'page' : undefined}
-				href=".">UniDiscuss</a>
-		</li>
-	</ul>
-	<Space />
-	<ul class="flex items-center">
-		<li>
-			<NewQuestion />
-		</li>
-		<li>
-			<a
-				class="flex items-center"
-				href="https://t.me/unidiscuss"
-				target="_blank">
-				<img
-					alt="File:Telegram logo.svg"
-					class="mr-1"
-					src="https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Telegram_alternative_logo.svg/50px-Telegram_alternative_logo.svg.png"
-					decoding="async"
-					width="25"
-					height="25"
-					srcset="https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Telegram_alternative_logo.svg/50px-Telegram_alternative_logo.svg.png 1.5x, https://upload.wikimedia.org/wikipedia/commons/thumb/8/82/Telegram_logo.svg/1024px-Telegram_logo.svg.png 2x"
-					data-file-width="25"
-					data-file-height="25" />
-				<span>Канал</span>
-			</a>
-		</li>
-		<li>
-			<a
-				class="block"
-				aria-current={segment === 'profile' ? 'page' : undefined}
-				href="profile">Войти</a>
-		</li>
-	</ul>
-</nav>
diff --git a/src/components/Nav/index.svelte b/src/components/Nav/index.svelte
new file mode 100644
index 00000000..d39895ee
--- /dev/null
+++ b/src/components/Nav/index.svelte
@@ -0,0 +1,102 @@
+<script>
+  import Space from "../Space/index.svelte";
+  import NewQuestion from "../NewQuestion/index.svelte";
+  export let segment;
+</script>
+
+<nav>
+  <ul>
+    <li>
+      <a
+        class="block"
+        aria-current={segment === undefined || segment === "discussion"
+          ? "page"
+          : undefined}
+        href=".">UniDiscuss</a
+      >
+    </li>
+  </ul>
+  <Space />
+  <ul class="flex items-center">
+    <li>
+      <NewQuestion />
+    </li>
+    <li>
+      <a
+        class="flex items-center"
+        href="https://t.me/unidiscuss"
+        target="_blank"
+      >
+        <img
+          alt="File:Telegram logo.svg"
+          class="mr-1"
+          src="https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Telegram_alternative_logo.svg/50px-Telegram_alternative_logo.svg.png"
+          decoding="async"
+          width="25"
+          height="25"
+          srcset="https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Telegram_alternative_logo.svg/50px-Telegram_alternative_logo.svg.png 1.5x, https://upload.wikimedia.org/wikipedia/commons/thumb/8/82/Telegram_logo.svg/1024px-Telegram_logo.svg.png 2x"
+          data-file-width="25"
+          data-file-height="25"
+        />
+        <span>Канал</span>
+      </a>
+    </li>
+    <li>
+      <a
+        class="block"
+        aria-current={segment === "profile" ? "page" : undefined}
+        href="profile">Войти</a
+      >
+    </li>
+  </ul>
+</nav>
+
+<style>
+  nav {
+    border-bottom: 1px solid rgba(255, 62, 0, 0.1);
+    font-weight: 300;
+    padding: 0 1em;
+    display: flex;
+    position: sticky;
+    top: 0px;
+    background-color: #fff;
+    z-index: 1;
+  }
+
+  ul {
+    margin: 0;
+    padding: 0;
+  }
+
+  /* clearfix */
+  ul::after {
+    content: "";
+    display: block;
+    clear: both;
+  }
+
+  li {
+    display: block;
+    float: left;
+  }
+
+  [aria-current] {
+    position: relative;
+    display: inline-block;
+  }
+
+  [aria-current]::after {
+    position: absolute;
+    content: "";
+    width: calc(100% - 1em);
+    height: 2px;
+    background-color: #3182ce;
+    display: block;
+    bottom: -1px;
+  }
+
+  a {
+    text-decoration: none;
+    padding: 1em 0.5em;
+  }
+</style>
diff --git a/src/components/NewQuestion.svelte b/src/components/NewQuestion/index.svelte
similarity index 100%
rename from src/components/NewQuestion.svelte
rename to src/components/NewQuestion/index.svelte
diff --git a/src/components/SideBar.svelte b/src/components/SideBar/index.svelte
similarity index 100%
rename from src/components/SideBar.svelte
rename to src/components/SideBar/index.svelte
diff --git a/src/components/Space.svelte b/src/components/Space/index.svelte
similarity index 100%
rename from src/components/Space.svelte
rename to src/components/Space/index.svelte
diff --git a/src/components/TextEditor.svelte b/src/components/TextEditor/index.svelte
similarity index 100%
rename from src/components/TextEditor.svelte
rename to src/components/TextEditor/index.svelte
diff --git a/src/components/Vote.svelte b/src/components/Vote.svelte
deleted file mode 100644
index a24df5ef..00000000
--- a/src/components/Vote.svelte
+++ /dev/null
@@ -1,31 +0,0 @@
-<script>
-	import ArrowUp16 from "carbon-icons-svelte/lib/ArrowUp16";
-	import Chip from "./Chip.svelte";
-
-	export let value = 0;
-
-	function upVote() {
-		value = value + 1;
-	}
-</script>
-
-
-<div
-	class="vote border-none cursor-pointer"
-	on:click={upVote}
->
-  <ArrowUp16 />
-  <Chip value="{value}" />
-</div>
-
-<style>
-	.vote {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		min-width: 25px;
-		width: 25px;
-		justify-content: center;
-		margin-right: 10px;
-	}
-</style>
diff --git a/src/components/Vote/index.svelte b/src/components/Vote/index.svelte
new file mode 100644
index 00000000..710e74fb
--- /dev/null
+++ b/src/components/Vote/index.svelte
@@ -0,0 +1,27 @@
+<script>
+  import ArrowUp16 from "carbon-icons-svelte/lib/ArrowUp16";
+  import Chip from "../Chip/index.svelte";
+
+  export let value = 0;
+
+  function upVote() {
+    value = value + 1;
+  }
+</script>
+
+<div class="vote border-none cursor-pointer" on:click={upVote}>
+  <ArrowUp16 />
+  <Chip {value} />
+</div>
+
+<style>
+  .vote {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    min-width: 25px;
+    width: 25px;
+    justify-content: center;
+    margin-right: 10px;
+  }
+</style>
diff --git a/src/routes/_layout.svelte b/src/routes/_layout.svelte
index 150df213..b4cf34f6 100644
--- a/src/routes/_layout.svelte
+++ b/src/routes/_layout.svelte
@@ -1,9 +1,9 @@
 <script>
   import Tailwindcss from "../components/Tailwindcss.svelte";
   // import Nav from "../components/Nav.svelte";
-  import LeftNav from "../components/LeftNav.svelte";
-  import SideBar from "../components/SideBar.svelte";
-  import Footer from "../components/Footer.svelte";
+  import LeftNav from "../components/LeftNav/index.svelte";
+  import SideBar from "../components/SideBar/index.svelte";
+  import Footer from "../components/Footer/index.svelte";
 
   export let segment;
 </script>
diff --git a/src/routes/ask.svelte b/src/routes/ask.svelte
index 0923b1b3..b38fcfb1 100644
--- a/src/routes/ask.svelte
+++ b/src/routes/ask.svelte
@@ -1,6 +1,6 @@
 <script>
   import ChevronDown24 from "carbon-icons-svelte/lib/ChevronDown24";
-  import TextEditor from "../components/TextEditor.svelte";
+  import TextEditor from "../components/TextEditor/index.svelte";
 
   let questionTitle = "";
   let questionDescription = "";
diff --git a/src/routes/index.svelte b/src/routes/index.svelte
index 4b61e374..99d52f0b 100644
--- a/src/routes/index.svelte
+++ b/src/routes/index.svelte
@@ -1,9 +1,9 @@
 <script>
   import { stores } from "@sapper/app";
   import AddComment20 from "carbon-icons-svelte/lib/AddComment20";
-  import Vote from "../components/Vote.svelte";
-  import Space from "../components/Space.svelte";
-  import HashTags from "../components/HashTags.svelte";
+  import Vote from "../components/Vote/index.svelte";
+  import Space from "../components/Space/index.svelte";
+  import HashTags from "../components/HashTags/index.svelte";
 
   function getDiscussion(filterBy, allDiscussions) {
     switch (filterBy) {