diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 40e365d35..1a3fdca1b 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -27,7 +27,7 @@
         <v-icon>mdi-magnify</v-icon>
       </v-btn>
 
-      <Menu />
+      <SiteMenu />
     </v-app-bar>
     <v-main>
       <v-container>
@@ -40,15 +40,15 @@
 </template>
 
 <script>
-import Menu from "./components/UI/Menu";
-import SearchBar from "./components/UI/SearchBar";
+import SiteMenu from "./components/UI/SiteMenu";
+import SearchBar from "./components/UI/Search/SearchBar";
 import AddRecipeFab from "./components/UI/AddRecipeFab";
 import Vuetify from "./plugins/vuetify";
 export default {
   name: "App",
 
   components: {
-    Menu,
+    SiteMenu,
     AddRecipeFab,
     SearchBar,
   },
diff --git a/frontend/src/components/MealPlan/MealPlanCard.vue b/frontend/src/components/MealPlan/MealPlanCard.vue
index b5c176638..100aceced 100644
--- a/frontend/src/components/MealPlan/MealPlanCard.vue
+++ b/frontend/src/components/MealPlan/MealPlanCard.vue
@@ -27,7 +27,7 @@
 
 <script>
 import utils from "@/utils";
-import SearchDialog from "../UI/SearchDialog";
+import SearchDialog from "../UI/Search/SearchDialog";
 export default {
   components: {
     SearchDialog,
diff --git a/frontend/src/components/UI/ButtonRow.vue b/frontend/src/components/Recipe/EditorButtonRow.vue
similarity index 96%
rename from frontend/src/components/UI/ButtonRow.vue
rename to frontend/src/components/Recipe/EditorButtonRow.vue
index e48f510f7..7f350c4c1 100644
--- a/frontend/src/components/UI/ButtonRow.vue
+++ b/frontend/src/components/Recipe/EditorButtonRow.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script>
-import Confirmation from "./Confirmation";
+import Confirmation from "../../components/UI/Confirmation";
 
 export default {
   props: {
diff --git a/frontend/src/components/UI/RecipeCard.vue b/frontend/src/components/Recipe/RecipeCard.vue
similarity index 100%
rename from frontend/src/components/UI/RecipeCard.vue
rename to frontend/src/components/Recipe/RecipeCard.vue
diff --git a/frontend/src/components/UI/CardSection.vue b/frontend/src/components/UI/CardSection.vue
index 5a4f92c43..21d749660 100644
--- a/frontend/src/components/UI/CardSection.vue
+++ b/frontend/src/components/UI/CardSection.vue
@@ -53,7 +53,7 @@
 </template>
 
 <script>
-import RecipeCard from "./RecipeCard";
+import RecipeCard from "../Recipe/RecipeCard";
 export default {
   components: {
     RecipeCard,
diff --git a/frontend/src/components/UI/SearchBar.vue b/frontend/src/components/UI/Search/SearchBar.vue
similarity index 100%
rename from frontend/src/components/UI/SearchBar.vue
rename to frontend/src/components/UI/Search/SearchBar.vue
diff --git a/frontend/src/components/UI/SearchDialog.vue b/frontend/src/components/UI/Search/SearchDialog.vue
similarity index 95%
rename from frontend/src/components/UI/SearchDialog.vue
rename to frontend/src/components/UI/Search/SearchDialog.vue
index cd245d69e..17b19c8a5 100644
--- a/frontend/src/components/UI/SearchDialog.vue
+++ b/frontend/src/components/UI/Search/SearchDialog.vue
@@ -43,8 +43,8 @@
 </template>
 
 <script>
-import SearchBar from "../UI/SearchBar";
-import RecipeCard from "../UI/RecipeCard";
+import SearchBar from "./SearchBar";
+import RecipeCard from "../../Recipe/RecipeCard";
 export default {
   components: {
     SearchBar,
diff --git a/frontend/src/components/UI/SearchHeader.vue b/frontend/src/components/UI/Search/SearchHeader.vue
similarity index 100%
rename from frontend/src/components/UI/SearchHeader.vue
rename to frontend/src/components/UI/Search/SearchHeader.vue
diff --git a/frontend/src/components/UI/Menu.vue b/frontend/src/components/UI/SiteMenu.vue
similarity index 100%
rename from frontend/src/components/UI/Menu.vue
rename to frontend/src/components/UI/SiteMenu.vue
diff --git a/frontend/src/pages/RecipeNewPage.vue b/frontend/src/pages/RecipeNewPage.vue
index d841fe77b..a6d4b93eb 100644
--- a/frontend/src/pages/RecipeNewPage.vue
+++ b/frontend/src/pages/RecipeNewPage.vue
@@ -12,7 +12,7 @@
     </v-img>
     <br v-else />
 
-    <ButtonRow
+    <EditorButtonRow
       @json="jsonEditor = true"
       @editor="jsonEditor = false"
       @save="createRecipe"
@@ -43,12 +43,12 @@ import api from "@/api";
 
 import RecipeEditor from "../components/Recipe/RecipeEditor";
 import VJsoneditor from "v-jsoneditor";
-import ButtonRow from "../components/UI/ButtonRow";
+import EditorButtonRow from "../components/Recipe/EditorButtonRow";
 export default {
   components: {
     VJsoneditor,
     RecipeEditor,
-    ButtonRow,
+    EditorButtonRow,
   },
   data() {
     return {
diff --git a/frontend/src/pages/RecipePage.vue b/frontend/src/pages/RecipePage.vue
index 997af81a8..90bc18fd7 100644
--- a/frontend/src/pages/RecipePage.vue
+++ b/frontend/src/pages/RecipePage.vue
@@ -13,7 +13,7 @@
         :performTime="recipeDetails.performTime"
       />
     </v-img>
-    <ButtonRow
+    <EditorButtonRow
       :open="showIcons"
       @json="jsonEditor = true"
       @editor="
@@ -62,14 +62,14 @@ import VJsoneditor from "v-jsoneditor";
 import RecipeViewer from "../components/Recipe/RecipeViewer";
 import RecipeEditor from "../components/Recipe/RecipeEditor";
 import RecipeTimeCard from "../components/Recipe/RecipeTimeCard.vue";
-import ButtonRow from "../components/UI/ButtonRow";
+import EditorButtonRow from "../components/Recipe/EditorButtonRow";
 
 export default {
   components: {
     VJsoneditor,
     RecipeViewer,
     RecipeEditor,
-    ButtonRow,
+    EditorButtonRow,
     RecipeTimeCard,
   },
   data() {
diff --git a/frontend/src/pages/SearchPage.vue b/frontend/src/pages/SearchPage.vue
index 7c3b3d7ff..faeb813b5 100644
--- a/frontend/src/pages/SearchPage.vue
+++ b/frontend/src/pages/SearchPage.vue
@@ -34,8 +34,8 @@
 </template>
 
 <script>
-import SearchBar from "../components/UI/SearchBar";
-import RecipeCard from "../components/UI/RecipeCard";
+import SearchBar from "../components/UI/Search/SearchBar";
+import RecipeCard from "../components/Recipe/RecipeCard";
 export default {
   components: {
     SearchBar,