diff --git a/.github/workflows/partial-frontend.yml b/.github/workflows/partial-frontend.yml
index bdb8999a..ec16a53c 100644
--- a/.github/workflows/partial-frontend.yml
+++ b/.github/workflows/partial-frontend.yml
@@ -38,6 +38,10 @@ jobs:
         run: yarn lint
         working-directory: "frontend"
 
+      - name: Run tests 🧪
+        run: yarn test:ci
+        working-directory: "frontend"
+
   build:
     runs-on: ubuntu-latest
 
diff --git a/.gitignore b/.gitignore
index 231db452..164c8186 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,7 +55,6 @@ develop-eggs/
 downloads/
 eggs/
 .eggs/
-lib/
 lib64/
 parts/
 !frontend/src/components/Recipe/Parts/
diff --git a/dev/code-generation/gen_ts_types.py b/dev/code-generation/gen_ts_types.py
index d1c319e8..96391dce 100644
--- a/dev/code-generation/gen_ts_types.py
+++ b/dev/code-generation/gen_ts_types.py
@@ -75,7 +75,7 @@ def generate_typescript_types() -> None:
         return str_path
 
     schema_path = PROJECT_DIR / "mealie" / "schema"
-    types_dir = PROJECT_DIR / "frontend" / "types" / "api-types"
+    types_dir = PROJECT_DIR / "frontend" / "lib" / "api" / "types"
 
     ignore_dirs = ["__pycache__", "static", "_mealie"]
 
diff --git a/frontend/.husky/.gitignore b/frontend/.husky/.gitignore
deleted file mode 100644
index 31354ec1..00000000
--- a/frontend/.husky/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-_
diff --git a/frontend/components/Domain/Group/GroupExportData.vue b/frontend/components/Domain/Group/GroupExportData.vue
index b47d5935..64cf4efe 100644
--- a/frontend/components/Domain/Group/GroupExportData.vue
+++ b/frontend/components/Domain/Group/GroupExportData.vue
@@ -20,7 +20,7 @@
 <script lang="ts">
 import { defineComponent, useContext } from "@nuxtjs/composition-api";
 import { parseISO, formatDistanceToNow } from "date-fns";
-import { GroupDataExport } from "~/types/api-types/group";
+import { GroupDataExport } from "~/lib/api/types/group";
 export default defineComponent({
   props: {
     exports: {
diff --git a/frontend/components/Domain/Group/GroupMealPlanRuleForm.vue b/frontend/components/Domain/Group/GroupMealPlanRuleForm.vue
index dfa9f985..1a271869 100644
--- a/frontend/components/Domain/Group/GroupMealPlanRuleForm.vue
+++ b/frontend/components/Domain/Group/GroupMealPlanRuleForm.vue
@@ -17,7 +17,7 @@
 <script lang="ts">
 import { defineComponent, computed, useContext } from "@nuxtjs/composition-api";
 import RecipeOrganizerSelector from "~/components/Domain/Recipe/RecipeOrganizerSelector.vue";
-import { RecipeTag, RecipeCategory } from "~/types/api-types/group";
+import { RecipeTag, RecipeCategory } from "~/lib/api/types/group";
 
 export default defineComponent({
   components: {
diff --git a/frontend/components/Domain/Group/GroupWebhookEditor.vue b/frontend/components/Domain/Group/GroupWebhookEditor.vue
index 0e4637e4..b29b70cf 100644
--- a/frontend/components/Domain/Group/GroupWebhookEditor.vue
+++ b/frontend/components/Domain/Group/GroupWebhookEditor.vue
@@ -35,7 +35,7 @@
 
 <script lang="ts">
 import { defineComponent, computed, ref } from "@nuxtjs/composition-api";
-import { ReadWebhook } from "~/types/api-types/group";
+import { ReadWebhook } from "~/lib/api/types/group";
 import { timeLocalToUTC, timeUTCToLocal } from "~/composables/use-group-webhooks";
 
 export default defineComponent({
diff --git a/frontend/components/Domain/Recipe/RecipeActionMenu.vue b/frontend/components/Domain/Recipe/RecipeActionMenu.vue
index 9e275f13..9b5edd5d 100644
--- a/frontend/components/Domain/Recipe/RecipeActionMenu.vue
+++ b/frontend/components/Domain/Recipe/RecipeActionMenu.vue
@@ -84,7 +84,7 @@
 import { defineComponent, ref, useContext } from "@nuxtjs/composition-api";
 import RecipeContextMenu from "./RecipeContextMenu.vue";
 import RecipeFavoriteBadge from "./RecipeFavoriteBadge.vue";
-import { Recipe } from "~/types/api-types/recipe";
+import { Recipe } from "~/lib/api/types/recipe";
 
 const SAVE_EVENT = "save";
 const DELETE_EVENT = "delete";
diff --git a/frontend/components/Domain/Recipe/RecipeAssets.vue b/frontend/components/Domain/Recipe/RecipeAssets.vue
index 9517942f..b439f1a2 100644
--- a/frontend/components/Domain/Recipe/RecipeAssets.vue
+++ b/frontend/components/Domain/Recipe/RecipeAssets.vue
@@ -82,7 +82,7 @@ import { defineComponent, reactive, useContext } from "@nuxtjs/composition-api";
 import { useStaticRoutes, useUserApi } from "~/composables/api";
 import { alert } from "~/composables/use-toast";
 import { detectServerBaseUrl } from "~/composables/use-utils";
-import { RecipeAsset } from "~/types/api-types/recipe";
+import { RecipeAsset } from "~/lib/api/types/recipe";
 
 export default defineComponent({
   props: {
diff --git a/frontend/components/Domain/Recipe/RecipeCardSection.vue b/frontend/components/Domain/Recipe/RecipeCardSection.vue
index 80ce0a8b..64a998da 100644
--- a/frontend/components/Domain/Recipe/RecipeCardSection.vue
+++ b/frontend/components/Domain/Recipe/RecipeCardSection.vue
@@ -129,7 +129,7 @@ import RecipeCard from "./RecipeCard.vue";
 import RecipeCardMobile from "./RecipeCardMobile.vue";
 import { useAsyncKey } from "~/composables/use-utils";
 import { useLazyRecipes } from "~/composables/recipes";
-import { Recipe } from "~/types/api-types/recipe";
+import { Recipe } from "~/lib/api/types/recipe";
 import { useUserSortPreferences } from "~/composables/use-users/preferences";
 
 const REPLACE_RECIPES_EVENT = "replaceRecipes";
@@ -230,13 +230,13 @@ export default defineComponent({
         page.value,
 
         // we double-up the first call to avoid a bug with large screens that render the entire first page without scrolling, preventing additional loading
-        perPage.value*2,
+        perPage.value * 2,
         preferences.value.orderBy,
         preferences.value.orderDirection,
         cookbook.value,
         category.value,
         tag.value,
-        tool.value,
+        tool.value
       );
 
       // since we doubled the first call, we also need to advance the page
@@ -263,7 +263,7 @@ export default defineComponent({
           cookbook.value,
           category.value,
           tag.value,
-          tool.value,
+          tool.value
         );
         if (!newRecipes.length) {
           hasMore.value = false;
@@ -325,7 +325,7 @@ export default defineComponent({
           cookbook.value,
           category.value,
           tag.value,
-          tool.value,
+          tool.value
         );
         context.emit(REPLACE_RECIPES_EVENT, newRecipes);
 
diff --git a/frontend/components/Domain/Recipe/RecipeChips.vue b/frontend/components/Domain/Recipe/RecipeChips.vue
index c1a843eb..7869e29f 100644
--- a/frontend/components/Domain/Recipe/RecipeChips.vue
+++ b/frontend/components/Domain/Recipe/RecipeChips.vue
@@ -18,7 +18,7 @@
 
 <script lang="ts">
 import { defineComponent } from "@nuxtjs/composition-api";
-import { RecipeCategory, RecipeTag, RecipeTool } from "~/types/api-types/user";
+import { RecipeCategory, RecipeTag, RecipeTool } from "~/lib/api/types/user";
 
 export type UrlPrefixParam = "tags" | "categories" | "tools";
 
diff --git a/frontend/components/Domain/Recipe/RecipeComments.vue b/frontend/components/Domain/Recipe/RecipeComments.vue
index 5627e524..9c8977e1 100644
--- a/frontend/components/Domain/Recipe/RecipeComments.vue
+++ b/frontend/components/Domain/Recipe/RecipeComments.vue
@@ -56,7 +56,7 @@
 <script lang="ts">
 import { defineComponent, ref, toRefs, onMounted, reactive } from "@nuxtjs/composition-api";
 import { useUserApi } from "~/composables/api";
-import { RecipeCommentOut } from "~/types/api-types/recipe";
+import { RecipeCommentOut } from "~/lib/api/types/recipe";
 import UserAvatar from "~/components/Domain/User/UserAvatar.vue";
 
 export default defineComponent({
diff --git a/frontend/components/Domain/Recipe/RecipeContextMenu.vue b/frontend/components/Domain/Recipe/RecipeContextMenu.vue
index a8d2bdc7..3af6f42e 100644
--- a/frontend/components/Domain/Recipe/RecipeContextMenu.vue
+++ b/frontend/components/Domain/Recipe/RecipeContextMenu.vue
@@ -101,8 +101,8 @@ import RecipeDialogShare from "./RecipeDialogShare.vue";
 import { useUserApi } from "~/composables/api";
 import { alert } from "~/composables/use-toast";
 import { planTypeOptions } from "~/composables/use-group-mealplan";
-import { ShoppingListSummary } from "~/types/api-types/group";
-import { PlanEntryType } from "~/types/api-types/meal-plan";
+import { ShoppingListSummary } from "~/lib/api/types/group";
+import { PlanEntryType } from "~/lib/api/types/meal-plan";
 import { useAxiosDownloader } from "~/composables/api/use-axios-download";
 import { useCopy } from "~/composables/use-copy";
 
diff --git a/frontend/components/Domain/Recipe/RecipeDataTable.vue b/frontend/components/Domain/Recipe/RecipeDataTable.vue
index 36839695..6f96276f 100644
--- a/frontend/components/Domain/Recipe/RecipeDataTable.vue
+++ b/frontend/components/Domain/Recipe/RecipeDataTable.vue
@@ -44,9 +44,9 @@
 <script lang="ts">
 import { computed, defineComponent, onMounted, ref, useContext } from "@nuxtjs/composition-api";
 import RecipeChip from "./RecipeChips.vue";
-import { Recipe } from "~/types/api-types/recipe";
+import { Recipe } from "~/lib/api/types/recipe";
 import { useUserApi } from "~/composables/api";
-import { UserOut } from "~/types/api-types/user";
+import { UserOut } from "~/lib/api/types/user";
 
 const INPUT_EVENT = "input";
 
diff --git a/frontend/components/Domain/Recipe/RecipeDialogSearch.vue b/frontend/components/Domain/Recipe/RecipeDialogSearch.vue
index 283ea141..9f4256e8 100644
--- a/frontend/components/Domain/Recipe/RecipeDialogSearch.vue
+++ b/frontend/components/Domain/Recipe/RecipeDialogSearch.vue
@@ -57,7 +57,7 @@
 import { defineComponent, toRefs, reactive, ref, watch, useRoute } from "@nuxtjs/composition-api";
 import RecipeCardMobile from "./RecipeCardMobile.vue";
 import { useRecipes, allRecipes, useRecipeSearch } from "~/composables/recipes";
-import { RecipeSummary } from "~/types/api-types/recipe";
+import { RecipeSummary } from "~/lib/api/types/recipe";
 const SELECTED_EVENT = "selected";
 export default defineComponent({
   components: {
diff --git a/frontend/components/Domain/Recipe/RecipeDialogShare.vue b/frontend/components/Domain/Recipe/RecipeDialogShare.vue
index a85d0ed9..edc40377 100644
--- a/frontend/components/Domain/Recipe/RecipeDialogShare.vue
+++ b/frontend/components/Domain/Recipe/RecipeDialogShare.vue
@@ -58,7 +58,7 @@
 <script lang="ts">
 import { defineComponent, computed, toRefs, reactive, useContext } from "@nuxtjs/composition-api";
 import { useClipboard, useShare, whenever } from "@vueuse/core";
-import { RecipeShareToken } from "~/types/api-types/recipe";
+import { RecipeShareToken } from "~/lib/api/types/recipe";
 import { useUserApi } from "~/composables/api";
 import { alert } from "~/composables/use-toast";
 
diff --git a/frontend/components/Domain/Recipe/RecipeFavoriteBadge.vue b/frontend/components/Domain/Recipe/RecipeFavoriteBadge.vue
index 7e02f08a..6b62d939 100644
--- a/frontend/components/Domain/Recipe/RecipeFavoriteBadge.vue
+++ b/frontend/components/Domain/Recipe/RecipeFavoriteBadge.vue
@@ -23,7 +23,7 @@
 <script lang="ts">
 import { computed, defineComponent, useContext } from "@nuxtjs/composition-api";
 import { useUserApi } from "~/composables/api";
-import { UserOut } from "~/types/api-types/user";
+import { UserOut } from "~/lib/api/types/user";
 export default defineComponent({
   props: {
     slug: {
diff --git a/frontend/components/Domain/Recipe/RecipeIngredientEditor.vue b/frontend/components/Domain/Recipe/RecipeIngredientEditor.vue
index f131f55b..f643073e 100644
--- a/frontend/components/Domain/Recipe/RecipeIngredientEditor.vue
+++ b/frontend/components/Domain/Recipe/RecipeIngredientEditor.vue
@@ -131,7 +131,7 @@
 import { computed, defineComponent, reactive, ref, toRefs, useContext } from "@nuxtjs/composition-api";
 import { useFoodStore, useFoodData, useUnitStore, useUnitData } from "~/composables/store";
 import { validators } from "~/composables/use-validators";
-import { RecipeIngredient } from "~/types/api-types/recipe";
+import { RecipeIngredient } from "~/lib/api/types/recipe";
 
 export default defineComponent({
   props: {
diff --git a/frontend/components/Domain/Recipe/RecipeIngredients.vue b/frontend/components/Domain/Recipe/RecipeIngredients.vue
index 510ab9ef..18120934 100644
--- a/frontend/components/Domain/Recipe/RecipeIngredients.vue
+++ b/frontend/components/Domain/Recipe/RecipeIngredients.vue
@@ -23,7 +23,7 @@
 import { computed, defineComponent, reactive, toRefs } from "@nuxtjs/composition-api";
 // @ts-ignore vue-markdown has no types
 import { parseIngredientText } from "~/composables/recipes";
-import { RecipeIngredient } from "~/types/api-types/recipe";
+import { RecipeIngredient } from "~/lib/api/types/recipe";
 
 export default defineComponent({
   components: {},
diff --git a/frontend/components/Domain/Recipe/RecipeInstructions.vue b/frontend/components/Domain/Recipe/RecipeInstructions.vue
index d569bc7a..ae761d65 100644
--- a/frontend/components/Domain/Recipe/RecipeInstructions.vue
+++ b/frontend/components/Domain/Recipe/RecipeInstructions.vue
@@ -230,7 +230,7 @@ import {
   useContext,
   computed,
 } from "@nuxtjs/composition-api";
-import { RecipeStep, IngredientReferences, RecipeIngredient, RecipeAsset } from "~/types/api-types/recipe";
+import { RecipeStep, IngredientReferences, RecipeIngredient, RecipeAsset } from "~/lib/api/types/recipe";
 import { parseIngredientText } from "~/composables/recipes";
 import { uuid4, detectServerBaseUrl } from "~/composables/use-utils";
 import { useUserApi, useStaticRoutes } from "~/composables/api";
diff --git a/frontend/components/Domain/Recipe/RecipeList.vue b/frontend/components/Domain/Recipe/RecipeList.vue
index fce9d60b..1a3ef0c5 100644
--- a/frontend/components/Domain/Recipe/RecipeList.vue
+++ b/frontend/components/Domain/Recipe/RecipeList.vue
@@ -17,7 +17,7 @@
 
 <script lang="ts">
 import { defineComponent } from "@nuxtjs/composition-api";
-import { RecipeSummary } from "~/types/api-types/recipe";
+import { RecipeSummary } from "~/lib/api/types/recipe";
 
 export default defineComponent({
   props: {
@@ -30,4 +30,4 @@ export default defineComponent({
     return {};
   },
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/frontend/components/Domain/Recipe/RecipeNotes.vue b/frontend/components/Domain/Recipe/RecipeNotes.vue
index db29f38d..f5edcaaf 100644
--- a/frontend/components/Domain/Recipe/RecipeNotes.vue
+++ b/frontend/components/Domain/Recipe/RecipeNotes.vue
@@ -31,7 +31,7 @@
 
 <script lang="ts">
 import { defineComponent } from "@nuxtjs/composition-api";
-import { RecipeNote } from "~/types/api-types/recipe";
+import { RecipeNote } from "~/lib/api/types/recipe";
 
 export default defineComponent({
   props: {
diff --git a/frontend/components/Domain/Recipe/RecipeNutrition.vue b/frontend/components/Domain/Recipe/RecipeNutrition.vue
index 7c45f113..9b90fe99 100644
--- a/frontend/components/Domain/Recipe/RecipeNutrition.vue
+++ b/frontend/components/Domain/Recipe/RecipeNutrition.vue
@@ -35,7 +35,7 @@
 
 <script lang="ts">
 import { computed, defineComponent, useContext } from "@nuxtjs/composition-api";
-import { Nutrition } from "~/types/api-types/recipe";
+import { Nutrition } from "~/lib/api/types/recipe";
 
 export default defineComponent({
   props: {
diff --git a/frontend/components/Domain/Recipe/RecipeOcrEditorPage/RecipeOcrEditorPage.vue b/frontend/components/Domain/Recipe/RecipeOcrEditorPage/RecipeOcrEditorPage.vue
index 96aaa964..f980fac9 100644
--- a/frontend/components/Domain/Recipe/RecipeOcrEditorPage/RecipeOcrEditorPage.vue
+++ b/frontend/components/Domain/Recipe/RecipeOcrEditorPage/RecipeOcrEditorPage.vue
@@ -146,9 +146,9 @@ import { until } from "@vueuse/core";
 import { invoke } from "@vueuse/shared";
 import draggable from "vuedraggable";
 import { useUserApi, useStaticRoutes } from "~/composables/api";
-import { OcrTsvResponse as NullableOcrTsvResponse } from "~/types/api-types/ocr";
+import { OcrTsvResponse as NullableOcrTsvResponse } from "~/lib/api/types/ocr";
 import { validators } from "~/composables/use-validators";
-import { Recipe, RecipeIngredient, RecipeStep } from "~/types/api-types/recipe";
+import { Recipe, RecipeIngredient, RecipeStep } from "~/lib/api/types/recipe";
 import { Paths, Leaves, SelectedRecipeLeaves } from "~/types/ocr-types";
 import BannerExperimental from "~/components/global/BannerExperimental.vue";
 import RecipeDialogBulkAdd from "~/components/Domain/Recipe/RecipeDialogBulkAdd.vue";
@@ -157,7 +157,7 @@ import RecipeIngredientEditor from "~/components/Domain/Recipe/RecipeIngredientE
 import RecipeOcrEditorPageCanvas from "~/components/Domain/Recipe/RecipeOcrEditorPage/RecipeOcrEditorPageParts/RecipeOcrEditorPageCanvas.vue";
 import RecipeOcrEditorPageHelp from "~/components/Domain/Recipe/RecipeOcrEditorPage/RecipeOcrEditorPageParts/RecipeOcrEditorPageHelp.vue";
 import { uuid4 } from "~/composables/use-utils";
-import { NoUndefinedField } from "~/types/api";
+import { NoUndefinedField } from "~/lib/api/types/non-generated";
 
 // Temporary Shim until we have a better solution
 // https://github.com/phillipdupuis/pydantic-to-typescript/issues/28
diff --git a/frontend/components/Domain/Recipe/RecipeOcrEditorPage/RecipeOcrEditorPageParts/RecipeOcrEditorPageCanvas.vue b/frontend/components/Domain/Recipe/RecipeOcrEditorPage/RecipeOcrEditorPageParts/RecipeOcrEditorPageCanvas.vue
index 4b80c5aa..afd6c181 100644
--- a/frontend/components/Domain/Recipe/RecipeOcrEditorPage/RecipeOcrEditorPageParts/RecipeOcrEditorPageCanvas.vue
+++ b/frontend/components/Domain/Recipe/RecipeOcrEditorPage/RecipeOcrEditorPageParts/RecipeOcrEditorPageCanvas.vue
@@ -41,8 +41,8 @@
 <script lang="ts">
 import { defineComponent, reactive, useContext, ref, toRefs, watch } from "@nuxtjs/composition-api";
 import { onMounted } from "vue-demi";
-import { NoUndefinedField } from "~/types/api";
-import { OcrTsvResponse as NullableOcrTsvResponse } from "~/types/api-types/ocr";
+import { NoUndefinedField } from "~/lib/api/types/non-generated";
+import { OcrTsvResponse as NullableOcrTsvResponse } from "~/lib/api/types/ocr";
 import { CanvasModes, SelectedTextSplitModes, ImagePosition, Mouse, CanvasRect, ToolbarIcons } from "~/types/ocr-types";
 
 // Temporary Shim until we have a better solution
diff --git a/frontend/components/Domain/Recipe/RecipeOrganizerDialog.vue b/frontend/components/Domain/Recipe/RecipeOrganizerDialog.vue
index 854bb124..e1c8a84a 100644
--- a/frontend/components/Domain/Recipe/RecipeOrganizerDialog.vue
+++ b/frontend/components/Domain/Recipe/RecipeOrganizerDialog.vue
@@ -40,7 +40,7 @@
 import { computed, defineComponent, reactive, toRefs, useContext, watch } from "@nuxtjs/composition-api";
 import { useUserApi } from "~/composables/api";
 import { useCategoryStore, useTagStore, useToolStore } from "~/composables/store";
-import { RecipeOrganizer, Organizer } from "~/types/recipe/organizers";
+import { RecipeOrganizer, Organizer } from "~/lib/api/types/non-generated";
 
 const CREATED_ITEM_EVENT = "created-item";
 
diff --git a/frontend/components/Domain/Recipe/RecipeOrganizerPage.vue b/frontend/components/Domain/Recipe/RecipeOrganizerPage.vue
index ee29e067..9779cacf 100644
--- a/frontend/components/Domain/Recipe/RecipeOrganizerPage.vue
+++ b/frontend/components/Domain/Recipe/RecipeOrganizerPage.vue
@@ -50,7 +50,7 @@
 import { defineComponent, computed, ref } from "@nuxtjs/composition-api";
 import { useContextPresets } from "~/composables/use-context-presents";
 import RecipeOrganizerDialog from "~/components/Domain/Recipe/RecipeOrganizerDialog.vue";
-import { RecipeOrganizer } from "~/types/recipe/organizers";
+import { RecipeOrganizer } from "~/lib/api/types/non-generated";
 
 interface GenericItem {
   id?: string;
diff --git a/frontend/components/Domain/Recipe/RecipeOrganizerSelector.vue b/frontend/components/Domain/Recipe/RecipeOrganizerSelector.vue
index a66602f7..87b8cf9f 100644
--- a/frontend/components/Domain/Recipe/RecipeOrganizerSelector.vue
+++ b/frontend/components/Domain/Recipe/RecipeOrganizerSelector.vue
@@ -42,11 +42,11 @@
 import { defineComponent, ref, useContext } from "@nuxtjs/composition-api";
 import { computed, onMounted } from "vue-demi";
 import RecipeOrganizerDialog from "./RecipeOrganizerDialog.vue";
-import { RecipeCategory, RecipeTag } from "~/types/api-types/user";
-import { RecipeTool } from "~/types/api-types/admin";
+import { RecipeCategory, RecipeTag } from "~/lib/api/types/user";
+import { RecipeTool } from "~/lib/api/types/admin";
 import { useTagStore } from "~/composables/store/use-tag-store";
 import { useCategoryStore, useToolStore } from "~/composables/store";
-import { Organizer, RecipeOrganizer } from "~/types/recipe/organizers";
+import { Organizer, RecipeOrganizer } from "~/lib/api/types/non-generated";
 
 export default defineComponent({
   components: {
diff --git a/frontend/components/Domain/Recipe/RecipePage/RecipePage.vue b/frontend/components/Domain/Recipe/RecipePage/RecipePage.vue
index e245134f..fa076820 100644
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePage.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePage.vue
@@ -90,8 +90,8 @@ import RecipePageTitleContent from "./RecipePageParts/RecipePageTitleContent.vue
 import RecipePageComments from "./RecipePageParts/RecipePageComments.vue";
 import RecipePrintView from "~/components/Domain/Recipe/RecipePrintView.vue";
 import { EditorMode, PageMode, usePageState, usePageUser } from "~/composables/recipe-page/shared-state";
-import { NoUndefinedField } from "~/types/api";
-import { Recipe } from "~/types/api-types/recipe";
+import { NoUndefinedField } from "~/lib/api/types/non-generated";
+import { Recipe } from "~/lib/api/types/recipe";
 import { useRecipeMeta } from "~/composables/recipes";
 import { useRouteQuery } from "~/composables/use-router";
 import { useUserApi } from "~/composables/api";
diff --git a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageComments.vue b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageComments.vue
index 077f2c27..50aef841 100644
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageComments.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageComments.vue
@@ -56,9 +56,9 @@
 <script lang="ts">
 import { defineComponent, ref, toRefs, onMounted, reactive } from "@nuxtjs/composition-api";
 import { useUserApi } from "~/composables/api";
-import { Recipe, RecipeCommentOut } from "~/types/api-types/recipe";
+import { Recipe, RecipeCommentOut } from "~/lib/api/types/recipe";
 import UserAvatar from "~/components/Domain/User/UserAvatar.vue";
-import { NoUndefinedField } from "~/types/api";
+import { NoUndefinedField } from "~/lib/api/types/non-generated";
 import { usePageUser } from "~/composables/recipe-page/shared-state";
 
 export default defineComponent({
diff --git a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageEditorToolbar.vue b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageEditorToolbar.vue
index 23fd471d..2dc6b1e8 100644
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageEditorToolbar.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageEditorToolbar.vue
@@ -13,8 +13,8 @@
 <script lang="ts">
 import { defineComponent, onUnmounted } from "@nuxtjs/composition-api";
 import { clearPageState, usePageState, usePageUser } from "~/composables/recipe-page/shared-state";
-import { NoUndefinedField } from "~/types/api";
-import { Recipe } from "~/types/api-types/recipe";
+import { NoUndefinedField } from "~/lib/api/types/non-generated";
+import { Recipe } from "~/lib/api/types/recipe";
 import { useUserApi } from "~/composables/api";
 import RecipeImageUploadBtn from "~/components/Domain/Recipe/RecipeImageUploadBtn.vue";
 import RecipeSettingsMenu from "~/components/Domain/Recipe/RecipeSettingsMenu.vue";
diff --git a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageFooter.vue b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageFooter.vue
index 8a557dae..4e27394e 100644
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageFooter.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageFooter.vue
@@ -57,8 +57,8 @@
 <script lang="ts">
 import { defineComponent, ref } from "@nuxtjs/composition-api";
 import { usePageState } from "~/composables/recipe-page/shared-state";
-import { NoUndefinedField } from "~/types/api";
-import { Recipe } from "~/types/api-types/recipe";
+import { NoUndefinedField } from "~/lib/api/types/non-generated";
+import { Recipe } from "~/lib/api/types/recipe";
 export default defineComponent({
   props: {
     recipe: {
diff --git a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageHeader.vue b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageHeader.vue
index be489ad1..1cf0a7d6 100644
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageHeader.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageHeader.vue
@@ -61,8 +61,8 @@ import RecipeRating from "~/components/Domain/Recipe/RecipeRating.vue";
 import RecipeActionMenu from "~/components/Domain/Recipe/RecipeActionMenu.vue";
 import RecipeTimeCard from "~/components/Domain/Recipe/RecipeTimeCard.vue";
 import { useStaticRoutes } from "~/composables/api";
-import { Recipe } from "~/types/api-types/recipe";
-import { NoUndefinedField } from "~/types/api";
+import { Recipe } from "~/lib/api/types/recipe";
+import { NoUndefinedField } from "~/lib/api/types/non-generated";
 import { usePageState, usePageUser, PageMode, EditorMode } from "~/composables/recipe-page/shared-state";
 export default defineComponent({
   components: {
diff --git a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageIngredientEditor.vue b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageIngredientEditor.vue
index 176822a7..f27d8955 100644
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageIngredientEditor.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageIngredientEditor.vue
@@ -55,8 +55,8 @@
 import draggable from "vuedraggable";
 import { computed, defineComponent, ref } from "@nuxtjs/composition-api";
 import { usePageState, usePageUser } from "~/composables/recipe-page/shared-state";
-import { NoUndefinedField } from "~/types/api";
-import { Recipe } from "~/types/api-types/recipe";
+import { NoUndefinedField } from "~/lib/api/types/non-generated";
+import { Recipe } from "~/lib/api/types/recipe";
 import RecipeIngredientEditor from "~/components/Domain/Recipe/RecipeIngredientEditor.vue";
 import RecipeDialogBulkAdd from "~/components/Domain/Recipe/RecipeDialogBulkAdd.vue";
 import { uuid4 } from "~/composables/use-utils";
diff --git a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageIngredientToolsView.vue b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageIngredientToolsView.vue
index 5497d20d..51347c0a 100644
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageIngredientToolsView.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageIngredientToolsView.vue
@@ -28,8 +28,8 @@
 import { defineComponent } from "@nuxtjs/composition-api";
 import { usePageState, usePageUser } from "~/composables/recipe-page/shared-state";
 import { useToolStore } from "~/composables/store";
-import { NoUndefinedField } from "~/types/api";
-import { Recipe } from "~/types/api-types/recipe";
+import { NoUndefinedField } from "~/lib/api/types/non-generated";
+import { Recipe } from "~/lib/api/types/recipe";
 import RecipeIngredients from "~/components/Domain/Recipe/RecipeIngredients.vue";
 
 export default defineComponent({
diff --git a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageInstructions.vue b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageInstructions.vue
index 9e2d8021..df640004 100644
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageInstructions.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageInstructions.vue
@@ -225,12 +225,12 @@ import {
   computed,
 } from "@nuxtjs/composition-api";
 import RecipeIngredientHtml from "../../RecipeIngredientHtml.vue";
-import { RecipeStep, IngredientReferences, RecipeIngredient, RecipeAsset, Recipe } from "~/types/api-types/recipe";
+import { RecipeStep, IngredientReferences, RecipeIngredient, RecipeAsset, Recipe } from "~/lib/api/types/recipe";
 import { parseIngredientText } from "~/composables/recipes";
 import { uuid4, detectServerBaseUrl } from "~/composables/use-utils";
 import { useUserApi, useStaticRoutes } from "~/composables/api";
 import { usePageState } from "~/composables/recipe-page/shared-state";
-import { NoUndefinedField } from "~/types/api";
+import { NoUndefinedField } from "~/lib/api/types/non-generated";
 import DropZone from "~/components/global/DropZone.vue";
 
 interface MergerHistory {
diff --git a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageOrganizers.vue b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageOrganizers.vue
index 5c1c45a6..b9a320fb 100644
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageOrganizers.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageOrganizers.vue
@@ -59,8 +59,8 @@
 <script lang="ts">
 import { defineComponent } from "@nuxtjs/composition-api";
 import { usePageState, usePageUser } from "~/composables/recipe-page/shared-state";
-import { NoUndefinedField } from "~/types/api";
-import { Recipe } from "~/types/api-types/recipe";
+import { NoUndefinedField } from "~/lib/api/types/non-generated";
+import { Recipe } from "~/lib/api/types/recipe";
 import RecipeOrganizerSelector from "@/components/Domain/Recipe/RecipeOrganizerSelector.vue";
 import RecipeNutrition from "~/components/Domain/Recipe/RecipeNutrition.vue";
 import RecipeChips from "@/components/Domain/Recipe/RecipeChips.vue";
diff --git a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageScale.vue b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageScale.vue
index 7f6f9c96..5dce2ee2 100644
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageScale.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageScale.vue
@@ -30,8 +30,8 @@
 import { computed, defineComponent } from "@nuxtjs/composition-api";
 import RecipeScaleEditButton from "~/components/Domain/Recipe/RecipeScaleEditButton.vue";
 import RecipeRating from "~/components/Domain/Recipe/RecipeRating.vue";
-import { NoUndefinedField } from "~/types/api";
-import { Recipe } from "~/types/api-types/recipe";
+import { NoUndefinedField } from "~/lib/api/types/non-generated";
+import { Recipe } from "~/lib/api/types/recipe";
 import { usePageState } from "~/composables/recipe-page/shared-state";
 export default defineComponent({
   components: {
diff --git a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageTitleContent.vue b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageTitleContent.vue
index 182d960b..c324e95a 100644
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageTitleContent.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageTitleContent.vue
@@ -44,8 +44,8 @@
 import { defineComponent } from "@nuxtjs/composition-api";
 import { usePageState, usePageUser } from "~/composables/recipe-page/shared-state";
 import { validators } from "~/composables/use-validators";
-import { NoUndefinedField } from "~/types/api";
-import { Recipe } from "~/types/api-types/recipe";
+import { NoUndefinedField } from "~/lib/api/types/non-generated";
+import { Recipe } from "~/lib/api/types/recipe";
 import RecipeRating from "~/components/Domain/Recipe/RecipeRating.vue";
 import RecipeTimeCard from "~/components/Domain/Recipe/RecipeTimeCard.vue";
 
diff --git a/frontend/components/Domain/Recipe/RecipePrintView.vue b/frontend/components/Domain/Recipe/RecipePrintView.vue
index 668dc480..9938a0f8 100644
--- a/frontend/components/Domain/Recipe/RecipePrintView.vue
+++ b/frontend/components/Domain/Recipe/RecipePrintView.vue
@@ -23,9 +23,12 @@
         class="print-section"
       >
         <h4 v-if="ingredientSection.ingredients[0].title" class="ingredient-title mt-2">
-            {{ ingredientSection.ingredients[0].title }}
+          {{ ingredientSection.ingredients[0].title }}
         </h4>
-        <div class="ingredient-grid" :style="{gridTemplateRows:`repeat(${Math.ceil(ingredientSection.ingredients.length / 2)}, min-content)`}">
+        <div
+          class="ingredient-grid"
+          :style="{ gridTemplateRows: `repeat(${Math.ceil(ingredientSection.ingredients.length / 2)}, min-content)` }"
+        >
           <template v-for="(ingredient, ingredientIndex) in ingredientSection.ingredients">
             <p :key="`ingredient-${ingredientIndex}`" class="ingredient-body" v-html="parseText(ingredient)" />
           </template>
@@ -70,7 +73,7 @@
 <script lang="ts">
 import { defineComponent, computed } from "@nuxtjs/composition-api";
 import RecipeTimeCard from "~/components/Domain/Recipe/RecipeTimeCard.vue";
-import { Recipe, RecipeIngredient, RecipeStep } from "~/types/api-types/recipe";
+import { Recipe, RecipeIngredient, RecipeStep } from "~/lib/api/types/recipe";
 import { parseIngredientText } from "~/composables/recipes";
 
 type IngredientSection = {
diff --git a/frontend/components/Domain/Recipe/RecipeSettingsSwitches.vue b/frontend/components/Domain/Recipe/RecipeSettingsSwitches.vue
index 364b78dd..a0e0e8cb 100644
--- a/frontend/components/Domain/Recipe/RecipeSettingsSwitches.vue
+++ b/frontend/components/Domain/Recipe/RecipeSettingsSwitches.vue
@@ -16,7 +16,7 @@
 
 <script lang="ts">
 import { defineComponent, useContext } from "@nuxtjs/composition-api";
-import { RecipeSettings } from "~/types/api-types/recipe";
+import { RecipeSettings } from "~/lib/api/types/recipe";
 
 export default defineComponent({
   props: {
diff --git a/frontend/components/Domain/Recipe/RecipeTools.vue b/frontend/components/Domain/Recipe/RecipeTools.vue
index f6accdc0..7b270e26 100644
--- a/frontend/components/Domain/Recipe/RecipeTools.vue
+++ b/frontend/components/Domain/Recipe/RecipeTools.vue
@@ -47,7 +47,7 @@
 
 <script lang="ts">
 import { defineComponent, ref, computed } from "@nuxtjs/composition-api";
-import { RecipeTool } from "~/types/api-types/recipe";
+import { RecipeTool } from "~/lib/api/types/recipe";
 import { useTools } from "~/composables/recipes";
 
 export default defineComponent({
diff --git a/frontend/components/Domain/ShoppingList/MultiPurposeLabel.vue b/frontend/components/Domain/ShoppingList/MultiPurposeLabel.vue
index ad62a8d7..3ce32cfe 100644
--- a/frontend/components/Domain/ShoppingList/MultiPurposeLabel.vue
+++ b/frontend/components/Domain/ShoppingList/MultiPurposeLabel.vue
@@ -6,7 +6,7 @@
 
 <script lang="ts">
 import { computed, defineComponent } from "@nuxtjs/composition-api";
-import { MultiPurposeLabelSummary } from "~/types/api-types/recipe";
+import { MultiPurposeLabelSummary } from "~/lib/api/types/recipe";
 
 export default defineComponent({
   props: {
diff --git a/frontend/components/Domain/ShoppingList/ShoppingListItem.vue b/frontend/components/Domain/ShoppingList/ShoppingListItem.vue
index 82432236..a5757bf8 100644
--- a/frontend/components/Domain/ShoppingList/ShoppingListItem.vue
+++ b/frontend/components/Domain/ShoppingList/ShoppingListItem.vue
@@ -55,9 +55,9 @@
 import { defineComponent, computed, ref, useContext } from "@nuxtjs/composition-api";
 import ShoppingListItemEditor from "./ShoppingListItemEditor.vue";
 import MultiPurposeLabel from "./MultiPurposeLabel.vue";
-import { ShoppingListItemCreate } from "~/types/api-types/group";
-import { MultiPurposeLabelOut } from "~/types/api-types/labels";
-import { IngredientFood, IngredientUnit } from "~/types/api-types/recipe";
+import { ShoppingListItemCreate } from "~/lib/api/types/group";
+import { MultiPurposeLabelOut } from "~/lib/api/types/labels";
+import { IngredientFood, IngredientUnit } from "~/lib/api/types/recipe";
 import { getDisplayText } from "~/composables/use-display-text";
 
 interface actions {
diff --git a/frontend/components/Domain/ShoppingList/ShoppingListItemEditor.vue b/frontend/components/Domain/ShoppingList/ShoppingListItemEditor.vue
index 2056c4ac..f68c742e 100644
--- a/frontend/components/Domain/ShoppingList/ShoppingListItemEditor.vue
+++ b/frontend/components/Domain/ShoppingList/ShoppingListItemEditor.vue
@@ -96,9 +96,9 @@
 
 <script lang="ts">
 import { defineComponent, computed } from "@nuxtjs/composition-api";
-import { ShoppingListItemCreate, ShoppingListItemOut } from "~/types/api-types/group";
-import { MultiPurposeLabelOut } from "~/types/api-types/labels";
-import { IngredientFood, IngredientUnit } from "~/types/api-types/recipe";
+import { ShoppingListItemCreate, ShoppingListItemOut } from "~/lib/api/types/group";
+import { MultiPurposeLabelOut } from "~/lib/api/types/labels";
+import { IngredientFood, IngredientUnit } from "~/lib/api/types/recipe";
 
 export default defineComponent({
   props: {
diff --git a/frontend/components/Domain/User/UserAvatar.vue b/frontend/components/Domain/User/UserAvatar.vue
index 00ecea31..0c02a217 100644
--- a/frontend/components/Domain/User/UserAvatar.vue
+++ b/frontend/components/Domain/User/UserAvatar.vue
@@ -9,7 +9,7 @@
 
 <script lang="ts">
 import { defineComponent, toRefs, reactive, useContext, computed } from "@nuxtjs/composition-api";
-import { UserOut } from "~/types/api-types/user";
+import { UserOut } from "~/lib/api/types/user";
 
 export default defineComponent({
   props: {
@@ -35,7 +35,7 @@ export default defineComponent({
 
     const imageURL = computed(() => {
       // TODO Setup correct user type for $auth.user
-      const user = $auth.user as unknown as (UserOut | null);
+      const user = $auth.user as unknown as UserOut | null;
       const key = user?.cacheKey ?? "";
       return `/api/media/users/${props.userId}/profile.webp?cacheKey=${key}`;
     });
diff --git a/frontend/components/global/InputLabelType.vue b/frontend/components/global/InputLabelType.vue
index af9aa728..9e9cd84f 100644
--- a/frontend/components/global/InputLabelType.vue
+++ b/frontend/components/global/InputLabelType.vue
@@ -32,8 +32,8 @@
  * using the .sync syntax `item-id.sync="item.labelId"`
  */
 import { defineComponent, computed } from "@nuxtjs/composition-api";
-import { MultiPurposeLabelSummary } from "~/types/api-types/labels";
-import { IngredientFood, IngredientUnit } from "~/types/api-types/recipe";
+import { MultiPurposeLabelSummary } from "~/lib/api/types/labels";
+import { IngredientFood, IngredientUnit } from "~/lib/api/types/recipe";
 
 export default defineComponent({
   props: {
@@ -84,4 +84,4 @@ export default defineComponent({
     };
   },
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/frontend/components/global/RecipeJsonEditor.vue b/frontend/components/global/RecipeJsonEditor.vue
index a3399dc1..99067f8e 100644
--- a/frontend/components/global/RecipeJsonEditor.vue
+++ b/frontend/components/global/RecipeJsonEditor.vue
@@ -27,4 +27,3 @@ export default defineComponent({
   },
 });
 </script>
-
diff --git a/frontend/components/global/ReportTable.vue b/frontend/components/global/ReportTable.vue
index 22b305c8..cab54139 100644
--- a/frontend/components/global/ReportTable.vue
+++ b/frontend/components/global/ReportTable.vue
@@ -26,7 +26,7 @@
 
 <script lang="ts">
 import { defineComponent, useContext, useRouter } from "@nuxtjs/composition-api";
-import { ReportSummary } from "~/types/api-types/reports";
+import { ReportSummary } from "~/lib/api/types/reports";
 
 export default defineComponent({
   props: {
diff --git a/frontend/composables/api/api-client.ts b/frontend/composables/api/api-client.ts
index d446f5ca..4a3f08e0 100644
--- a/frontend/composables/api/api-client.ts
+++ b/frontend/composables/api/api-client.ts
@@ -1,9 +1,8 @@
 import { AxiosResponse } from "axios";
 import { useContext } from "@nuxtjs/composition-api";
 import type { NuxtAxiosInstance } from "@nuxtjs/axios";
-import { AdminAPI, Api } from "~/api";
-import { ApiRequestInstance, RequestResponse } from "~/types/api";
-import { PublicApi } from "~/api/public-api";
+import { ApiRequestInstance, RequestResponse } from "~/lib/api/types/non-generated";
+import { AdminAPI, PublicApi, UserApi } from "~/lib/api";
 
 const request = {
   async safe<T, U>(
@@ -66,12 +65,12 @@ export const useAdminApi = function (): AdminAPI {
   return new AdminAPI(requests);
 };
 
-export const useUserApi = function (): Api {
+export const useUserApi = function (): UserApi {
   const { $axios, i18n } = useContext();
   $axios.setHeader("Accept-Language", i18n.locale);
 
   const requests = getRequests($axios);
-  return new Api(requests);
+  return new UserApi(requests);
 };
 
 export const usePublicApi = function (): PublicApi {
diff --git a/frontend/composables/api/use-app-info.ts b/frontend/composables/api/use-app-info.ts
index 941932db..3e73fce4 100644
--- a/frontend/composables/api/use-app-info.ts
+++ b/frontend/composables/api/use-app-info.ts
@@ -1,6 +1,6 @@
 import { ref, Ref, useAsync, useContext } from "@nuxtjs/composition-api";
 import { useAsyncKey } from "../use-utils";
-import { AppInfo } from "~/types/api-types/admin";
+import { AppInfo } from "~/lib/api/types/admin";
 
 export function useAppInfo(): Ref<AppInfo | null> {
   const appInfo = ref<null | AppInfo>(null);
diff --git a/frontend/composables/partials/use-actions-factory.ts b/frontend/composables/partials/use-actions-factory.ts
index 80b73d28..7d009687 100644
--- a/frontend/composables/partials/use-actions-factory.ts
+++ b/frontend/composables/partials/use-actions-factory.ts
@@ -1,6 +1,6 @@
 import { Ref, useAsync } from "@nuxtjs/composition-api";
 import { useAsyncKey } from "../use-utils";
-import { BaseCRUDAPI } from "~/api/_base";
+import { BaseCRUDAPI } from "~/lib/api/base/base-clients";
 
 type BoundT = {
   id?: string | number;
diff --git a/frontend/composables/recipe-page/shared-state.ts b/frontend/composables/recipe-page/shared-state.ts
index 14b3f9cd..c683c0fb 100644
--- a/frontend/composables/recipe-page/shared-state.ts
+++ b/frontend/composables/recipe-page/shared-state.ts
@@ -1,5 +1,5 @@
 import { computed, ComputedRef, ref, Ref, useContext } from "@nuxtjs/composition-api";
-import { UserOut } from "~/types/api-types/user";
+import { UserOut } from "~/lib/api/types/user";
 
 export enum PageMode {
   EDIT = "EDIT",
diff --git a/frontend/composables/recipes/use-recipe-ingredients.ts b/frontend/composables/recipes/use-recipe-ingredients.ts
index 4ee1cfd3..66e16c98 100644
--- a/frontend/composables/recipes/use-recipe-ingredients.ts
+++ b/frontend/composables/recipes/use-recipe-ingredients.ts
@@ -1,6 +1,6 @@
 import DOMPurify from "isomorphic-dompurify";
 import { useFraction } from "./use-fraction";
-import { RecipeIngredient } from "~/types/api-types/recipe";
+import { RecipeIngredient } from "~/lib/api/types/recipe";
 const { frac } = useFraction();
 
 function sanitizeIngredientHTML(rawHtml: string) {
diff --git a/frontend/composables/recipes/use-recipe-meta.ts b/frontend/composables/recipes/use-recipe-meta.ts
index 11d50d0b..50a98a7c 100644
--- a/frontend/composables/recipes/use-recipe-meta.ts
+++ b/frontend/composables/recipes/use-recipe-meta.ts
@@ -1,6 +1,6 @@
 import { Ref } from "@nuxtjs/composition-api";
 import { useStaticRoutes } from "~/composables/api";
-import { Recipe } from "~/types/api-types/recipe";
+import { Recipe } from "~/lib/api/types/recipe";
 
 export interface RecipeMeta {
   title?: string;
@@ -53,6 +53,6 @@ export const useRecipeMeta = () => {
         },
       ],
     };
-  };
+  }
   return { recipeMeta };
 };
diff --git a/frontend/composables/recipes/use-recipe-search.ts b/frontend/composables/recipes/use-recipe-search.ts
index e052430a..ad3aaa65 100644
--- a/frontend/composables/recipes/use-recipe-search.ts
+++ b/frontend/composables/recipes/use-recipe-search.ts
@@ -1,6 +1,6 @@
 import { computed, reactive, ref, Ref } from "@nuxtjs/composition-api";
 import Fuse from "fuse.js";
-import { Recipe } from "~/types/api-types/recipe";
+import { Recipe } from "~/lib/api/types/recipe";
 
 export const useRecipeSearch = (recipes: Ref<Recipe[] | null>) => {
   const localState = reactive({
diff --git a/frontend/composables/recipes/use-recipe-tools.ts b/frontend/composables/recipes/use-recipe-tools.ts
index f2a19830..24b811fa 100644
--- a/frontend/composables/recipes/use-recipe-tools.ts
+++ b/frontend/composables/recipes/use-recipe-tools.ts
@@ -2,7 +2,7 @@ import { reactive, ref, useAsync } from "@nuxtjs/composition-api";
 import { useAsyncKey } from "../use-utils";
 import { useUserApi } from "~/composables/api";
 import { VForm } from "~/types/vuetify";
-import { RecipeTool } from "~/types/api-types/user";
+import { RecipeTool } from "~/lib/api/types/user";
 
 export const useTools = function (eager = true) {
   const workingToolData = reactive<RecipeTool>({
diff --git a/frontend/composables/recipes/use-recipe.ts b/frontend/composables/recipes/use-recipe.ts
index fe45b669..764bebe1 100644
--- a/frontend/composables/recipes/use-recipe.ts
+++ b/frontend/composables/recipes/use-recipe.ts
@@ -1,6 +1,6 @@
 import { ref, onMounted } from "@nuxtjs/composition-api";
 import { useUserApi } from "~/composables/api";
-import { Recipe } from "~/types/api-types/recipe";
+import { Recipe } from "~/lib/api/types/recipe";
 
 export const useRecipe = function (slug: string, eager = true) {
   const api = useUserApi();
diff --git a/frontend/composables/recipes/use-recipes.ts b/frontend/composables/recipes/use-recipes.ts
index 723e8ff1..b172f4d4 100644
--- a/frontend/composables/recipes/use-recipes.ts
+++ b/frontend/composables/recipes/use-recipes.ts
@@ -1,7 +1,7 @@
 import { useAsync, ref } from "@nuxtjs/composition-api";
 import { useAsyncKey } from "../use-utils";
 import { useUserApi } from "~/composables/api";
-import { Recipe } from "~/types/api-types/recipe";
+import { Recipe } from "~/lib/api/types/recipe";
 
 export const allRecipes = ref<Recipe[]>([]);
 export const recentRecipes = ref<Recipe[]>([]);
@@ -21,7 +21,14 @@ export const useLazyRecipes = function () {
     tag: string | null = null,
     tool: string | null = null
   ) {
-    const { data } = await api.recipes.getAll(page, perPage, { orderBy, orderDirection, cookbook, "categories": category, "tags": tag, "tools": tool });
+    const { data } = await api.recipes.getAll(page, perPage, {
+      orderBy,
+      orderDirection,
+      cookbook,
+      categories: category,
+      tags: tag,
+      tools: tool,
+    });
     return data ? data.items : [];
   }
 
@@ -54,7 +61,7 @@ export const useLazyRecipes = function () {
     appendRecipes,
     assignSorted,
     removeRecipe,
-    replaceRecipes
+    replaceRecipes,
   };
 };
 
diff --git a/frontend/composables/store/use-category-store.ts b/frontend/composables/store/use-category-store.ts
index 10206d0d..c76422df 100644
--- a/frontend/composables/store/use-category-store.ts
+++ b/frontend/composables/store/use-category-store.ts
@@ -1,7 +1,7 @@
 import { reactive, ref, Ref } from "@nuxtjs/composition-api";
 import { useStoreActions } from "../partials/use-actions-factory";
 import { useUserApi } from "~/composables/api";
-import { RecipeCategory } from "~/types/api-types/admin";
+import { RecipeCategory } from "~/lib/api/types/admin";
 
 const categoryStore: Ref<RecipeCategory[]> = ref([]);
 
diff --git a/frontend/composables/store/use-food-store.ts b/frontend/composables/store/use-food-store.ts
index 59500514..c4207972 100644
--- a/frontend/composables/store/use-food-store.ts
+++ b/frontend/composables/store/use-food-store.ts
@@ -1,7 +1,7 @@
 import { ref, reactive, Ref } from "@nuxtjs/composition-api";
 import { useStoreActions } from "../partials/use-actions-factory";
 import { useUserApi } from "~/composables/api";
-import { IngredientFood } from "~/types/api-types/recipe";
+import { IngredientFood } from "~/lib/api/types/recipe";
 
 let foodStore: Ref<IngredientFood[] | null> | null = null;
 
diff --git a/frontend/composables/store/use-label-store.ts b/frontend/composables/store/use-label-store.ts
index a12f34fd..11a3367d 100644
--- a/frontend/composables/store/use-label-store.ts
+++ b/frontend/composables/store/use-label-store.ts
@@ -1,6 +1,6 @@
 import { reactive, ref, Ref } from "@nuxtjs/composition-api";
 import { useStoreActions } from "../partials/use-actions-factory";
-import { MultiPurposeLabelOut } from "~/types/api-types/labels";
+import { MultiPurposeLabelOut } from "~/lib/api/types/labels";
 import { useUserApi } from "~/composables/api";
 
 let labelStore: Ref<MultiPurposeLabelOut[] | null> | null = null;
diff --git a/frontend/composables/store/use-tag-store.ts b/frontend/composables/store/use-tag-store.ts
index 401ef612..10d7602d 100644
--- a/frontend/composables/store/use-tag-store.ts
+++ b/frontend/composables/store/use-tag-store.ts
@@ -1,7 +1,7 @@
 import { reactive, ref, Ref } from "@nuxtjs/composition-api";
 import { useStoreActions } from "../partials/use-actions-factory";
 import { useUserApi } from "~/composables/api";
-import { RecipeTag } from "~/types/api-types/admin";
+import { RecipeTag } from "~/lib/api/types/admin";
 
 const items: Ref<RecipeTag[]> = ref([]);
 
diff --git a/frontend/composables/store/use-tool-store.ts b/frontend/composables/store/use-tool-store.ts
index 1a5fcb5c..7120bc11 100644
--- a/frontend/composables/store/use-tool-store.ts
+++ b/frontend/composables/store/use-tool-store.ts
@@ -1,7 +1,7 @@
 import { reactive, ref, Ref } from "@nuxtjs/composition-api";
 import { useStoreActions } from "../partials/use-actions-factory";
 import { useUserApi } from "~/composables/api";
-import { RecipeTool } from "~/types/api-types/recipe";
+import { RecipeTool } from "~/lib/api/types/recipe";
 
 const toolStore: Ref<RecipeTool[]> = ref([]);
 
diff --git a/frontend/composables/store/use-unit-store.ts b/frontend/composables/store/use-unit-store.ts
index ebe5328a..f1deb1e4 100644
--- a/frontend/composables/store/use-unit-store.ts
+++ b/frontend/composables/store/use-unit-store.ts
@@ -1,7 +1,7 @@
 import { ref, reactive, Ref } from "@nuxtjs/composition-api";
 import { useStoreActions } from "../partials/use-actions-factory";
 import { useUserApi } from "~/composables/api";
-import { IngredientUnit } from "~/types/api-types/recipe";
+import { IngredientUnit } from "~/lib/api/types/recipe";
 
 let unitStore: Ref<IngredientUnit[] | null> | null = null;
 
diff --git a/frontend/composables/use-backups.ts b/frontend/composables/use-backups.ts
index 57aa6734..481993a4 100644
--- a/frontend/composables/use-backups.ts
+++ b/frontend/composables/use-backups.ts
@@ -1,6 +1,6 @@
 import { useAsync, ref, reactive } from "@nuxtjs/composition-api";
 import { toastLoading, loader } from "./use-toast";
-import { AllBackups, BackupOptions } from "~/types/api-types/admin";
+import { AllBackups, BackupOptions } from "~/lib/api/types/admin";
 import { useUserApi } from "~/composables/api";
 
 interface ImportBackup {
diff --git a/frontend/composables/use-display-text.ts b/frontend/composables/use-display-text.ts
index 1976aace..bb287383 100644
--- a/frontend/composables/use-display-text.ts
+++ b/frontend/composables/use-display-text.ts
@@ -3,7 +3,7 @@
  * with the food, units, quantity, and notes.
  */
 
-import { IngredientFood, IngredientUnit } from "~/types/api-types/recipe";
+import { IngredientFood, IngredientUnit } from "~/lib/api/types/recipe";
 
 export function getDisplayText(
   notes = "",
diff --git a/frontend/composables/use-group-cookbooks.ts b/frontend/composables/use-group-cookbooks.ts
index 1e636c57..988958c9 100644
--- a/frontend/composables/use-group-cookbooks.ts
+++ b/frontend/composables/use-group-cookbooks.ts
@@ -1,7 +1,7 @@
 import { useAsync, ref, Ref } from "@nuxtjs/composition-api";
 import { useAsyncKey } from "./use-utils";
 import { useUserApi } from "~/composables/api";
-import { ReadCookBook, UpdateCookBook } from "~/types/api-types/cookbook";
+import { ReadCookBook, UpdateCookBook } from "~/lib/api/types/cookbook";
 
 let cookbookStore: Ref<ReadCookBook[] | null> | null = null;
 
diff --git a/frontend/composables/use-group-mealplan.ts b/frontend/composables/use-group-mealplan.ts
index 9f590cef..d484cd5c 100644
--- a/frontend/composables/use-group-mealplan.ts
+++ b/frontend/composables/use-group-mealplan.ts
@@ -2,7 +2,7 @@ import { useAsync, ref, Ref, watch } from "@nuxtjs/composition-api";
 import { format } from "date-fns";
 import { useAsyncKey } from "./use-utils";
 import { useUserApi } from "~/composables/api";
-import { CreatePlanEntry, PlanEntryType, UpdatePlanEntry } from "~/types/api-types/meal-plan";
+import { CreatePlanEntry, PlanEntryType, UpdatePlanEntry } from "~/lib/api/types/meal-plan";
 
 export const planTypeOptions = [
   { text: "Breakfast", value: "breakfast" },
diff --git a/frontend/composables/use-group-webhooks.ts b/frontend/composables/use-group-webhooks.ts
index 156e74a2..311e26dc 100644
--- a/frontend/composables/use-group-webhooks.ts
+++ b/frontend/composables/use-group-webhooks.ts
@@ -1,7 +1,7 @@
 import { useAsync, ref } from "@nuxtjs/composition-api";
 import { useAsyncKey } from "./use-utils";
 import { useUserApi } from "~/composables/api";
-import { ReadWebhook } from "~/types/api-types/group";
+import { ReadWebhook } from "~/lib/api/types/group";
 
 export const useGroupWebhooks = function () {
   const api = useUserApi();
diff --git a/frontend/composables/use-groups.ts b/frontend/composables/use-groups.ts
index 5ee60c67..8b2e8b68 100644
--- a/frontend/composables/use-groups.ts
+++ b/frontend/composables/use-groups.ts
@@ -1,7 +1,7 @@
 import { useAsync, ref } from "@nuxtjs/composition-api";
 import { useAsyncKey } from "./use-utils";
 import { useUserApi } from "~/composables/api";
-import { GroupBase } from "~/types/api-types/user";
+import { GroupBase } from "~/lib/api/types/user";
 
 export const useGroupSelf = function () {
   const api = useUserApi();
diff --git a/frontend/composables/use-passwords.test.ts b/frontend/composables/use-passwords.test.ts
new file mode 100644
index 00000000..fcd55d26
--- /dev/null
+++ b/frontend/composables/use-passwords.test.ts
@@ -0,0 +1,32 @@
+import { ref } from "@nuxtjs/composition-api";
+import { describe, expect, test } from "vitest";
+import { usePasswordStrength } from "./use-passwords";
+
+// test("test usePasswordField", () => {
+//   const { inputType, togglePasswordShow, passwordIcon } = usePasswordField();
+//   expect(inputType.value).toBe("password");
+//   expect(passwordIcon.value).toBe("mdi-eye");
+//   togglePasswordShow();
+//   expect(inputType.value).toBe("text");
+//   expect(passwordIcon.value).toBe("mdi-eye-off");
+// });
+
+describe("test usePasswordStrength", () => {
+  test("weak password", () => {
+    const password = ref("123456");
+    const { score, strength, color } = usePasswordStrength(password);
+    expect(score.value).toBeGreaterThan(0);
+    expect(score.value).toBeLessThan(40);
+    expect(strength.value).toBe("Weak");
+    expect(color.value).toBe("error");
+  });
+
+  test("very strong password", () => {
+    const password = ref("My~Secret~Not~So~Secret?123");
+    const { score, strength, color } = usePasswordStrength(password);
+    expect(score.value).toBeGreaterThan(90);
+    expect(score.value).toBe(100);
+    expect(strength.value).toBe("Very Strong");
+    expect(color.value).toBe("success");
+  });
+});
diff --git a/frontend/composables/use-passwords.ts b/frontend/composables/use-passwords.ts
index 49bcfaa1..4f8acf25 100644
--- a/frontend/composables/use-passwords.ts
+++ b/frontend/composables/use-passwords.ts
@@ -1,4 +1,5 @@
 import { computed, Ref, ref, useContext } from "@nuxtjs/composition-api";
+import { scorePassword } from "~/lib/validators";
 
 export function usePasswordField() {
   const show = ref(false);
@@ -21,46 +22,6 @@ export function usePasswordField() {
   };
 }
 
-function scorePassword(pass: string): number {
-  let score = 0;
-  if (!pass) return score;
-
-  const flaggedWords = ["password", "mealie", "admin", "qwerty", "login"];
-
-  if (pass.length < 6) return score;
-
-  // Check for flagged words
-  for (const word of flaggedWords) {
-    if (pass.toLowerCase().includes(word)) {
-      score -= 100;
-    }
-  }
-
-  // award every unique letter until 5 repetitions
-  const letters: { [key: string]: number } = {};
-
-  for (let i = 0; i < pass.length; i++) {
-    letters[pass[i]] = (letters[pass[i]] || 0) + 1;
-    score += 5.0 / letters[pass[i]];
-  }
-
-  // bonus points for mixing it up
-  const variations: { [key: string]: boolean } = {
-    digits: /\d/.test(pass),
-    lower: /[a-z]/.test(pass),
-    upper: /[A-Z]/.test(pass),
-    nonWords: /\W/.test(pass),
-  };
-
-  let variationCount = 0;
-  for (const check in variations) {
-    variationCount += variations[check] === true ? 1 : 0;
-  }
-  score += (variationCount - 1) * 10;
-
-  return score;
-}
-
 export const usePasswordStrength = (password: Ref<string>) => {
   const score = computed(() => {
     return scorePassword(password.value);
diff --git a/frontend/composables/use-user.ts b/frontend/composables/use-user.ts
index 97b9416c..e7b44c66 100644
--- a/frontend/composables/use-user.ts
+++ b/frontend/composables/use-user.ts
@@ -1,6 +1,6 @@
 import { useAsync, ref } from "@nuxtjs/composition-api";
 import { useUserApi } from "~/composables/api";
-import { UserIn, UserOut } from "~/types/api-types/user";
+import { UserIn, UserOut } from "~/lib/api/types/user";
 
 /*
 TODO: Potentially combine useAllUsers and useUser by delaying the get all users functionality
diff --git a/frontend/composables/use-validators.ts b/frontend/composables/use-validators.ts
index 8b4e0e6b..fc7fd6ad 100644
--- a/frontend/composables/use-validators.ts
+++ b/frontend/composables/use-validators.ts
@@ -1,19 +1,15 @@
 import { ref, Ref } from "@nuxtjs/composition-api";
-import { RequestResponse } from "~/types/api";
-import { ValidationResponse } from "~/types/api-types/response";
-
-const EMAIL_REGEX =
-  /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@(([[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
-
-const URL_REGEX = /[-a-zA-Z0-9@:%._+~#=]{1,256}.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&//=]*)/;
+import { RequestResponse } from "~/lib/api/types/non-generated";
+import { ValidationResponse } from "~/lib/api/types/response";
+import { required, email, whitespace, url, minLength, maxLength } from "~/lib/validators";
 
 export const validators = {
-  required: (v: string) => !!v || "This Field is Required",
-  email: (v: string) => !v || EMAIL_REGEX.test(v) || "Email Must Be Valid",
-  whitespace: (v: string) => !v || v.split(" ").length <= 1 || "No Whitespace Allowed",
-  url: (v: string) => !v || URL_REGEX.test(v) || "Must Be A Valid URL",
-  minLength: (min: number) => (v: string) => !v || v.length >= min || `Must Be At Least ${min} Characters`,
-  maxLength: (max: number) => (v: string) => !v || v.length <= max || `Must Be At Most ${max} Characters`,
+  required,
+  email,
+  whitespace,
+  url,
+  minLength,
+  maxLength,
 };
 
 /**
diff --git a/frontend/api/admin/admin-about.ts b/frontend/lib/api/admin/admin-about.ts
similarity index 92%
rename from frontend/api/admin/admin-about.ts
rename to frontend/lib/api/admin/admin-about.ts
index 172e5cf3..c736d370 100644
--- a/frontend/api/admin/admin-about.ts
+++ b/frontend/lib/api/admin/admin-about.ts
@@ -1,5 +1,5 @@
-import { BaseAPI } from "../_base";
-import { AdminAboutInfo, DockerVolumeText, CheckAppConfig } from "~/types/api-types/admin";
+import { BaseAPI } from "../base/base-clients";
+import { AdminAboutInfo, DockerVolumeText, CheckAppConfig } from "~/lib/api/types/admin";
 
 const prefix = "/api";
 
diff --git a/frontend/api/admin/admin-analytics.ts b/frontend/lib/api/admin/admin-analytics.ts
similarity index 67%
rename from frontend/api/admin/admin-analytics.ts
rename to frontend/lib/api/admin/admin-analytics.ts
index 3947899c..7a8901d4 100644
--- a/frontend/api/admin/admin-analytics.ts
+++ b/frontend/lib/api/admin/admin-analytics.ts
@@ -1,5 +1,5 @@
-import { BaseAPI } from "../_base";
-import { MealieAnalytics } from "~/types/api-types/analytics";
+import { BaseAPI } from "../base/base-clients";
+import { MealieAnalytics } from "~/lib/api/types/analytics";
 
 const prefix = "/api";
 
diff --git a/frontend/api/admin/admin-backups.ts b/frontend/lib/api/admin/admin-backups.ts
similarity index 87%
rename from frontend/api/admin/admin-backups.ts
rename to frontend/lib/api/admin/admin-backups.ts
index 2ad34cde..936b08a5 100644
--- a/frontend/api/admin/admin-backups.ts
+++ b/frontend/lib/api/admin/admin-backups.ts
@@ -1,6 +1,6 @@
-import { BaseAPI } from "../_base";
-import { AllBackups } from "~/types/api-types/admin";
-import { ErrorResponse, FileTokenResponse, SuccessResponse } from "~/types/api-types/response";
+import { BaseAPI } from "../base/base-clients";
+import { AllBackups } from "~/lib/api/types/admin";
+import { ErrorResponse, FileTokenResponse, SuccessResponse } from "~/lib/api/types/response";
 
 const prefix = "/api";
 
diff --git a/frontend/api/admin/admin-groups.ts b/frontend/lib/api/admin/admin-groups.ts
similarity index 76%
rename from frontend/api/admin/admin-groups.ts
rename to frontend/lib/api/admin/admin-groups.ts
index 2f87b3c2..fbe372fa 100644
--- a/frontend/api/admin/admin-groups.ts
+++ b/frontend/lib/api/admin/admin-groups.ts
@@ -1,6 +1,6 @@
-import { BaseCRUDAPI } from "../_base";
-import { GroupBase, GroupInDB } from "~/types/api-types/user";
-import { GroupAdminUpdate } from "~/types/api-types/group";
+import { BaseCRUDAPI } from "../base/base-clients";
+import { GroupBase, GroupInDB } from "~/lib/api/types/user";
+import { GroupAdminUpdate } from "~/lib/api/types/group";
 const prefix = "/api";
 
 const routes = {
diff --git a/frontend/api/admin/admin-maintenance.ts b/frontend/lib/api/admin/admin-maintenance.ts
similarity index 89%
rename from frontend/api/admin/admin-maintenance.ts
rename to frontend/lib/api/admin/admin-maintenance.ts
index 820d58b2..51f4121b 100644
--- a/frontend/api/admin/admin-maintenance.ts
+++ b/frontend/lib/api/admin/admin-maintenance.ts
@@ -1,6 +1,6 @@
-import { BaseAPI } from "../_base";
-import { SuccessResponse } from "~/types/api-types/response";
-import { MaintenanceLogs, MaintenanceStorageDetails, MaintenanceSummary } from "~/types/api-types/admin";
+import { BaseAPI } from "../base/base-clients";
+import { SuccessResponse } from "~/lib/api/types/response";
+import { MaintenanceLogs, MaintenanceStorageDetails, MaintenanceSummary } from "~/lib/api/types/admin";
 
 const prefix = "/api";
 
diff --git a/frontend/api/admin/admin-tasks.ts b/frontend/lib/api/admin/admin-tasks.ts
similarity index 75%
rename from frontend/api/admin/admin-tasks.ts
rename to frontend/lib/api/admin/admin-tasks.ts
index 6fdd7448..46fe970d 100644
--- a/frontend/api/admin/admin-tasks.ts
+++ b/frontend/lib/api/admin/admin-tasks.ts
@@ -1,5 +1,5 @@
-import { BaseAPI } from "../_base";
-import { ServerTask } from "~/types/api-types/server";
+import { BaseAPI } from "../base/base-clients";
+import { ServerTask } from "~/lib/api/types/server";
 
 const prefix = "/api";
 
diff --git a/frontend/api/admin/admin-users.ts b/frontend/lib/api/admin/admin-users.ts
similarity index 81%
rename from frontend/api/admin/admin-users.ts
rename to frontend/lib/api/admin/admin-users.ts
index 9e863d3b..bfae183b 100644
--- a/frontend/api/admin/admin-users.ts
+++ b/frontend/lib/api/admin/admin-users.ts
@@ -1,5 +1,5 @@
-import { BaseCRUDAPI } from "../_base";
-import { UnlockResults, UserIn, UserOut } from "~/types/api-types/user";
+import { BaseCRUDAPI } from "../base/base-clients";
+import { UnlockResults, UserIn, UserOut } from "~/lib/api/types/user";
 
 const prefix = "/api";
 
diff --git a/frontend/api/_base.ts b/frontend/lib/api/base/base-clients.ts
similarity index 90%
rename from frontend/api/_base.ts
rename to frontend/lib/api/base/base-clients.ts
index 7b251447..dc105cc5 100644
--- a/frontend/api/_base.ts
+++ b/frontend/lib/api/base/base-clients.ts
@@ -1,4 +1,4 @@
-import { ApiRequestInstance, PaginationData } from "~/types/api";
+import { ApiRequestInstance, PaginationData } from "~/lib/api/types/non-generated";
 
 export interface CrudAPIInterface {
   requests: ApiRequestInstance;
@@ -18,7 +18,10 @@ export abstract class BaseAPI {
   }
 }
 
-export abstract class BaseCRUDAPI<CreateType, ReadType, UpdateType = CreateType> extends BaseAPI implements CrudAPIInterface {
+export abstract class BaseCRUDAPI<CreateType, ReadType, UpdateType = CreateType>
+  extends BaseAPI
+  implements CrudAPIInterface
+{
   abstract baseRoute: string;
   abstract itemRoute(itemId: string | number): string;
 
diff --git a/frontend/lib/api/base/index.ts b/frontend/lib/api/base/index.ts
new file mode 100644
index 00000000..b875ba91
--- /dev/null
+++ b/frontend/lib/api/base/index.ts
@@ -0,0 +1 @@
+export { route } from "./route";
diff --git a/frontend/lib/api/base/route.ts b/frontend/lib/api/base/route.ts
new file mode 100644
index 00000000..ebb4b9c7
--- /dev/null
+++ b/frontend/lib/api/base/route.ts
@@ -0,0 +1,38 @@
+const parts = {
+  host: "http://localhost.com",
+  prefix: "/api",
+};
+
+export function overrideParts(host: string, prefix: string) {
+  parts.host = host;
+  parts.prefix = prefix;
+}
+
+export type QueryValue = string | string[] | number | number[] | boolean | null | undefined;
+
+/**
+ * route is a the main URL builder for the API. It will use a predefined host and prefix (global)
+ * in the urls.ts file and then append the passed in path parameter uring the `URL` class from the
+ * browser. It will also append any query parameters passed in as the second parameter.
+ *
+ * The default host `http://localhost.com` is removed from the path if it is present. This allows us
+ * to bootstrap the API with different hosts as needed (like for testing) but still allows us to use
+ * relative URLs in production because the API and client bundle are served from the same server/host.
+ */
+export function route(rest: string, params: Record<string, QueryValue> | null = null): string {
+  const url = new URL(parts.prefix + rest, parts.host);
+
+  if (params) {
+    for (const [key, value] of Object.entries(params)) {
+      if (Array.isArray(value)) {
+        for (const item of value) {
+          url.searchParams.append(key, String(item));
+        }
+      } else {
+        url.searchParams.append(key, String(value));
+      }
+    }
+  }
+
+  return url.toString().replace("http://localhost.com", "");
+}
diff --git a/frontend/lib/api/base/routes.test.ts b/frontend/lib/api/base/routes.test.ts
new file mode 100644
index 00000000..aae87002
--- /dev/null
+++ b/frontend/lib/api/base/routes.test.ts
@@ -0,0 +1,24 @@
+import { describe, expect, it } from "vitest";
+import { route } from ".";
+
+describe("UrlBuilder", () => {
+  it("basic query parameter", () => {
+    const result = route("/test", { a: "b" });
+    expect(result).toBe("/api/test?a=b");
+  });
+
+  it("multiple query parameters", () => {
+    const result = route("/test", { a: "b", c: "d" });
+    expect(result).toBe("/api/test?a=b&c=d");
+  });
+
+  it("no query parameters", () => {
+    const result = route("/test");
+    expect(result).toBe("/api/test");
+  });
+
+  it("list-like query parameters", () => {
+    const result = route("/test", { a: ["b", "c"] });
+    expect(result).toBe("/api/test?a=b&a=c");
+  });
+});
diff --git a/frontend/api/admin-api.ts b/frontend/lib/api/client-admin.ts
similarity index 94%
rename from frontend/api/admin-api.ts
rename to frontend/lib/api/client-admin.ts
index d2567e33..c4bc2a14 100644
--- a/frontend/api/admin-api.ts
+++ b/frontend/lib/api/client-admin.ts
@@ -5,7 +5,7 @@ import { AdminGroupsApi } from "./admin/admin-groups";
 import { AdminBackupsApi } from "./admin/admin-backups";
 import { AdminMaintenanceApi } from "./admin/admin-maintenance";
 import { AdminAnalyticsApi } from "./admin/admin-analytics";
-import { ApiRequestInstance } from "~/types/api";
+import { ApiRequestInstance } from "~/lib/api/types/non-generated";
 
 export class AdminAPI {
   public about: AdminAboutAPI;
diff --git a/frontend/api/public-api.ts b/frontend/lib/api/client-public.ts
similarity index 87%
rename from frontend/api/public-api.ts
rename to frontend/lib/api/client-public.ts
index 584c966f..b613d616 100644
--- a/frontend/api/public-api.ts
+++ b/frontend/lib/api/client-public.ts
@@ -1,7 +1,7 @@
 import { ValidatorsApi } from "./public/validators";
 import { ExploreApi } from "./public/explore";
 import { SharedApi } from "./public/shared";
-import { ApiRequestInstance } from "~/types/api";
+import { ApiRequestInstance } from "~/lib/api/types/non-generated";
 
 export class PublicApi {
   public validators: ValidatorsApi;
diff --git a/frontend/api/index.ts b/frontend/lib/api/client-user.ts
similarity index 55%
rename from frontend/api/index.ts
rename to frontend/lib/api/client-user.ts
index 3acb52f1..35f96e28 100644
--- a/frontend/api/index.ts
+++ b/frontend/lib/api/client-user.ts
@@ -1,33 +1,32 @@
-import { RecipeAPI } from "./class-interfaces/recipes";
-import { UserApi } from "./class-interfaces/users";
-import { GroupAPI } from "./class-interfaces/groups";
-import { BackupAPI } from "./class-interfaces/backups";
-import { UploadFile } from "./class-interfaces/upload";
-import { CategoriesAPI } from "./class-interfaces/organizer-categories";
-import { TagsAPI } from "./class-interfaces/organizer-tags";
-import { UtilsAPI } from "./class-interfaces/utils";
-import { FoodAPI } from "./class-interfaces/recipe-foods";
-import { UnitAPI } from "./class-interfaces/recipe-units";
-import { CookbookAPI } from "./class-interfaces/group-cookbooks";
-import { WebhooksAPI } from "./class-interfaces/group-webhooks";
-import { RegisterAPI } from "./class-interfaces/user-registration";
-import { MealPlanAPI } from "./class-interfaces/group-mealplan";
-import { EmailAPI } from "./class-interfaces/email";
-import { BulkActionsAPI } from "./class-interfaces/recipe-bulk-actions";
-import { GroupServerTaskAPI } from "./class-interfaces/group-tasks";
-import { AdminAPI } from "./admin-api";
-import { ToolsApi } from "./class-interfaces/organizer-tools";
-import { GroupMigrationApi } from "./class-interfaces/group-migrations";
-import { GroupReportsApi } from "./class-interfaces/group-reports";
-import { ShoppingApi } from "./class-interfaces/group-shopping-lists";
-import { MultiPurposeLabelsApi } from "./class-interfaces/group-multiple-purpose-labels";
-import { GroupEventNotifierApi } from "./class-interfaces/group-event-notifier";
-import { MealPlanRulesApi } from "./class-interfaces/group-mealplan-rules";
-import { GroupDataSeederApi } from "./class-interfaces/group-seeder";
-import {OcrAPI} from "./class-interfaces/ocr";
-import { ApiRequestInstance } from "~/types/api";
+import { RecipeAPI } from "./user/recipes";
+import { UserApi } from "./user/users";
+import { GroupAPI } from "./user/groups";
+import { BackupAPI } from "./user/backups";
+import { UploadFile } from "./user/upload";
+import { CategoriesAPI } from "./user/organizer-categories";
+import { TagsAPI } from "./user/organizer-tags";
+import { UtilsAPI } from "./user/utils";
+import { FoodAPI } from "./user/recipe-foods";
+import { UnitAPI } from "./user/recipe-units";
+import { CookbookAPI } from "./user/group-cookbooks";
+import { WebhooksAPI } from "./user/group-webhooks";
+import { RegisterAPI } from "./user/user-registration";
+import { MealPlanAPI } from "./user/group-mealplan";
+import { EmailAPI } from "./user/email";
+import { BulkActionsAPI } from "./user/recipe-bulk-actions";
+import { GroupServerTaskAPI } from "./user/group-tasks";
+import { ToolsApi } from "./user/organizer-tools";
+import { GroupMigrationApi } from "./user/group-migrations";
+import { GroupReportsApi } from "./user/group-reports";
+import { ShoppingApi } from "./user/group-shopping-lists";
+import { MultiPurposeLabelsApi } from "./user/group-multiple-purpose-labels";
+import { GroupEventNotifierApi } from "./user/group-event-notifier";
+import { MealPlanRulesApi } from "./user/group-mealplan-rules";
+import { GroupDataSeederApi } from "./user/group-seeder";
+import { OcrAPI } from "./user/ocr";
+import { ApiRequestInstance } from "~/lib/api/types/non-generated";
 
-class Api {
+export class UserApiClient {
   public recipes: RecipeAPI;
   public users: UserApi;
   public groups: GroupAPI;
@@ -98,5 +97,3 @@ class Api {
     Object.freeze(this);
   }
 }
-
-export { Api, AdminAPI };
diff --git a/frontend/api/config.ts b/frontend/lib/api/config.ts
similarity index 100%
rename from frontend/api/config.ts
rename to frontend/lib/api/config.ts
diff --git a/frontend/lib/api/index.ts b/frontend/lib/api/index.ts
new file mode 100644
index 00000000..ab076151
--- /dev/null
+++ b/frontend/lib/api/index.ts
@@ -0,0 +1,3 @@
+export { AdminAPI } from "./client-admin";
+export { PublicApi } from "./client-public";
+export { UserApiClient as UserApi } from "./client-user";
diff --git a/frontend/api/public/explore.ts b/frontend/lib/api/public/explore.ts
similarity index 77%
rename from frontend/api/public/explore.ts
rename to frontend/lib/api/public/explore.ts
index 2ef463e5..e33276a5 100644
--- a/frontend/api/public/explore.ts
+++ b/frontend/lib/api/public/explore.ts
@@ -1,5 +1,5 @@
-import { BaseAPI } from "../_base";
-import { Recipe } from "~/types/api-types/recipe";
+import { BaseAPI } from "../base/base-clients";
+import { Recipe } from "~/lib/api/types/recipe";
 
 const prefix = "/api";
 
diff --git a/frontend/api/public/shared.ts b/frontend/lib/api/public/shared.ts
similarity index 74%
rename from frontend/api/public/shared.ts
rename to frontend/lib/api/public/shared.ts
index dc0b19c4..a23d4715 100644
--- a/frontend/api/public/shared.ts
+++ b/frontend/lib/api/public/shared.ts
@@ -1,5 +1,5 @@
-import { BaseAPI } from "../_base";
-import { Recipe } from "~/types/api-types/recipe";
+import { BaseAPI } from "../base/base-clients";
+import { Recipe } from "~/lib/api/types/recipe";
 
 const prefix = "/api";
 
diff --git a/frontend/api/public/validators.ts b/frontend/lib/api/public/validators.ts
similarity index 89%
rename from frontend/api/public/validators.ts
rename to frontend/lib/api/public/validators.ts
index 148bcc7a..e6b1632e 100644
--- a/frontend/api/public/validators.ts
+++ b/frontend/lib/api/public/validators.ts
@@ -1,5 +1,5 @@
-import { BaseAPI } from "../_base";
-import { ValidationResponse } from "~/types/api-types/response";
+import { BaseAPI } from "../base/base-clients";
+import { ValidationResponse } from "~/lib/api/types/response";
 
 const prefix = "/api";
 
diff --git a/frontend/types/api-types/admin.ts b/frontend/lib/api/types/admin.ts
similarity index 100%
rename from frontend/types/api-types/admin.ts
rename to frontend/lib/api/types/admin.ts
diff --git a/frontend/types/api-types/analytics.ts b/frontend/lib/api/types/analytics.ts
similarity index 100%
rename from frontend/types/api-types/analytics.ts
rename to frontend/lib/api/types/analytics.ts
diff --git a/frontend/types/api-types/cookbook.ts b/frontend/lib/api/types/cookbook.ts
similarity index 100%
rename from frontend/types/api-types/cookbook.ts
rename to frontend/lib/api/types/cookbook.ts
diff --git a/frontend/types/api-types/events.ts b/frontend/lib/api/types/events.ts
similarity index 100%
rename from frontend/types/api-types/events.ts
rename to frontend/lib/api/types/events.ts
diff --git a/frontend/types/api-types/group.ts b/frontend/lib/api/types/group.ts
similarity index 100%
rename from frontend/types/api-types/group.ts
rename to frontend/lib/api/types/group.ts
diff --git a/frontend/types/api-types/labels.ts b/frontend/lib/api/types/labels.ts
similarity index 100%
rename from frontend/types/api-types/labels.ts
rename to frontend/lib/api/types/labels.ts
diff --git a/frontend/types/api-types/meal-plan.ts b/frontend/lib/api/types/meal-plan.ts
similarity index 100%
rename from frontend/types/api-types/meal-plan.ts
rename to frontend/lib/api/types/meal-plan.ts
diff --git a/frontend/types/api.ts b/frontend/lib/api/types/non-generated.ts
similarity index 83%
rename from frontend/types/api.ts
rename to frontend/lib/api/types/non-generated.ts
index 2881927f..445359da 100644
--- a/frontend/types/api.ts
+++ b/frontend/lib/api/types/non-generated.ts
@@ -23,3 +23,11 @@ export interface PaginationData<T> {
   total_pages: number;
   items: T[];
 }
+
+export type RecipeOrganizer = "categories" | "tags" | "tools";
+
+export enum Organizer {
+  Category = "categories",
+  Tag = "tags",
+  Tool = "tools",
+}
diff --git a/frontend/types/api-types/ocr.ts b/frontend/lib/api/types/ocr.ts
similarity index 100%
rename from frontend/types/api-types/ocr.ts
rename to frontend/lib/api/types/ocr.ts
diff --git a/frontend/types/api-types/recipe.ts b/frontend/lib/api/types/recipe.ts
similarity index 100%
rename from frontend/types/api-types/recipe.ts
rename to frontend/lib/api/types/recipe.ts
diff --git a/frontend/types/api-types/reports.ts b/frontend/lib/api/types/reports.ts
similarity index 100%
rename from frontend/types/api-types/reports.ts
rename to frontend/lib/api/types/reports.ts
diff --git a/frontend/types/api-types/response.ts b/frontend/lib/api/types/response.ts
similarity index 100%
rename from frontend/types/api-types/response.ts
rename to frontend/lib/api/types/response.ts
diff --git a/frontend/types/api-types/server.ts b/frontend/lib/api/types/server.ts
similarity index 100%
rename from frontend/types/api-types/server.ts
rename to frontend/lib/api/types/server.ts
diff --git a/frontend/types/api-types/static.ts b/frontend/lib/api/types/static.ts
similarity index 100%
rename from frontend/types/api-types/static.ts
rename to frontend/lib/api/types/static.ts
diff --git a/frontend/types/api-types/user.ts b/frontend/lib/api/types/user.ts
similarity index 100%
rename from frontend/types/api-types/user.ts
rename to frontend/lib/api/types/user.ts
diff --git a/frontend/api/class-interfaces/backups.ts b/frontend/lib/api/user/backups.ts
similarity index 87%
rename from frontend/api/class-interfaces/backups.ts
rename to frontend/lib/api/user/backups.ts
index 030934df..774eb14c 100644
--- a/frontend/api/class-interfaces/backups.ts
+++ b/frontend/lib/api/user/backups.ts
@@ -1,5 +1,5 @@
-import { BaseAPI } from "../_base";
-import { AllBackups, BackupOptions, CreateBackup } from "~/types/api-types/admin";
+import { BaseAPI } from "../base/base-clients";
+import { AllBackups, BackupOptions, CreateBackup } from "~/lib/api/types/admin";
 
 const prefix = "/api";
 
@@ -29,7 +29,7 @@ export class BackupAPI extends BaseAPI {
   /** Import a database backup file generated from Mealie.
    */
   async restoreDatabase(fileName: string, payload: BackupOptions) {
-    return await this.requests.post(routes.backupsFileNameImport(fileName), {name: fileName, ...payload});
+    return await this.requests.post(routes.backupsFileNameImport(fileName), { name: fileName, ...payload });
   }
 
   /** Removes a database backup from the file system
diff --git a/frontend/api/class-interfaces/email.ts b/frontend/lib/api/user/email.ts
similarity index 70%
rename from frontend/api/class-interfaces/email.ts
rename to frontend/lib/api/user/email.ts
index 91607cf9..c13be253 100644
--- a/frontend/api/class-interfaces/email.ts
+++ b/frontend/lib/api/user/email.ts
@@ -1,7 +1,7 @@
-import { BaseAPI } from "../_base";
-import { EmailInitationResponse, EmailInvitation } from "~/types/api-types/group";
-import { ForgotPassword } from "~/types/api-types/user";
-import { EmailTest } from "~/types/api-types/admin";
+import { BaseAPI } from "../base/base-clients";
+import { EmailInitationResponse, EmailInvitation } from "~/lib/api/types/group";
+import { ForgotPassword } from "~/lib/api/types/user";
+import { EmailTest } from "~/lib/api/types/admin";
 
 const routes = {
   base: "/api/admin/email",
diff --git a/frontend/api/class-interfaces/group-cookbooks.ts b/frontend/lib/api/user/group-cookbooks.ts
similarity index 86%
rename from frontend/api/class-interfaces/group-cookbooks.ts
rename to frontend/lib/api/user/group-cookbooks.ts
index 533a134a..6f8f49d1 100644
--- a/frontend/api/class-interfaces/group-cookbooks.ts
+++ b/frontend/lib/api/user/group-cookbooks.ts
@@ -1,5 +1,5 @@
-import { BaseCRUDAPI } from "../_base";
-import { CreateCookBook, RecipeCookBook, UpdateCookBook } from "~/types/api-types/cookbook";
+import { BaseCRUDAPI } from "../base/base-clients";
+import { CreateCookBook, RecipeCookBook, UpdateCookBook } from "~/lib/api/types/cookbook";
 
 const prefix = "/api";
 
diff --git a/frontend/api/class-interfaces/group-event-notifier.ts b/frontend/lib/api/user/group-event-notifier.ts
similarity index 65%
rename from frontend/api/class-interfaces/group-event-notifier.ts
rename to frontend/lib/api/user/group-event-notifier.ts
index 501baf86..efc9c77e 100644
--- a/frontend/api/class-interfaces/group-event-notifier.ts
+++ b/frontend/lib/api/user/group-event-notifier.ts
@@ -1,5 +1,5 @@
-import { BaseCRUDAPI } from "../_base";
-import { GroupEventNotifierCreate, GroupEventNotifierOut, GroupEventNotifierUpdate } from "~/types/api-types/group";
+import { BaseCRUDAPI } from "../base/base-clients";
+import { GroupEventNotifierCreate, GroupEventNotifierOut, GroupEventNotifierUpdate } from "~/lib/api/types/group";
 
 const prefix = "/api";
 
@@ -8,7 +8,11 @@ const routes = {
   eventNotifierId: (id: string | number) => `${prefix}/groups/events/notifications/${id}`,
 };
 
-export class GroupEventNotifierApi extends BaseCRUDAPI<GroupEventNotifierCreate, GroupEventNotifierOut, GroupEventNotifierUpdate> {
+export class GroupEventNotifierApi extends BaseCRUDAPI<
+  GroupEventNotifierCreate,
+  GroupEventNotifierOut,
+  GroupEventNotifierUpdate
+> {
   baseRoute = routes.eventNotifier;
   itemRoute = routes.eventNotifierId;
 
diff --git a/frontend/api/class-interfaces/group-mealplan-rules.ts b/frontend/lib/api/user/group-mealplan-rules.ts
similarity index 70%
rename from frontend/api/class-interfaces/group-mealplan-rules.ts
rename to frontend/lib/api/user/group-mealplan-rules.ts
index 58c13814..c809ad2e 100644
--- a/frontend/api/class-interfaces/group-mealplan-rules.ts
+++ b/frontend/lib/api/user/group-mealplan-rules.ts
@@ -1,5 +1,5 @@
-import { BaseCRUDAPI } from "../_base";
-import { PlanRulesCreate, PlanRulesOut } from "~/types/api-types/meal-plan";
+import { BaseCRUDAPI } from "../base/base-clients";
+import { PlanRulesCreate, PlanRulesOut } from "~/lib/api/types/meal-plan";
 
 const prefix = "/api";
 
diff --git a/frontend/api/class-interfaces/group-mealplan.ts b/frontend/lib/api/user/group-mealplan.ts
similarity index 85%
rename from frontend/api/class-interfaces/group-mealplan.ts
rename to frontend/lib/api/user/group-mealplan.ts
index 02214ba5..c078cf2c 100644
--- a/frontend/api/class-interfaces/group-mealplan.ts
+++ b/frontend/lib/api/user/group-mealplan.ts
@@ -1,5 +1,5 @@
-import { BaseCRUDAPI } from "../_base";
-import { CreatePlanEntry, CreateRandomEntry, ReadPlanEntry, UpdatePlanEntry } from "~/types/api-types/meal-plan";
+import { BaseCRUDAPI } from "../base/base-clients";
+import { CreatePlanEntry, CreateRandomEntry, ReadPlanEntry, UpdatePlanEntry } from "~/lib/api/types/meal-plan";
 
 const prefix = "/api";
 
diff --git a/frontend/api/class-interfaces/group-migrations.ts b/frontend/lib/api/user/group-migrations.ts
similarity index 78%
rename from frontend/api/class-interfaces/group-migrations.ts
rename to frontend/lib/api/user/group-migrations.ts
index 9f2c1b57..ac6d8d91 100644
--- a/frontend/api/class-interfaces/group-migrations.ts
+++ b/frontend/lib/api/user/group-migrations.ts
@@ -1,6 +1,6 @@
-import { BaseAPI } from "../_base";
-import { ReportSummary } from "~/types/api-types/reports";
-import { SupportedMigrations } from "~/types/api-types/group";
+import { BaseAPI } from "../base/base-clients";
+import { ReportSummary } from "~/lib/api/types/reports";
+import { SupportedMigrations } from "~/lib/api/types/group";
 
 const prefix = "/api";
 export interface MigrationPayload {
diff --git a/frontend/api/class-interfaces/group-multiple-purpose-labels.ts b/frontend/lib/api/user/group-multiple-purpose-labels.ts
similarity index 53%
rename from frontend/api/class-interfaces/group-multiple-purpose-labels.ts
rename to frontend/lib/api/user/group-multiple-purpose-labels.ts
index 5f429923..2761d0bd 100644
--- a/frontend/api/class-interfaces/group-multiple-purpose-labels.ts
+++ b/frontend/lib/api/user/group-multiple-purpose-labels.ts
@@ -1,5 +1,5 @@
-import { BaseCRUDAPI } from "../_base";
-import { MultiPurposeLabelCreate, MultiPurposeLabelOut, MultiPurposeLabelUpdate } from "~/types/api-types/labels";
+import { BaseCRUDAPI } from "../base/base-clients";
+import { MultiPurposeLabelCreate, MultiPurposeLabelOut, MultiPurposeLabelUpdate } from "~/lib/api/types/labels";
 
 const prefix = "/api";
 
@@ -8,7 +8,11 @@ const routes = {
   labelsId: (id: string | number) => `${prefix}/groups/labels/${id}`,
 };
 
-export class MultiPurposeLabelsApi extends BaseCRUDAPI<MultiPurposeLabelCreate, MultiPurposeLabelOut, MultiPurposeLabelUpdate> {
+export class MultiPurposeLabelsApi extends BaseCRUDAPI<
+  MultiPurposeLabelCreate,
+  MultiPurposeLabelOut,
+  MultiPurposeLabelUpdate
+> {
   baseRoute = routes.labels;
   itemRoute = routes.labelsId;
 }
diff --git a/frontend/api/class-interfaces/group-reports.ts b/frontend/lib/api/user/group-reports.ts
similarity index 81%
rename from frontend/api/class-interfaces/group-reports.ts
rename to frontend/lib/api/user/group-reports.ts
index ca6323cc..6b0cac7f 100644
--- a/frontend/api/class-interfaces/group-reports.ts
+++ b/frontend/lib/api/user/group-reports.ts
@@ -1,5 +1,5 @@
-import { BaseAPI } from "../_base";
-import { ReportCategory, ReportOut, ReportSummary } from "~/types/api-types/reports";
+import { BaseAPI } from "../base/base-clients";
+import { ReportCategory, ReportOut, ReportSummary } from "~/lib/api/types/reports";
 
 const prefix = "/api";
 
diff --git a/frontend/api/class-interfaces/group-seeder.ts b/frontend/lib/api/user/group-seeder.ts
similarity index 78%
rename from frontend/api/class-interfaces/group-seeder.ts
rename to frontend/lib/api/user/group-seeder.ts
index fd5257ad..b9fc5b6b 100644
--- a/frontend/api/class-interfaces/group-seeder.ts
+++ b/frontend/lib/api/user/group-seeder.ts
@@ -1,6 +1,6 @@
-import { BaseAPI } from "../_base";
-import { SuccessResponse } from "~/types/api-types/response";
-import { SeederConfig } from "~/types/api-types/group";
+import { BaseAPI } from "../base/base-clients";
+import { SuccessResponse } from "~/lib/api/types/response";
+import { SeederConfig } from "~/lib/api/types/group";
 
 const prefix = "/api";
 
diff --git a/frontend/api/class-interfaces/group-shopping-lists.ts b/frontend/lib/api/user/group-shopping-lists.ts
similarity index 86%
rename from frontend/api/class-interfaces/group-shopping-lists.ts
rename to frontend/lib/api/user/group-shopping-lists.ts
index 33430de6..9ade037f 100644
--- a/frontend/api/class-interfaces/group-shopping-lists.ts
+++ b/frontend/lib/api/user/group-shopping-lists.ts
@@ -1,5 +1,5 @@
-import { BaseCRUDAPI } from "../_base";
-import { ApiRequestInstance } from "~/types/api";
+import { BaseCRUDAPI } from "../base/base-clients";
+import { ApiRequestInstance } from "~/lib/api/types/non-generated";
 import {
   ShoppingListCreate,
   ShoppingListItemCreate,
@@ -7,7 +7,7 @@ import {
   ShoppingListItemUpdate,
   ShoppingListOut,
   ShoppingListUpdate,
-} from "~/types/api-types/group";
+} from "~/lib/api/types/group";
 
 const prefix = "/api";
 
@@ -33,7 +33,11 @@ export class ShoppingListsApi extends BaseCRUDAPI<ShoppingListCreate, ShoppingLi
   }
 }
 
-export class ShoppingListItemsApi extends BaseCRUDAPI<ShoppingListItemCreate, ShoppingListItemOut, ShoppingListItemUpdate> {
+export class ShoppingListItemsApi extends BaseCRUDAPI<
+  ShoppingListItemCreate,
+  ShoppingListItemOut,
+  ShoppingListItemUpdate
+> {
   baseRoute = routes.shoppingListItems;
   itemRoute = routes.shoppingListItemsId;
 
diff --git a/frontend/api/class-interfaces/group-tasks.ts b/frontend/lib/api/user/group-tasks.ts
similarity index 68%
rename from frontend/api/class-interfaces/group-tasks.ts
rename to frontend/lib/api/user/group-tasks.ts
index 4c9c8c5b..076af4db 100644
--- a/frontend/api/class-interfaces/group-tasks.ts
+++ b/frontend/lib/api/user/group-tasks.ts
@@ -1,5 +1,5 @@
-import { BaseAPI } from "../_base";
-import { ServerTask } from "~/types/api-types/server";
+import { BaseAPI } from "../base/base-clients";
+import { ServerTask } from "~/lib/api/types/server";
 const prefix = "/api";
 
 const routes = {
diff --git a/frontend/api/class-interfaces/group-webhooks.ts b/frontend/lib/api/user/group-webhooks.ts
similarity index 71%
rename from frontend/api/class-interfaces/group-webhooks.ts
rename to frontend/lib/api/user/group-webhooks.ts
index c6a472c3..8980bec1 100644
--- a/frontend/api/class-interfaces/group-webhooks.ts
+++ b/frontend/lib/api/user/group-webhooks.ts
@@ -1,5 +1,5 @@
-import { BaseCRUDAPI } from "../_base";
-import { CreateWebhook, ReadWebhook } from "~/types/api-types/group";
+import { BaseCRUDAPI } from "../base/base-clients";
+import { CreateWebhook, ReadWebhook } from "~/lib/api/types/group";
 
 const prefix = "/api";
 
diff --git a/frontend/api/class-interfaces/groups.ts b/frontend/lib/api/user/groups.ts
similarity index 86%
rename from frontend/api/class-interfaces/groups.ts
rename to frontend/lib/api/user/groups.ts
index d5099004..090f4fab 100644
--- a/frontend/api/class-interfaces/groups.ts
+++ b/frontend/lib/api/user/groups.ts
@@ -1,6 +1,15 @@
-import { BaseCRUDAPI } from "../_base";
-import { CategoryBase, GroupBase, GroupInDB, UserOut } from "~/types/api-types/user";
-import { CreateInviteToken, GroupAdminUpdate, GroupStatistics, GroupStorage, ReadGroupPreferences, ReadInviteToken, SetPermissions, UpdateGroupPreferences } from "~/types/api-types/group";
+import { BaseCRUDAPI } from "../base/base-clients";
+import { CategoryBase, GroupBase, GroupInDB, UserOut } from "~/lib/api/types/user";
+import {
+  CreateInviteToken,
+  GroupAdminUpdate,
+  GroupStatistics,
+  GroupStorage,
+  ReadGroupPreferences,
+  ReadInviteToken,
+  SetPermissions,
+  UpdateGroupPreferences,
+} from "~/lib/api/types/group";
 
 const prefix = "/api";
 
diff --git a/frontend/api/class-interfaces/ocr.ts b/frontend/lib/api/user/ocr.ts
similarity index 90%
rename from frontend/api/class-interfaces/ocr.ts
rename to frontend/lib/api/user/ocr.ts
index 1779fca4..02a8a7f6 100644
--- a/frontend/api/class-interfaces/ocr.ts
+++ b/frontend/lib/api/user/ocr.ts
@@ -1,9 +1,8 @@
-import { BaseAPI } from "~/api/_base";
+import { BaseAPI } from "../base/base-clients";
 
 const prefix = "/api";
 
 export class OcrAPI extends BaseAPI {
-
   // Currently unused in favor for the endpoint using asset names
   async fileToTsv(file: File) {
     const formData = new FormData();
@@ -14,5 +13,4 @@ export class OcrAPI extends BaseAPI {
   async assetToTsv(recipeSlug: string, assetName: string) {
     return await this.requests.post(`${prefix}/ocr/asset-to-tsv`, { recipeSlug, assetName });
   }
-
 }
diff --git a/frontend/api/class-interfaces/organizer-categories.ts b/frontend/lib/api/user/organizer-categories.ts
similarity index 76%
rename from frontend/api/class-interfaces/organizer-categories.ts
rename to frontend/lib/api/user/organizer-categories.ts
index be049750..758952f7 100644
--- a/frontend/api/class-interfaces/organizer-categories.ts
+++ b/frontend/lib/api/user/organizer-categories.ts
@@ -1,6 +1,6 @@
-import { BaseCRUDAPI } from "../_base";
-import { CategoryIn, RecipeCategoryResponse } from "~/types/api-types/recipe";
-import { config } from "~/api/config";
+import { BaseCRUDAPI } from "../base/base-clients";
+import { config } from "../config";
+import { CategoryIn, RecipeCategoryResponse } from "~/lib/api/types/recipe";
 
 const prefix = config.PREFIX + "/organizers";
 
diff --git a/frontend/api/class-interfaces/organizer-tags.ts b/frontend/lib/api/user/organizer-tags.ts
similarity index 74%
rename from frontend/api/class-interfaces/organizer-tags.ts
rename to frontend/lib/api/user/organizer-tags.ts
index 9d7366ea..eb6ef9ad 100644
--- a/frontend/api/class-interfaces/organizer-tags.ts
+++ b/frontend/lib/api/user/organizer-tags.ts
@@ -1,6 +1,6 @@
-import { BaseCRUDAPI } from "../_base";
-import { RecipeTagResponse, TagIn } from "~/types/api-types/recipe";
-import { config } from "~/api/config";
+import { BaseCRUDAPI } from "../base/base-clients";
+import { config } from "../config";
+import { RecipeTagResponse, TagIn } from "~/lib/api/types/recipe";
 
 const prefix = config.PREFIX + "/organizers";
 
diff --git a/frontend/api/class-interfaces/organizer-tools.ts b/frontend/lib/api/user/organizer-tools.ts
similarity index 82%
rename from frontend/api/class-interfaces/organizer-tools.ts
rename to frontend/lib/api/user/organizer-tools.ts
index 6dddcb9d..c3830984 100644
--- a/frontend/api/class-interfaces/organizer-tools.ts
+++ b/frontend/lib/api/user/organizer-tools.ts
@@ -1,7 +1,6 @@
-import { BaseCRUDAPI } from "../_base";
-import { RecipeTool, RecipeToolCreate, RecipeToolResponse } from "~/types/api-types/recipe";
-
-import { config } from "~/api/config";
+import { BaseCRUDAPI } from "../base/base-clients";
+import { config } from "../config";
+import { RecipeTool, RecipeToolCreate, RecipeToolResponse } from "~/lib/api/types/recipe";
 
 const prefix = config.PREFIX + "/organizers";
 
diff --git a/frontend/api/class-interfaces/recipe-bulk-actions.ts b/frontend/lib/api/user/recipe-bulk-actions.ts
similarity index 90%
rename from frontend/api/class-interfaces/recipe-bulk-actions.ts
rename to frontend/lib/api/user/recipe-bulk-actions.ts
index efe47d38..1f95d439 100644
--- a/frontend/api/class-interfaces/recipe-bulk-actions.ts
+++ b/frontend/lib/api/user/recipe-bulk-actions.ts
@@ -1,6 +1,6 @@
-import { BaseAPI } from "../_base";
-import { AssignCategories, AssignSettings, AssignTags, DeleteRecipes, ExportRecipes } from "~/types/api-types/recipe";
-import { GroupDataExport } from "~/types/api-types/group";
+import { BaseAPI } from "../base/base-clients";
+import { AssignCategories, AssignSettings, AssignTags, DeleteRecipes, ExportRecipes } from "~/lib/api/types/recipe";
+import { GroupDataExport } from "~/lib/api/types/group";
 
 // Many bulk actions return nothing
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
diff --git a/frontend/api/class-interfaces/recipe-foods.ts b/frontend/lib/api/user/recipe-foods.ts
similarity index 78%
rename from frontend/api/class-interfaces/recipe-foods.ts
rename to frontend/lib/api/user/recipe-foods.ts
index e7c15b5f..ec3f2608 100644
--- a/frontend/api/class-interfaces/recipe-foods.ts
+++ b/frontend/lib/api/user/recipe-foods.ts
@@ -1,5 +1,5 @@
-import { BaseCRUDAPI } from "../_base";
-import { CreateIngredientFood, IngredientFood } from "~/types/api-types/recipe";
+import { BaseCRUDAPI } from "../base/base-clients";
+import { CreateIngredientFood, IngredientFood } from "~/lib/api/types/recipe";
 
 const prefix = "/api";
 
diff --git a/frontend/api/class-interfaces/recipe-units.ts b/frontend/lib/api/user/recipe-units.ts
similarity index 78%
rename from frontend/api/class-interfaces/recipe-units.ts
rename to frontend/lib/api/user/recipe-units.ts
index e43cc404..be8228a4 100644
--- a/frontend/api/class-interfaces/recipe-units.ts
+++ b/frontend/lib/api/user/recipe-units.ts
@@ -1,5 +1,5 @@
-import { BaseCRUDAPI } from "../_base";
-import { CreateIngredientUnit, IngredientUnit } from "~/types/api-types/recipe";
+import { BaseCRUDAPI } from "../base/base-clients";
+import { CreateIngredientUnit, IngredientUnit } from "~/lib/api/types/recipe";
 
 const prefix = "/api";
 
diff --git a/frontend/api/class-interfaces/recipes/index.ts b/frontend/lib/api/user/recipes/index.ts
similarity index 100%
rename from frontend/api/class-interfaces/recipes/index.ts
rename to frontend/lib/api/user/recipes/index.ts
diff --git a/frontend/api/class-interfaces/recipes/recipe-comments.ts b/frontend/lib/api/user/recipes/recipe-comments.ts
similarity index 85%
rename from frontend/api/class-interfaces/recipes/recipe-comments.ts
rename to frontend/lib/api/user/recipes/recipe-comments.ts
index 8c9a86a8..6d9122dc 100644
--- a/frontend/api/class-interfaces/recipes/recipe-comments.ts
+++ b/frontend/lib/api/user/recipes/recipe-comments.ts
@@ -1,5 +1,5 @@
-import { BaseCRUDAPI } from "~/api/_base";
-import { RecipeCommentCreate, RecipeCommentOut, RecipeCommentUpdate } from "~/types/api-types/recipe";
+import { BaseCRUDAPI } from "../../base/base-clients";
+import { RecipeCommentCreate, RecipeCommentOut, RecipeCommentUpdate } from "~/lib/api/types/recipe";
 
 const prefix = "/api";
 
diff --git a/frontend/api/class-interfaces/recipes/recipe-share.ts b/frontend/lib/api/user/recipes/recipe-share.ts
similarity index 70%
rename from frontend/api/class-interfaces/recipes/recipe-share.ts
rename to frontend/lib/api/user/recipes/recipe-share.ts
index 01f68654..437078a5 100644
--- a/frontend/api/class-interfaces/recipes/recipe-share.ts
+++ b/frontend/lib/api/user/recipes/recipe-share.ts
@@ -1,5 +1,5 @@
-import { BaseCRUDAPI } from "~/api/_base";
-import { RecipeShareToken, RecipeShareTokenCreate } from "~/types/api-types/recipe";
+import { BaseCRUDAPI } from "../../base/base-clients";
+import { RecipeShareToken, RecipeShareTokenCreate } from "~/lib/api/types/recipe";
 
 const prefix = "/api";
 
diff --git a/frontend/api/class-interfaces/recipes/recipe.ts b/frontend/lib/api/user/recipes/recipe.ts
similarity index 96%
rename from frontend/api/class-interfaces/recipes/recipe.ts
rename to frontend/lib/api/user/recipes/recipe.ts
index 9cbb9770..e3d2da4a 100644
--- a/frontend/api/class-interfaces/recipes/recipe.ts
+++ b/frontend/lib/api/user/recipes/recipe.ts
@@ -1,6 +1,6 @@
+import { BaseCRUDAPI } from "../../base/base-clients";
 import { CommentsApi } from "./recipe-comments";
 import { RecipeShareApi } from "./recipe-share";
-import { BaseCRUDAPI } from "~/api/_base";
 
 import {
   Recipe,
@@ -10,8 +10,8 @@ import {
   ParsedIngredient,
   UpdateImageResponse,
   RecipeZipTokenResponse,
-} from "~/types/api-types/recipe";
-import { ApiRequestInstance } from "~/types/api";
+} from "~/lib/api/types/recipe";
+import { ApiRequestInstance } from "~/lib/api/types/non-generated";
 
 export type Parser = "nlp" | "brute";
 
diff --git a/frontend/api/class-interfaces/upload.ts b/frontend/lib/api/user/upload.ts
similarity index 75%
rename from frontend/api/class-interfaces/upload.ts
rename to frontend/lib/api/user/upload.ts
index 93649110..d5e87302 100644
--- a/frontend/api/class-interfaces/upload.ts
+++ b/frontend/lib/api/user/upload.ts
@@ -1,4 +1,4 @@
-import { BaseAPI } from "../_base";
+import { BaseAPI } from "../base/base-clients";
 
 export class UploadFile extends BaseAPI {
   file(url: string, fileObject: any) {
diff --git a/frontend/api/class-interfaces/user-registration.ts b/frontend/lib/api/user/user-registration.ts
similarity index 74%
rename from frontend/api/class-interfaces/user-registration.ts
rename to frontend/lib/api/user/user-registration.ts
index fc99658e..ea722c5f 100644
--- a/frontend/api/class-interfaces/user-registration.ts
+++ b/frontend/lib/api/user/user-registration.ts
@@ -1,5 +1,5 @@
-import { BaseAPI } from "../_base";
-import { CreateUserRegistration } from "~/types/api-types/user";
+import { BaseAPI } from "../base/base-clients";
+import { CreateUserRegistration } from "~/lib/api/types/user";
 
 const prefix = "/api";
 
diff --git a/frontend/api/class-interfaces/users.ts b/frontend/lib/api/user/users.ts
similarity index 96%
rename from frontend/api/class-interfaces/users.ts
rename to frontend/lib/api/user/users.ts
index df5a89e4..1ad4562c 100644
--- a/frontend/api/class-interfaces/users.ts
+++ b/frontend/lib/api/user/users.ts
@@ -1,4 +1,4 @@
-import { BaseCRUDAPI } from "../_base";
+import { BaseCRUDAPI } from "../base/base-clients";
 import {
   ChangePassword,
   DeleteTokenResponse,
@@ -9,7 +9,7 @@ import {
   UserFavorites,
   UserIn,
   UserOut,
-} from "~/types/api-types/user";
+} from "~/lib/api/types/user";
 
 const prefix = "/api";
 
diff --git a/frontend/api/class-interfaces/utils.ts b/frontend/lib/api/user/utils.ts
similarity index 78%
rename from frontend/api/class-interfaces/utils.ts
rename to frontend/lib/api/user/utils.ts
index 882da79f..cca69ecf 100644
--- a/frontend/api/class-interfaces/utils.ts
+++ b/frontend/lib/api/user/utils.ts
@@ -1,5 +1,5 @@
-import { BaseAPI } from "../_base";
-import { FileTokenResponse } from "~/types/api-types/response";
+import { BaseAPI } from "../base/base-clients";
+import { FileTokenResponse } from "~/lib/api/types/response";
 
 const prefix = "/api";
 
diff --git a/frontend/lib/icons/icon-type.ts b/frontend/lib/icons/icon-type.ts
new file mode 100644
index 00000000..c85214f5
--- /dev/null
+++ b/frontend/lib/icons/icon-type.ts
@@ -0,0 +1,3 @@
+import { icons } from "./icons";
+
+export type Icon = typeof icons;
diff --git a/frontend/utils/icons/icons.ts b/frontend/lib/icons/icons.ts
similarity index 100%
rename from frontend/utils/icons/icons.ts
rename to frontend/lib/icons/icons.ts
diff --git a/frontend/utils/icons/index.ts b/frontend/lib/icons/index.ts
similarity index 100%
rename from frontend/utils/icons/index.ts
rename to frontend/lib/icons/index.ts
diff --git a/frontend/lib/validators/index.ts b/frontend/lib/validators/index.ts
new file mode 100644
index 00000000..f384f9c2
--- /dev/null
+++ b/frontend/lib/validators/index.ts
@@ -0,0 +1,2 @@
+export { scorePassword } from "./password";
+export { required, email, whitespace, url, minLength, maxLength } from "./inputs";
diff --git a/frontend/lib/validators/inputs.test.ts b/frontend/lib/validators/inputs.test.ts
new file mode 100644
index 00000000..7bb0f351
--- /dev/null
+++ b/frontend/lib/validators/inputs.test.ts
@@ -0,0 +1,70 @@
+import { expect, test } from "vitest";
+import { required, email, whitespace, url, minLength, maxLength } from "./inputs";
+export { scorePassword } from "./password";
+
+test("validator required", () => {
+  const falsey = "This Field is Required";
+  expect(required("123")).toBe(true);
+  expect(required("")).toBe(falsey);
+  expect(required(undefined)).toBe(falsey);
+  expect(required(null)).toBe(falsey);
+});
+
+const nulls = [undefined, null];
+
+test("validator email", () => {
+  const falsey = "Email Must Be Valid";
+  expect(email("123")).toBe(falsey);
+  expect(email("email@example.com")).toBe(true);
+
+  for (const n of nulls) {
+    expect(email(n)).toBe(falsey);
+  }
+});
+
+test("whitespace", () => {
+  const falsey = "No Whitespace Allowed";
+  expect(whitespace("123")).toBe(true);
+  expect(whitespace(" ")).toBe(falsey);
+  expect(whitespace("123 123")).toBe(falsey);
+
+  for (const n of nulls) {
+    expect(whitespace(n)).toBe(falsey);
+  }
+});
+
+test("url", () => {
+  const falsey = "Must Be A Valid URL";
+  expect(url("https://example.com")).toBe(true);
+  expect(url("")).toBe(falsey);
+
+  for (const n of nulls) {
+    expect(url(n)).toBe(falsey);
+  }
+});
+
+test("minLength", () => {
+  const min = 3;
+  const falsey = `Must Be At Least ${min} Characters`;
+  const fn = minLength(min);
+  expect(fn("123")).toBe(true);
+  expect(fn("12")).toBe(falsey);
+  expect(fn("")).toBe(falsey);
+
+  for (const n of nulls) {
+    expect(fn(n)).toBe(falsey);
+  }
+});
+
+test("maxLength", () => {
+  const max = 3;
+  const falsey = `Must Be At Most ${max} Characters`;
+  const fn = maxLength(max);
+  expect(fn("123")).toBe(true);
+  expect(fn("1234")).toBe(falsey);
+  expect(fn("")).toBe(true);
+
+  for (const n of nulls) {
+    expect(fn(n)).toBe(true);
+  }
+});
diff --git a/frontend/lib/validators/inputs.ts b/frontend/lib/validators/inputs.ts
new file mode 100644
index 00000000..44bdfd40
--- /dev/null
+++ b/frontend/lib/validators/inputs.ts
@@ -0,0 +1,28 @@
+const EMAIL_REGEX =
+  /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@(([[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+
+const URL_REGEX = /[-a-zA-Z0-9@:%._+~#=]{1,256}.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&//=]*)/;
+
+export function required(v: string | undefined | null) {
+  return !!v || "This Field is Required";
+}
+
+export function email(v: string | undefined | null) {
+  return (!!v && EMAIL_REGEX.test(v)) || "Email Must Be Valid";
+}
+
+export function whitespace(v: string | null | undefined) {
+  return (!!v && v.split(" ").length <= 1) || "No Whitespace Allowed";
+}
+
+export function url(v: string | undefined | null) {
+  return (!!v && URL_REGEX.test(v)) || "Must Be A Valid URL";
+}
+
+export function minLength(min: number) {
+  return (v: string | undefined | null) => (!!v && v.length >= min) || `Must Be At Least ${min} Characters`;
+}
+
+export function maxLength(max: number) {
+  return (v: string | undefined | null) => !v || v.length <= max || `Must Be At Most ${max} Characters`;
+}
diff --git a/frontend/lib/validators/password.test.ts b/frontend/lib/validators/password.test.ts
new file mode 100644
index 00000000..cbe97b74
--- /dev/null
+++ b/frontend/lib/validators/password.test.ts
@@ -0,0 +1,30 @@
+import { describe, test, expect } from "vitest";
+import { scorePassword } from "./password";
+
+describe("scorePassword tests", () => {
+  test("flagged words should return negative number", () => {
+    const flaggedWords = ["password", "mealie", "admin", "qwerty", "login"];
+
+    for (const word of flaggedWords) {
+      expect(scorePassword(word)).toBe(0);
+    }
+  });
+
+  test("should return 0 for empty string", () => {
+    expect(scorePassword("")).toBe(0);
+  });
+
+  test("should return 0 for strings less than 6", () => {
+    expect(scorePassword("12345")).toBe(0);
+  });
+
+  test("should return positive number for long string", () => {
+    const result = expect(scorePassword("123456"));
+    result.toBeGreaterThan(0);
+    result.toBeLessThan(31);
+  });
+
+  test("should return max number for long string with all variations", () => {
+    expect(scorePassword("3bYWcfYOwqxljqeOmQXTLlBwkrH6HV")).toBe(100);
+  });
+});
diff --git a/frontend/lib/validators/password.ts b/frontend/lib/validators/password.ts
new file mode 100644
index 00000000..4df584f6
--- /dev/null
+++ b/frontend/lib/validators/password.ts
@@ -0,0 +1,45 @@
+const flaggedWords = ["password", "mealie", "admin", "qwerty", "login"];
+
+/**
+ * scorePassword returns a score for a given password between 0 and 100.
+ * if a password contains a flagged word, it returns 0.
+ * @param pass
+ * @returns
+ */
+export function scorePassword(pass: string): number {
+  let score = 0;
+  if (!pass) return score;
+
+  if (pass.length < 6) return score;
+
+  // Check for flagged words
+  for (const word of flaggedWords) {
+    if (pass.toLowerCase().includes(word)) {
+      return 0;
+    }
+  }
+
+  // award every unique letter until 5 repetitions
+  const letters: { [key: string]: number } = {};
+
+  for (let i = 0; i < pass.length; i++) {
+    letters[pass[i]] = (letters[pass[i]] || 0) + 1;
+    score += 5.0 / letters[pass[i]];
+  }
+
+  // bonus points for mixing it up
+  const variations: { [key: string]: boolean } = {
+    digits: /\d/.test(pass),
+    lower: /[a-z]/.test(pass),
+    upper: /[A-Z]/.test(pass),
+    nonWords: /\W/.test(pass),
+  };
+
+  let variationCount = 0;
+  for (const check in variations) {
+    variationCount += variations[check] === true ? 1 : 0;
+  }
+  score += (variationCount - 1) * 10;
+
+  return Math.max(Math.min(score, 100), 0);
+}
diff --git a/frontend/package.json b/frontend/package.json
index eddd0ce2..7978edef 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -8,7 +8,9 @@
     "start": "nuxt start",
     "generate": "nuxt generate",
     "lint:js": "eslint --ext \".ts,.js,.vue\" --ignore-path .gitignore .",
-    "lint": "yarn lint:js"
+    "lint": "yarn lint:js",
+    "test": "vitest",
+    "test:ci": "vitest --watch=false"
   },
   "lint-staged": {
     "*.{ts,js,vue}": "eslint"
@@ -51,6 +53,7 @@
     "lint-staged": "^13.0.3",
     "nuxt-vite": "0.2.3",
     "prettier": "^2.7.1",
+    "vitest": "^0.24.3",
     "vue2-script-setup-transform": "^0.3.5"
   }
 }
diff --git a/frontend/pages/admin/analytics.vue b/frontend/pages/admin/analytics.vue
index 62327776..44dc2267 100644
--- a/frontend/pages/admin/analytics.vue
+++ b/frontend/pages/admin/analytics.vue
@@ -43,7 +43,7 @@
 import { defineComponent, reactive, useAsync } from "@nuxtjs/composition-api";
 import { useAdminApi } from "~/composables/api";
 import { useAsyncKey } from "~/composables/use-utils";
-import { MealieAnalytics } from "~/types/api-types/analytics";
+import { MealieAnalytics } from "~/lib/api/types/analytics";
 
 type DisplayData = {
   text: string;
diff --git a/frontend/pages/admin/background-tasks.vue b/frontend/pages/admin/background-tasks.vue
index 07b58e35..9005bb98 100644
--- a/frontend/pages/admin/background-tasks.vue
+++ b/frontend/pages/admin/background-tasks.vue
@@ -41,7 +41,7 @@
 
 <script lang="ts">
 import { defineComponent, onMounted, ref } from "@nuxtjs/composition-api";
-import { ServerTask } from "~/types/api-types/server";
+import { ServerTask } from "~/lib/api/types/server";
 import { useAdminApi } from "~/composables/api";
 
 export default defineComponent({
diff --git a/frontend/pages/admin/backups.vue b/frontend/pages/admin/backups.vue
index 006b6bef..2f309c15 100644
--- a/frontend/pages/admin/backups.vue
+++ b/frontend/pages/admin/backups.vue
@@ -117,7 +117,7 @@
 import { defineComponent, reactive, ref, toRefs, useContext } from "@nuxtjs/composition-api";
 import { onMounted } from "vue-demi";
 import { useAdminApi } from "~/composables/api";
-import { AllBackups } from "~/types/api-types/admin";
+import { AllBackups } from "~/lib/api/types/admin";
 
 export default defineComponent({
   layout: "admin",
diff --git a/frontend/pages/admin/maintenance/index.vue b/frontend/pages/admin/maintenance/index.vue
index a5470f64..de3b7c6f 100644
--- a/frontend/pages/admin/maintenance/index.vue
+++ b/frontend/pages/admin/maintenance/index.vue
@@ -75,7 +75,7 @@
 <script lang="ts">
 import { computed, ref, defineComponent, reactive } from "@nuxtjs/composition-api";
 import { useAdminApi } from "~/composables/api";
-import { MaintenanceStorageDetails, MaintenanceSummary } from "~/types/api-types/admin";
+import { MaintenanceStorageDetails, MaintenanceSummary } from "~/lib/api/types/admin";
 
 export default defineComponent({
   layout: "admin",
diff --git a/frontend/pages/admin/manage/groups/_id.vue b/frontend/pages/admin/manage/groups/_id.vue
index 9589aa04..ba44579f 100644
--- a/frontend/pages/admin/manage/groups/_id.vue
+++ b/frontend/pages/admin/manage/groups/_id.vue
@@ -28,7 +28,7 @@ import { defineComponent, useRoute, onMounted, ref } from "@nuxtjs/composition-a
 import GroupPreferencesEditor from "~/components/Domain/Group/GroupPreferencesEditor.vue";
 import { useAdminApi } from "~/composables/api";
 import { alert } from "~/composables/use-toast";
-import { GroupInDB } from "~/types/api-types/user";
+import { GroupInDB } from "~/lib/api/types/user";
 import { VForm } from "~/types/vuetify";
 
 export default defineComponent({
diff --git a/frontend/pages/admin/manage/groups/index.vue b/frontend/pages/admin/manage/groups/index.vue
index 202abb08..04cc7cd9 100644
--- a/frontend/pages/admin/manage/groups/index.vue
+++ b/frontend/pages/admin/manage/groups/index.vue
@@ -73,7 +73,7 @@
 import { defineComponent, reactive, toRefs, useContext, useRouter } from "@nuxtjs/composition-api";
 import { fieldTypes } from "~/composables/forms";
 import { useGroups } from "~/composables/use-groups";
-import { GroupInDB } from "~/types/api-types/user";
+import { GroupInDB } from "~/lib/api/types/user";
 
 export default defineComponent({
   layout: "admin",
diff --git a/frontend/pages/admin/manage/users/_id.vue b/frontend/pages/admin/manage/users/_id.vue
index f6e9a313..331065ba 100644
--- a/frontend/pages/admin/manage/users/_id.vue
+++ b/frontend/pages/admin/manage/users/_id.vue
@@ -45,7 +45,7 @@ import { alert } from "~/composables/use-toast";
 import { useUserForm } from "~/composables/use-users";
 import { validators } from "~/composables/use-validators";
 import { VForm } from "~/types/vuetify";
-import { UserOut } from "~/types/api-types/user";
+import { UserOut } from "~/lib/api/types/user";
 
 export default defineComponent({
   layout: "admin",
diff --git a/frontend/pages/admin/manage/users/index.vue b/frontend/pages/admin/manage/users/index.vue
index a24a3dc3..28dbf21d 100644
--- a/frontend/pages/admin/manage/users/index.vue
+++ b/frontend/pages/admin/manage/users/index.vue
@@ -69,7 +69,7 @@ import { defineComponent, reactive, ref, toRefs, useContext, useRouter } from "@
 import { useAdminApi } from "~/composables/api";
 import { alert } from "~/composables/use-toast";
 import { useUser, useAllUsers } from "~/composables/use-user";
-import { UserOut } from "~/types/api-types/user";
+import { UserOut } from "~/lib/api/types/user";
 
 export default defineComponent({
   layout: "admin",
diff --git a/frontend/pages/admin/parser.vue b/frontend/pages/admin/parser.vue
index 5517320f..9b126b49 100644
--- a/frontend/pages/admin/parser.vue
+++ b/frontend/pages/admin/parser.vue
@@ -68,9 +68,9 @@
 
 <script lang="ts">
 import { defineComponent, reactive, ref, toRefs } from "@nuxtjs/composition-api";
-import { Parser } from "~/api/class-interfaces/recipes/recipe";
-import { IngredientConfidence } from "~/types/api-types/recipe";
+import { IngredientConfidence } from "~/lib/api/types/recipe";
 import { useUserApi } from "~/composables/api";
+import { Parser } from "~/lib/api/user/recipes/recipe";
 
 type ConfidenceAttribute = "average" | "comment" | "name" | "unit" | "quantity" | "food";
 
@@ -90,8 +90,7 @@ export default defineComponent({
 
     function getColor(attribute: ConfidenceAttribute) {
       const percentage = getConfidence(attribute);
-      if (percentage === undefined)
-        return;
+      if (percentage === undefined) return;
 
       const p_as_num = parseFloat(percentage.replace("%", ""));
 
@@ -142,8 +141,7 @@ export default defineComponent({
       if (data) {
         state.results = true;
 
-        if (data.confidence)
-          confidence.value = data.confidence;
+        if (data.confidence) confidence.value = data.confidence;
 
         // TODO: Remove ts-ignore
         // ts-ignore because data will likely change significantly once I figure out how to return results
@@ -153,7 +151,7 @@ export default defineComponent({
         properties.unit.value = data.ingredient?.unit?.name || "";
         properties.food.value = data.ingredient?.food?.name || "";
 
-        (["comment", "quantity", "unit", "food"] as ConfidenceAttribute[]).forEach(property => {
+        (["comment", "quantity", "unit", "food"] as ConfidenceAttribute[]).forEach((property) => {
           const color = getColor(property);
           const confidence = getConfidence(property);
           if (color) {
@@ -218,5 +216,4 @@ export default defineComponent({
 });
 </script>
 
-<style scoped>
-</style>
+<style scoped></style>
diff --git a/frontend/pages/admin/site-settings.vue b/frontend/pages/admin/site-settings.vue
index cc2b0c57..0d61adf5 100644
--- a/frontend/pages/admin/site-settings.vue
+++ b/frontend/pages/admin/site-settings.vue
@@ -179,7 +179,7 @@ import {
 import { useAdminApi, useUserApi } from "~/composables/api";
 import { validators } from "~/composables/use-validators";
 import { useAsyncKey } from "~/composables/use-utils";
-import { CheckAppConfig } from "~/types/api-types/admin";
+import { CheckAppConfig } from "~/lib/api/types/admin";
 
 enum DockerVolumeState {
   Unknown = "unknown",
@@ -259,7 +259,7 @@ export default defineComponent({
       const { data } = await adminApi.about.checkApp();
 
       if (data) {
-        appConfig.value = { ...data, isSiteSecure: false};
+        appConfig.value = { ...data, isSiteSecure: false };
       }
 
       appConfig.value.isSiteSecure = isLocalHostOrHttps();
diff --git a/frontend/pages/group/data/foods.vue b/frontend/pages/group/data/foods.vue
index 5dd8e510..f9d07800 100644
--- a/frontend/pages/group/data/foods.vue
+++ b/frontend/pages/group/data/foods.vue
@@ -159,7 +159,7 @@ import { computed } from "vue-demi";
 import type { LocaleObject } from "@nuxtjs/i18n";
 import { validators } from "~/composables/use-validators";
 import { useUserApi } from "~/composables/api";
-import { CreateIngredientFood, IngredientFood } from "~/types/api-types/recipe";
+import { CreateIngredientFood, IngredientFood } from "~/lib/api/types/recipe";
 import MultiPurposeLabel from "~/components/Domain/ShoppingList/MultiPurposeLabel.vue";
 import { useLocales } from "~/composables/use-locales";
 import { useFoodStore, useLabelStore } from "~/composables/store";
diff --git a/frontend/pages/group/data/labels.vue b/frontend/pages/group/data/labels.vue
index e0990682..61423a09 100644
--- a/frontend/pages/group/data/labels.vue
+++ b/frontend/pages/group/data/labels.vue
@@ -116,7 +116,7 @@ import type { LocaleObject } from "@nuxtjs/i18n";
 import { validators } from "~/composables/use-validators";
 import { useUserApi } from "~/composables/api";
 import MultiPurposeLabel from "~/components/Domain/ShoppingList/MultiPurposeLabel.vue";
-import { MultiPurposeLabelSummary } from "~/types/api-types/labels";
+import { MultiPurposeLabelSummary } from "~/lib/api/types/labels";
 import { useLocales } from "~/composables/use-locales";
 import { useLabelData, useLabelStore } from "~/composables/store";
 
diff --git a/frontend/pages/group/data/recipes.vue b/frontend/pages/group/data/recipes.vue
index 1163422c..de05c439 100644
--- a/frontend/pages/group/data/recipes.vue
+++ b/frontend/pages/group/data/recipes.vue
@@ -162,9 +162,9 @@ import RecipeDataTable from "~/components/Domain/Recipe/RecipeDataTable.vue";
 import RecipeOrganizerSelector from "~/components/Domain/Recipe/RecipeOrganizerSelector.vue";
 import { useUserApi } from "~/composables/api";
 import { useRecipes, allRecipes } from "~/composables/recipes";
-import { Recipe, RecipeSettings } from "~/types/api-types/recipe";
+import { Recipe, RecipeSettings } from "~/lib/api/types/recipe";
 import GroupExportData from "~/components/Domain/Group/GroupExportData.vue";
-import { GroupDataExport } from "~/types/api-types/group";
+import { GroupDataExport } from "~/lib/api/types/group";
 import { MenuItem } from "~/components/global/BaseOverflowButton.vue";
 import RecipeSettingsSwitches from "~/components/Domain/Recipe/RecipeSettingsSwitches.vue";
 
diff --git a/frontend/pages/group/data/units.vue b/frontend/pages/group/data/units.vue
index 5626bd33..96a23b42 100644
--- a/frontend/pages/group/data/units.vue
+++ b/frontend/pages/group/data/units.vue
@@ -159,7 +159,7 @@ import { computed, defineComponent, onMounted, ref } from "@nuxtjs/composition-a
 import type { LocaleObject } from "@nuxtjs/i18n";
 import { validators } from "~/composables/use-validators";
 import { useUserApi } from "~/composables/api";
-import { CreateIngredientUnit, IngredientUnit } from "~/types/api-types/recipe";
+import { CreateIngredientUnit, IngredientUnit } from "~/lib/api/types/recipe";
 import { useLocales } from "~/composables/use-locales";
 import { useUnitStore } from "~/composables/store";
 import { VForm } from "~/types/vuetify";
diff --git a/frontend/pages/group/mealplan/planner.vue b/frontend/pages/group/mealplan/planner.vue
index 6ef697dd..67500c18 100644
--- a/frontend/pages/group/mealplan/planner.vue
+++ b/frontend/pages/group/mealplan/planner.vue
@@ -271,7 +271,7 @@ import { useRecipes, allRecipes } from "~/composables/recipes";
 import RecipeCardImage from "~/components/Domain/Recipe/RecipeCardImage.vue";
 import RecipeCard from "~/components/Domain/Recipe/RecipeCard.vue";
 import RecipeContextMenu from "~/components/Domain/Recipe/RecipeContextMenu.vue";
-import { PlanEntryType } from "~/types/api-types/meal-plan";
+import { PlanEntryType } from "~/lib/api/types/meal-plan";
 import { useUserApi } from "~/composables/api";
 
 export default defineComponent({
diff --git a/frontend/pages/group/mealplan/settings.vue b/frontend/pages/group/mealplan/settings.vue
index 430612ed..cfa9c90f 100644
--- a/frontend/pages/group/mealplan/settings.vue
+++ b/frontend/pages/group/mealplan/settings.vue
@@ -93,7 +93,7 @@
 <script lang="ts">
 import { defineComponent, ref, useAsync } from "@nuxtjs/composition-api";
 import { useUserApi } from "~/composables/api";
-import { PlanRulesCreate, PlanRulesOut } from "~/types/api-types/meal-plan";
+import { PlanRulesCreate, PlanRulesOut } from "~/lib/api/types/meal-plan";
 import GroupMealPlanRuleForm from "~/components/Domain/Group/GroupMealPlanRuleForm.vue";
 import { useAsyncKey } from "~/composables/use-utils";
 import RecipeChips from "~/components/Domain/Recipe/RecipeChips.vue";
diff --git a/frontend/pages/group/members.vue b/frontend/pages/group/members.vue
index 6ec2841d..073a8e7f 100644
--- a/frontend/pages/group/members.vue
+++ b/frontend/pages/group/members.vue
@@ -66,7 +66,7 @@
 <script lang="ts">
 import { defineComponent, ref, onMounted, useContext } from "@nuxtjs/composition-api";
 import { useUserApi } from "~/composables/api";
-import { UserOut } from "~/types/api-types/user";
+import { UserOut } from "~/lib/api/types/user";
 import UserAvatar from "~/components/Domain/User/UserAvatar.vue";
 
 export default defineComponent({
diff --git a/frontend/pages/group/migrations.vue b/frontend/pages/group/migrations.vue
index ac580099..2394ab5c 100644
--- a/frontend/pages/group/migrations.vue
+++ b/frontend/pages/group/migrations.vue
@@ -66,10 +66,10 @@
 
 <script lang="ts">
 import { defineComponent, reactive, toRefs, useContext, computed, onMounted } from "@nuxtjs/composition-api";
-import { ReportSummary } from "~/types/api-types/reports";
+import { ReportSummary } from "~/lib/api/types/reports";
 import { MenuItem } from "~/components/global/BaseOverflowButton.vue";
 import { useUserApi } from "~/composables/api";
-import { SupportedMigrations } from "~/types/api-types/group";
+import { SupportedMigrations } from "~/lib/api/types/group";
 
 const MIGRATIONS = {
   nextcloud: "nextcloud",
@@ -302,5 +302,4 @@ export default defineComponent({
 });
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/frontend/pages/group/notifiers.vue b/frontend/pages/group/notifiers.vue
index 14ab22ae..f5e532b1 100644
--- a/frontend/pages/group/notifiers.vue
+++ b/frontend/pages/group/notifiers.vue
@@ -106,7 +106,7 @@
 import { defineComponent, useAsync, reactive, useContext, toRefs } from "@nuxtjs/composition-api";
 import { useUserApi } from "~/composables/api";
 import { useAsyncKey } from "~/composables/use-utils";
-import { GroupEventNotifierCreate, GroupEventNotifierOut } from "~/types/api-types/group";
+import { GroupEventNotifierCreate, GroupEventNotifierOut } from "~/lib/api/types/group";
 
 interface OptionKey {
   text: string;
diff --git a/frontend/pages/group/reports/_id.vue b/frontend/pages/group/reports/_id.vue
index 6624791e..5724b3ac 100644
--- a/frontend/pages/group/reports/_id.vue
+++ b/frontend/pages/group/reports/_id.vue
@@ -31,7 +31,7 @@
 <script lang="ts">
 import { defineComponent, useRoute, ref, onMounted } from "@nuxtjs/composition-api";
 import { useUserApi } from "~/composables/api";
-import { ReportOut } from "~/types/api-types/reports";
+import { ReportOut } from "~/lib/api/types/reports";
 
 export default defineComponent({
   setup() {
diff --git a/frontend/pages/recipe/_slug/ingredient-parser.vue b/frontend/pages/recipe/_slug/ingredient-parser.vue
index 15a40b57..f47bfcb3 100644
--- a/frontend/pages/recipe/_slug/ingredient-parser.vue
+++ b/frontend/pages/recipe/_slug/ingredient-parser.vue
@@ -88,19 +88,19 @@
 <script lang="ts">
 import { defineComponent, ref, useRoute, useRouter } from "@nuxtjs/composition-api";
 import { invoke, until } from "@vueuse/core";
-import { Parser } from "~/api/class-interfaces/recipes/recipe";
 import {
   CreateIngredientFood,
   CreateIngredientUnit,
   IngredientFood,
   IngredientUnit,
   ParsedIngredient,
-} from "~/types/api-types/recipe";
+} from "~/lib/api/types/recipe";
 import RecipeIngredientEditor from "~/components/Domain/Recipe/RecipeIngredientEditor.vue";
 import { useUserApi } from "~/composables/api";
 import { useRecipe } from "~/composables/recipes";
-import { RecipeIngredient } from "~/types/api-types/admin";
+import { RecipeIngredient } from "~/lib/api/types/admin";
 import { useFoodData, useFoodStore, useUnitStore } from "~/composables/store";
+import { Parser } from "~/lib/api/user/recipes/recipe";
 
 interface Error {
   ingredientIndex: number;
diff --git a/frontend/pages/recipe/_slug/old.vue b/frontend/pages/recipe/_slug/old.vue
index de771785..eeca3406 100644
--- a/frontend/pages/recipe/_slug/old.vue
+++ b/frontend/pages/recipe/_slug/old.vue
@@ -488,7 +488,7 @@ import RecipeIngredientEditor from "~/components/Domain/Recipe/RecipeIngredientE
 import RecipePrintView from "~/components/Domain/Recipe/RecipePrintView.vue";
 import RecipeTools from "~/components/Domain/Recipe/RecipeTools.vue";
 import RecipeComments from "~/components/Domain/Recipe/RecipeComments.vue";
-import { Recipe } from "~/types/api-types/recipe";
+import { Recipe } from "~/lib/api/types/recipe";
 import { uuid4, deepCopy } from "~/composables/use-utils";
 import { useRouteQuery } from "~/composables/use-router";
 import { useToolStore } from "~/composables/store";
diff --git a/frontend/pages/recipe/create/bulk.vue b/frontend/pages/recipe/create/bulk.vue
index 4877973b..f861de7b 100644
--- a/frontend/pages/recipe/create/bulk.vue
+++ b/frontend/pages/recipe/create/bulk.vue
@@ -107,7 +107,7 @@ import { whenever } from "@vueuse/shared";
 import { useUserApi } from "~/composables/api";
 import { alert } from "~/composables/use-toast";
 import RecipeOrganizerSelector from "~/components/Domain/Recipe/RecipeOrganizerSelector.vue";
-import { ReportSummary } from "~/types/api-types/reports";
+import { ReportSummary } from "~/lib/api/types/reports";
 import RecipeDialogBulkAdd from "~/components/Domain/Recipe/RecipeDialogBulkAdd.vue";
 
 export default defineComponent({
diff --git a/frontend/pages/recipe/create/debug.vue b/frontend/pages/recipe/create/debug.vue
index cb472ea4..22f26626 100644
--- a/frontend/pages/recipe/create/debug.vue
+++ b/frontend/pages/recipe/create/debug.vue
@@ -55,7 +55,7 @@
 import { defineComponent, reactive, toRefs, ref, useRouter, computed, useRoute } from "@nuxtjs/composition-api";
 import { useUserApi } from "~/composables/api";
 import { validators } from "~/composables/use-validators";
-import { Recipe } from "~/types/api-types/recipe";
+import { Recipe } from "~/lib/api/types/recipe";
 
 export default defineComponent({
   setup() {
diff --git a/frontend/pages/register/register.vue b/frontend/pages/register/register.vue
index 0da44a30..b852b44c 100644
--- a/frontend/pages/register/register.vue
+++ b/frontend/pages/register/register.vue
@@ -262,7 +262,7 @@ import { useRouteQuery } from "~/composables/use-router";
 import { validators, useAsyncValidator } from "~/composables/use-validators";
 import { useUserApi } from "~/composables/api";
 import { alert } from "~/composables/use-toast";
-import { CreateUserRegistration } from "~/types/api-types/user";
+import { CreateUserRegistration } from "~/lib/api/types/user";
 import { VForm } from "~/types/vuetify";
 import { usePasswordField } from "~/composables/use-passwords";
 import { usePublicApi } from "~/composables/api/api-client";
diff --git a/frontend/pages/search.vue b/frontend/pages/search.vue
index e9ff691e..3fe9bdb6 100644
--- a/frontend/pages/search.vue
+++ b/frontend/pages/search.vue
@@ -117,9 +117,9 @@ import RecipeSearchFilterSelector from "~/components/Domain/Recipe/RecipeSearchF
 import RecipeOrganizerSelector from "~/components/Domain/Recipe/RecipeOrganizerSelector.vue";
 import RecipeCardSection from "~/components/Domain/Recipe/RecipeCardSection.vue";
 import { useRecipes, allRecipes } from "~/composables/recipes";
-import { RecipeSummary } from "~/types/api-types/recipe";
+import { RecipeSummary } from "~/lib/api/types/recipe";
 import { useRouteQuery } from "~/composables/use-router";
-import { RecipeTag } from "~/types/api-types/user";
+import { RecipeTag } from "~/lib/api/types/user";
 import { useFoodStore } from "~/composables/store";
 
 interface GenericFilter {
diff --git a/frontend/pages/shopping-lists/_id.vue b/frontend/pages/shopping-lists/_id.vue
index d1cb4d8d..01725689 100644
--- a/frontend/pages/shopping-lists/_id.vue
+++ b/frontend/pages/shopping-lists/_id.vue
@@ -193,7 +193,7 @@ import { useCopyList } from "~/composables/use-copy";
 import { useUserApi } from "~/composables/api";
 import { useAsyncKey } from "~/composables/use-utils";
 import ShoppingListItem from "~/components/Domain/ShoppingList/ShoppingListItem.vue";
-import { ShoppingListItemCreate, ShoppingListItemOut } from "~/types/api-types/group";
+import { ShoppingListItemCreate, ShoppingListItemOut } from "~/lib/api/types/group";
 import RecipeList from "~/components/Domain/Recipe/RecipeList.vue";
 import ShoppingListItemEditor from "~/components/Domain/ShoppingList/ShoppingListItemEditor.vue";
 import { getDisplayText } from "~/composables/use-display-text";
diff --git a/frontend/pages/user/profile/edit.vue b/frontend/pages/user/profile/edit.vue
index 97aa48c5..99168b39 100644
--- a/frontend/pages/user/profile/edit.vue
+++ b/frontend/pages/user/profile/edit.vue
@@ -126,7 +126,7 @@ import { ref, reactive, defineComponent, computed, useContext, watch, toRefs } f
 import { useUserApi } from "~/composables/api";
 import UserAvatar from "~/components/Domain/User/UserAvatar.vue";
 import { VForm } from "~/types/vuetify";
-import { UserOut } from "~/types/api-types/user";
+import { UserOut } from "~/lib/api/types/user";
 import UserPasswordStrength from "~/components/Domain/User/UserPasswordStrength.vue";
 import { validators } from "~/composables/use-validators";
 
diff --git a/frontend/plugins/globals.ts b/frontend/plugins/globals.ts
index 311e6504..1efc5048 100644
--- a/frontend/plugins/globals.ts
+++ b/frontend/plugins/globals.ts
@@ -1,8 +1,8 @@
 import { Plugin } from "@nuxt/types";
 import { Auth } from "@nuxtjs/auth-next";
 import { Framework } from "vuetify";
-import { icons } from "~/utils/icons";
-import { Icon } from "~/utils/icons/icon-type";
+import { icons } from "~/lib/icons";
+import { Icon } from "~/lib/icons/icon-type";
 
 interface Globals {
   icons: Icon;
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index 4e7bc4db..aee96770 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -27,9 +27,10 @@
       "@types/sortablejs"
     ]
   },
-  "include": ["**/*", ".eslintrc.js"],
-  "exclude": ["node_modules", ".nuxt", "dist"],
   "vueCompilerOptions": {
+    "target": 2,
     "experimentalCompatMode": 2
-  }
+  },
+  "include": ["**/*", ".eslintrc.js"],
+  "exclude": ["node_modules", ".nuxt", "dist"]
 }
diff --git a/frontend/types/ocr-types.ts b/frontend/types/ocr-types.ts
index 85e95149..2b363cf2 100644
--- a/frontend/types/ocr-types.ts
+++ b/frontend/types/ocr-types.ts
@@ -1,5 +1,5 @@
-import { OcrTsvResponse } from "~/types/api-types/ocr";
-import { Recipe } from "~/types/api-types/recipe";
+import { OcrTsvResponse } from "~/lib/api/types/ocr";
+import { Recipe } from "~/lib/api/types/recipe";
 
 export type CanvasRect = {
   startX: number;
diff --git a/frontend/types/recipe/organizers.ts b/frontend/types/recipe/organizers.ts
index ba949d91..e69de29b 100644
--- a/frontend/types/recipe/organizers.ts
+++ b/frontend/types/recipe/organizers.ts
@@ -1,7 +0,0 @@
-export type RecipeOrganizer = "categories" | "tags" | "tools";
-
-export enum Organizer {
-  Category = "categories",
-  Tag = "tags",
-  Tool = "tools",
-}
diff --git a/frontend/utils/icons/icon-type.ts b/frontend/utils/icons/icon-type.ts
deleted file mode 100644
index 46f58526..00000000
--- a/frontend/utils/icons/icon-type.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-export interface Icon {
-  // Primary
-  primary: string;
-
-  // General
-  docker: string;
-  chart: string;
-  wrench: string;
-  help: string;
-  bowlMixOutline: string;
-  foods: string;
-  units: string;
-  alert: string;
-  alertCircle: string;
-  api: string;
-  arrowLeftBold: string;
-  arrowUpDown: string;
-  backupRestore: string;
-  bellAlert: string;
-  broom: string;
-  calendar: string;
-  calendarMinus: string;
-  calendarMultiselect: string;
-  calendarToday: string;
-  calendarWeek: string;
-  calendarWeekBegin: string;
-  cartCheck: string;
-  check: string;
-  checkboxBlankOutline: string;
-  checkboxMarkedCircle: string;
-  clipboardCheck: string;
-  clockOutline: string;
-  codeBraces: string;
-  codeJson: string;
-  cog: string;
-  commentTextMultipleOutline: string;
-  contentCopy: string;
-  database: string;
-  desktopTowerMonitor: string;
-  devTo: string;
-  diceMultiple: string;
-  dotsHorizontal: string;
-  dotsVertical: string;
-  download: string;
-  email: string;
-  externalLink: string;
-  eye: string;
-  eyeOff: string;
-  file: string;
-  fileImage: string;
-  filePDF: string;
-  filter: string;
-  folderOutline: string;
-  food: string;
-  formatColorFill: string;
-  formatListCheck: string;
-  formSelect: string;
-  github: string;
-  heart: string;
-  heartOutline: string;
-  home: string;
-  import: string;
-  information: string;
-  link: string;
-  lock: string;
-  logout: string;
-  menu: string;
-  newBox: string;
-  notificationClearAll: string;
-  openInNew: string;
-  orderAlphabeticalAscending: string;
-  pageLayoutBody: string;
-  potSteam: string;
-  printer: string;
-  refreshCircle: string;
-  robot: string;
-  search: string;
-  shareVariant: string;
-  shuffleVariant: string;
-  sort: string;
-  sortAscending: string;
-  sortDescending: string;
-  sortAlphabeticalAscending: string;
-  sortAlphabeticalDescending: string;
-  sortCalendarAscending: string;
-  sortCalendarDescending: string;
-  sortClockAscending: string;
-  sortClockDescending: string;
-  star: string;
-  testTube: string;
-  tools: string;
-  translate: string;
-  upload: string;
-  viewDashboard: string;
-  viewModule: string;
-  weatherNight: string;
-  weatherSunny: string;
-  webhook: string;
-  windowClose: string;
-  zip: string;
-  undo: string;
-
-  // Crud
-  backArrow: string;
-  createAlt: string;
-  create: string;
-  delete: string;
-  save: string;
-  update: string;
-  edit: string;
-  close: string;
-  minus: string;
-
-  // Organization
-  tags: string;
-  pages: string;
-
-  // Admin
-  user: string;
-  admin: string;
-  group: string;
-  accountPlusOutline: string;
-
-  forward: string;
-  back: string;
-  slotMachine: string;
-  chevronDown: string;
-
-  // Ocr toolbar
-  selectMode: string;
-  panAndZoom: string;
-  preserveLines: string;
-  preserveBlocks: string;
-  flatten: string;
-}
diff --git a/frontend/vitest.config.js b/frontend/vitest.config.js
new file mode 100644
index 00000000..1b11f20b
--- /dev/null
+++ b/frontend/vitest.config.js
@@ -0,0 +1,14 @@
+import path from "path";
+
+export default {
+  test: {
+    globals: true,
+    environment: "jsdom",
+  },
+  resolve: {
+    alias: {
+      "@": path.resolve(__dirname, "."),
+      "~": path.resolve(__dirname, "."),
+    },
+  },
+};
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 0f3b74c7..8948f8f5 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -1305,6 +1305,16 @@
   resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
   integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==
 
+"@esbuild/android-arm@0.15.11":
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.15.11.tgz#bdd9c3e098183bdca97075aa4c3e0152ed3e10ee"
+  integrity sha512-PzMcQLazLBkwDEkrNPi9AbjFt6+3I7HKbiYF2XtWQ7wItrHvEOeO3T8Am434zAozWtVP7lrTue1bEfc2nYWeCA==
+
+"@esbuild/linux-loong64@0.15.11":
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.11.tgz#2f4f9a1083dcb4fc65233b6f59003c406abf32e5"
+  integrity sha512-geWp637tUhNmhL3Xgy4Bj703yXB9dqiLJe05lCUfjSFDrQf9C/8pArusyPUbUbPwlC/EAUjBw32sxuIl/11dZw==
+
 "@eslint/eslintrc@^1.3.3":
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.3.tgz#2b044ab39fdfa75b4688184f9e573ce3c5b0ff95"
@@ -2090,6 +2100,18 @@
     "@types/node" "*"
     "@types/responselike" "*"
 
+"@types/chai-subset@^1.3.3":
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/@types/chai-subset/-/chai-subset-1.3.3.tgz#97893814e92abd2c534de422cb377e0e0bdaac94"
+  integrity sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw==
+  dependencies:
+    "@types/chai" "*"
+
+"@types/chai@*", "@types/chai@^4.3.3":
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.3.tgz#3c90752792660c4b562ad73b3fbd68bf3bc7ae07"
+  integrity sha512-hC7OMnszpxhZPduX+m+nrx+uFoLkWOMiR4oa/AZF3MuSETYTZmFfJAHqZEM8MVlvfG7BEUcgvtwoCTxBp6hm3g==
+
 "@types/clean-css@*":
   version "4.2.5"
   resolved "https://registry.yarnpkg.com/@types/clean-css/-/clean-css-4.2.5.tgz#69ce62cc13557c90ca40460133f672dc52ceaf89"
@@ -3135,6 +3157,11 @@ assert@^1.1.1:
     object-assign "^4.1.1"
     util "0.10.3"
 
+assertion-error@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
+  integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==
+
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
@@ -3690,6 +3717,19 @@ caniuse-lite@^1.0.30001332:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001342.tgz#87152b1e3b950d1fbf0093e23f00b6c8e8f1da96"
   integrity sha512-bn6sOCu7L7jcbBbyNhLg0qzXdJ/PMbybZTH/BA6Roet9wxYRm6Tr9D0s0uhLkOZ6MSG+QU6txUgdpr3MXIVqjA==
 
+chai@^4.3.6:
+  version "4.3.6"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.6.tgz#ffe4ba2d9fa9d6680cc0b370adae709ec9011e9c"
+  integrity sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==
+  dependencies:
+    assertion-error "^1.1.0"
+    check-error "^1.0.2"
+    deep-eql "^3.0.1"
+    get-func-name "^2.0.0"
+    loupe "^2.3.1"
+    pathval "^1.1.1"
+    type-detect "^4.0.5"
+
 chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -3728,6 +3768,11 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
+check-error@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
+  integrity sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==
+
 "chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.1, chokidar@^3.4.2, chokidar@^3.5.1, chokidar@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
@@ -4504,6 +4549,13 @@ decompress-response@^6.0.0:
   dependencies:
     mimic-response "^3.1.0"
 
+deep-eql@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df"
+  integrity sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==
+  dependencies:
+    type-detect "^4.0.0"
+
 deep-is@^0.1.3, deep-is@~0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
@@ -4965,101 +5017,201 @@ esbuild-android-64@0.14.39:
   resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.39.tgz#09f12a372eed9743fd77ff6d889ac14f7b340c21"
   integrity sha512-EJOu04p9WgZk0UoKTqLId9VnIsotmI/Z98EXrKURGb3LPNunkeffqQIkjS2cAvidh+OK5uVrXaIP229zK6GvhQ==
 
+esbuild-android-64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.15.11.tgz#50402129c3e85bb06434e212374c5f693e4c5f01"
+  integrity sha512-rrwoXEiuI1kaw4k475NJpexs8GfJqQUKcD08VR8sKHmuW9RUuTR2VxcupVvHdiGh9ihxL9m3lpqB1kju92Ialw==
+
 esbuild-android-arm64@0.14.39:
   version "0.14.39"
   resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.39.tgz#f608d00ea03fe26f3b1ab92a30f99220390f3071"
   integrity sha512-+twajJqO7n3MrCz9e+2lVOnFplRsaGRwsq1KL/uOy7xK7QdRSprRQcObGDeDZUZsacD5gUkk6OiHiYp6RzU3CA==
 
+esbuild-android-arm64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.11.tgz#49bee35218ea2ccf1a0c5f187af77c1c0a5dee71"
+  integrity sha512-/hDubOg7BHOhUUsT8KUIU7GfZm5bihqssvqK5PfO4apag7YuObZRZSzViyEKcFn2tPeHx7RKbSBXvAopSHDZJQ==
+
 esbuild-darwin-64@0.14.39:
   version "0.14.39"
   resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.39.tgz#31528daa75b4c9317721ede344195163fae3e041"
   integrity sha512-ImT6eUw3kcGcHoUxEcdBpi6LfTRWaV6+qf32iYYAfwOeV+XaQ/Xp5XQIBiijLeo+LpGci9M0FVec09nUw41a5g==
 
+esbuild-darwin-64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.11.tgz#89a90c8cf6f0029ac4169bfedd012a0412c1575f"
+  integrity sha512-1DqHD0ms3AhiwkKnjRUzmiW7JnaJJr5FKrPiR7xuyMwnjDqvNWDdMq4rKSD9OC0piFNK6n0LghsglNMe2MwJtA==
+
 esbuild-darwin-arm64@0.14.39:
   version "0.14.39"
   resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.39.tgz#247f770d86d90a215fa194f24f90e30a0bd97245"
   integrity sha512-/fcQ5UhE05OiT+bW5v7/up1bDsnvaRZPJxXwzXsMRrr7rZqPa85vayrD723oWMT64dhrgWeA3FIneF8yER0XTw==
 
+esbuild-darwin-arm64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.11.tgz#556f4385c6de806cc81132dd7b8af00fe9d292df"
+  integrity sha512-OMzhxSbS0lwwrW40HHjRCeVIJTURdXFA8c3GU30MlHKuPCcvWNUIKVucVBtNpJySXmbkQMDJdJNrXzNDyvoqvQ==
+
 esbuild-freebsd-64@0.14.39:
   version "0.14.39"
   resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.39.tgz#479414d294905055eb396ebe455ed42213284ee0"
   integrity sha512-oMNH8lJI4wtgN5oxuFP7BQ22vgB/e3Tl5Woehcd6i2r6F3TszpCnNl8wo2d/KvyQ4zvLvCWAlRciumhQg88+kQ==
 
+esbuild-freebsd-64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.11.tgz#fd86fd1b3b65366048f35b996d9cdf3547384eee"
+  integrity sha512-8dKP26r0/Qyez8nTCwpq60QbuYKOeBygdgOAWGCRalunyeqWRoSZj9TQjPDnTTI9joxd3QYw3UhVZTKxO9QdRg==
+
 esbuild-freebsd-arm64@0.14.39:
   version "0.14.39"
   resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.39.tgz#cedeb10357c88533615921ae767a67dc870a474c"
   integrity sha512-1GHK7kwk57ukY2yI4ILWKJXaxfr+8HcM/r/JKCGCPziIVlL+Wi7RbJ2OzMcTKZ1HpvEqCTBT/J6cO4ZEwW4Ypg==
 
+esbuild-freebsd-arm64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.11.tgz#d346bcacfe9779ebc1a11edac1bdedeff6dda3b1"
+  integrity sha512-aSGiODiukLGGnSg/O9+cGO2QxEacrdCtCawehkWYTt5VX1ni2b9KoxpHCT9h9Y6wGqNHmXFnB47RRJ8BIqZgmQ==
+
 esbuild-linux-32@0.14.39:
   version "0.14.39"
   resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.39.tgz#d9f008c4322d771f3958f59c1eee5a05cdf92485"
   integrity sha512-g97Sbb6g4zfRLIxHgW2pc393DjnkTRMeq3N1rmjDUABxpx8SjocK4jLen+/mq55G46eE2TA0MkJ4R3SpKMu7dg==
 
+esbuild-linux-32@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.15.11.tgz#64b50e774bf75af7dcc6a73ad509f2eb0ac4487b"
+  integrity sha512-lsrAfdyJBGx+6aHIQmgqUonEzKYeBnyfJPkT6N2dOf1RoXYYV1BkWB6G02tjsrz1d5wZzaTc3cF+TKmuTo/ZwA==
+
 esbuild-linux-64@0.14.39:
   version "0.14.39"
   resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.39.tgz#ba58d7f66858913aeb1ab5c6bde1bbd824731795"
   integrity sha512-4tcgFDYWdI+UbNMGlua9u1Zhu0N5R6u9tl5WOM8aVnNX143JZoBZLpCuUr5lCKhnD0SCO+5gUyMfupGrHtfggQ==
 
+esbuild-linux-64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.15.11.tgz#fba3a78b95769772863f8f6dc316abca55cf8416"
+  integrity sha512-Y2Rh+PcyVhQqXKBTacPCltINN3uIw2xC+dsvLANJ1SpK5NJUtxv8+rqWpjmBgaNWKQT1/uGpMmA9olALy9PLVA==
+
 esbuild-linux-arm64@0.14.39:
   version "0.14.39"
   resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.39.tgz#708785a30072702b5b1c16b65cf9c25c51202529"
   integrity sha512-23pc8MlD2D6Px1mV8GMglZlKgwgNKAO8gsgsLLcXWSs9lQsCYkIlMo/2Ycfo5JrDIbLdwgP8D2vpfH2KcBqrDQ==
 
+esbuild-linux-arm64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.11.tgz#c0cb31980eee066bfd39a4593660a0ecebe926cb"
+  integrity sha512-uhcXiTwTmD4OpxJu3xC5TzAAw6Wzf9O1XGWL448EE9bqGjgV1j+oK3lIHAfsHnuIn8K4nDW8yjX0Sv5S++oRuw==
+
 esbuild-linux-arm@0.14.39:
   version "0.14.39"
   resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.39.tgz#4e8b5deaa7ab60d0d28fab131244ef82b40684f4"
   integrity sha512-t0Hn1kWVx5UpCzAJkKRfHeYOLyFnXwYynIkK54/h3tbMweGI7dj400D1k0Vvtj2u1P+JTRT9tx3AjtLEMmfVBQ==
 
+esbuild-linux-arm@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.11.tgz#7824d20099977aa671016c7de7a5038c9870010f"
+  integrity sha512-TJllTVk5aSyqPFvvcHTvf6Wu1ZKhWpJ/qNmZO8LL/XeB+LXCclm7HQHNEIz6MT7IX8PmlC1BZYrOiw2sXSB95A==
+
 esbuild-linux-mips64le@0.14.39:
   version "0.14.39"
   resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.39.tgz#6f3bf3023f711084e5a1e8190487d2020f39f0f7"
   integrity sha512-epwlYgVdbmkuRr5n4es3B+yDI0I2e/nxhKejT9H0OLxFAlMkeQZxSpxATpDc9m8NqRci6Kwyb/SfmD1koG2Zuw==
 
+esbuild-linux-mips64le@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.11.tgz#10627331c90164e553429ed25e025184bba485b6"
+  integrity sha512-WD61y/R1M4BLe4gxXRypoQ0Ci+Vjf714QYzcPNkiYv5I8K8WDz2ZR8Bm6cqKxd6rD+e/rZgPDbhQ9PCf7TMHmA==
+
 esbuild-linux-ppc64le@0.14.39:
   version "0.14.39"
   resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.39.tgz#900e718a4ea3f6aedde8424828eeefdd4b48d4b9"
   integrity sha512-W/5ezaq+rQiQBThIjLMNjsuhPHg+ApVAdTz2LvcuesZFMsJoQAW2hutoyg47XxpWi7aEjJGrkS26qCJKhRn3QQ==
 
+esbuild-linux-ppc64le@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.11.tgz#be42679a36a5246b893fc8b898135ebacb5a0a14"
+  integrity sha512-JVleZS9oPVLTlBhPTWgOwxFWU/wMUdlBwTbGA4GF8c38sLbS13cupj+C8bLq929jU7EMWry4SaL+tKGIaTlqKg==
+
 esbuild-linux-riscv64@0.14.39:
   version "0.14.39"
   resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.39.tgz#dcbff622fa37047a75d2ff7a1d8d2949d80277e4"
   integrity sha512-IS48xeokcCTKeQIOke2O0t9t14HPvwnZcy+5baG13Z1wxs9ZrC5ig5ypEQQh4QMKxURD5TpCLHw2W42CLuVZaA==
 
+esbuild-linux-riscv64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.11.tgz#3ac2f328e3db73cbff833ada94314d8e79503e54"
+  integrity sha512-9aLIalZ2HFHIOZpmVU11sEAS9F8TnHw49daEjcgMpBXHFF57VuT9f9/9LKJhw781Gda0P9jDkuCWJ0tFbErvJw==
+
 esbuild-linux-s390x@0.14.39:
   version "0.14.39"
   resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.39.tgz#3f725a7945b419406c99d93744b28552561dcdfd"
   integrity sha512-zEfunpqR8sMomqXhNTFEKDs+ik7HC01m3M60MsEjZOqaywHu5e5682fMsqOlZbesEAAaO9aAtRBsU7CHnSZWyA==
 
+esbuild-linux-s390x@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.11.tgz#e774e0df061b6847d86783bf3c8c4300a72e03ad"
+  integrity sha512-sZHtiXXOKsLI3XGBGoYO4qKBzJlb8xNsWmvFiwFMHFzA4AXgDP1KDp7Dawe9C2pavTRBDvl+Ok4n/DHQ59oaTg==
+
 esbuild-netbsd-64@0.14.39:
   version "0.14.39"
   resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.39.tgz#e10e40b6a765798b90d4eb85901cc85c8b7ff85e"
   integrity sha512-Uo2suJBSIlrZCe4E0k75VDIFJWfZy+bOV6ih3T4MVMRJh1lHJ2UyGoaX4bOxomYN3t+IakHPyEoln1+qJ1qYaA==
 
+esbuild-netbsd-64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.11.tgz#55e265fa4489e3f396b16c81f6f5a11d6ca2a9a4"
+  integrity sha512-hUC9yN06K9sg7ju4Vgu9ChAPdsEgtcrcLfyNT5IKwKyfpLvKUwCMZSdF+gRD3WpyZelgTQfJ+pDx5XFbXTlB0A==
+
 esbuild-openbsd-64@0.14.39:
   version "0.14.39"
   resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.39.tgz#935ec143f75ce10bd9cdb1c87fee00287eb0edbc"
   integrity sha512-secQU+EpgUPpYjJe3OecoeGKVvRMLeKUxSMGHnK+aK5uQM3n1FPXNJzyz1LHFOo0WOyw+uoCxBYdM4O10oaCAA==
 
+esbuild-openbsd-64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.11.tgz#bc04103ccfd8c2f2241e1add0b51a095955b73c4"
+  integrity sha512-0bBo9SQR4t66Wd91LGMAqmWorzO0TTzVjYiifwoFtel8luFeXuPThQnEm5ztN4g0fnvcp7AnUPPzS/Depf17wQ==
+
 esbuild-sunos-64@0.14.39:
   version "0.14.39"
   resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.39.tgz#0e7aa82b022a2e6d55b0646738b2582c2d72c3c0"
   integrity sha512-qHq0t5gePEDm2nqZLb+35p/qkaXVS7oIe32R0ECh2HOdiXXkj/1uQI9IRogGqKkK+QjDG+DhwiUw7QoHur/Rwg==
 
+esbuild-sunos-64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.11.tgz#ccd580305d31fde07b5c386da79c942aaf069013"
+  integrity sha512-EuBdTGlsMTjEl1sQnBX2jfygy7iR6CKfvOzi+gEOfhDqbHXsmY1dcpbVtcwHAg9/2yUZSfMJHMAgf1z8M4yyyw==
+
 esbuild-windows-32@0.14.39:
   version "0.14.39"
   resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.39.tgz#3f1538241f31b538545f4b5841b248cac260fa35"
   integrity sha512-XPjwp2OgtEX0JnOlTgT6E5txbRp6Uw54Isorm3CwOtloJazeIWXuiwK0ONJBVb/CGbiCpS7iP2UahGgd2p1x+Q==
 
+esbuild-windows-32@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.15.11.tgz#40fe1d48f9b20a76f6db5109aaaf1511aed58c71"
+  integrity sha512-O0/Wo1Wk6dc0rZSxkvGpmTNIycEznHmkObTFz2VHBhjPsO4ZpCgfGxNkCpz4AdAIeMczpTXt/8d5vdJNKEGC+Q==
+
 esbuild-windows-64@0.14.39:
   version "0.14.39"
   resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.39.tgz#b100c59f96d3c2da2e796e42fee4900d755d3e03"
   integrity sha512-E2wm+5FwCcLpKsBHRw28bSYQw0Ikxb7zIMxw3OPAkiaQhLVr3dnVO8DofmbWhhf6b97bWzg37iSZ45ZDpLw7Ow==
 
+esbuild-windows-64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.15.11.tgz#80c58b1ef2ff030c78e3a06e7a922776cc4cb687"
+  integrity sha512-x977Q4HhNjnHx00b4XLAnTtj5vfbdEvkxaQwC1Zh5AN8g5EX+izgZ6e5QgqJgpzyRNJqh4hkgIJF1pyy1be0mQ==
+
 esbuild-windows-arm64@0.14.39:
   version "0.14.39"
   resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.39.tgz#00268517e665b33c89778d61f144e4256b39f631"
   integrity sha512-sBZQz5D+Gd0EQ09tZRnz/PpVdLwvp/ufMtJ1iDFYddDaPpZXKqPyaxfYBLs3ueiaksQ26GGa7sci0OqFzNs7KA==
 
+esbuild-windows-arm64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.11.tgz#018624023b5c3f0cca334cc99f5ef7134d396333"
+  integrity sha512-VwUHFACuBahrvntdcMKZteUZ9HaYrBRODoKe4tIWxguQRvvYoYb7iu5LrcRS/FQx8KPZNaa72zuqwVtHeXsITw==
+
 esbuild@^0.14.27:
   version "0.14.39"
   resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.39.tgz#c926b2259fe6f6d3a94f528fb42e103c5a6d909a"
@@ -5086,6 +5238,34 @@ esbuild@^0.14.27:
     esbuild-windows-64 "0.14.39"
     esbuild-windows-arm64 "0.14.39"
 
+esbuild@^0.15.9:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.15.11.tgz#524d48612a9aa7edc1753c83459cb6fcae0cb66e"
+  integrity sha512-OgHGuhlfZ//mToxjte1D5iiiQgWfJ2GByVMwEC/IuoXsBGkuyK1+KrjYu0laSpnN/L1UmLUCv0s25vObdc1bVg==
+  optionalDependencies:
+    "@esbuild/android-arm" "0.15.11"
+    "@esbuild/linux-loong64" "0.15.11"
+    esbuild-android-64 "0.15.11"
+    esbuild-android-arm64 "0.15.11"
+    esbuild-darwin-64 "0.15.11"
+    esbuild-darwin-arm64 "0.15.11"
+    esbuild-freebsd-64 "0.15.11"
+    esbuild-freebsd-arm64 "0.15.11"
+    esbuild-linux-32 "0.15.11"
+    esbuild-linux-64 "0.15.11"
+    esbuild-linux-arm "0.15.11"
+    esbuild-linux-arm64 "0.15.11"
+    esbuild-linux-mips64le "0.15.11"
+    esbuild-linux-ppc64le "0.15.11"
+    esbuild-linux-riscv64 "0.15.11"
+    esbuild-linux-s390x "0.15.11"
+    esbuild-netbsd-64 "0.15.11"
+    esbuild-openbsd-64 "0.15.11"
+    esbuild-sunos-64 "0.15.11"
+    esbuild-windows-32 "0.15.11"
+    esbuild-windows-64 "0.15.11"
+    esbuild-windows-arm64 "0.15.11"
+
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
@@ -5919,6 +6099,11 @@ gensync@^1.0.0-beta.2:
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
+get-func-name@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
+  integrity sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==
+
 get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
@@ -7324,6 +7509,11 @@ loader-utils@^2.0.0:
     emojis-list "^3.0.0"
     json5 "^2.1.2"
 
+local-pkg@^0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/local-pkg/-/local-pkg-0.4.2.tgz#13107310b77e74a0e513147a131a2ba288176c2f"
+  integrity sha512-mlERgSPrbxU3BP4qBqAvvwlgW4MTg78iwJdGGnv7kibKjWcJksrG3t6LB5lXI93wXRDvG4NpUgJFmTG4T6rdrg==
+
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -7414,6 +7604,13 @@ log-update@^4.0.0:
     slice-ansi "^4.0.0"
     wrap-ansi "^6.2.0"
 
+loupe@^2.3.1:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.4.tgz#7e0b9bffc76f148f9be769cb1321d3dcf3cb25f3"
+  integrity sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ==
+  dependencies:
+    get-func-name "^2.0.0"
+
 lower-case@^1.1.1:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
@@ -8581,6 +8778,11 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
+pathval@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d"
+  integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==
+
 pbkdf2@^3.0.3:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075"
@@ -9349,6 +9551,15 @@ postcss@^8.4.13:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
+postcss@^8.4.16:
+  version "8.4.18"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.18.tgz#6d50046ea7d3d66a85e0e782074e7203bc7fbca2"
+  integrity sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==
+  dependencies:
+    nanoid "^3.3.4"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
+
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@@ -9920,6 +10131,13 @@ rollup@^2.59.0:
   optionalDependencies:
     fsevents "~2.3.2"
 
+rollup@~2.78.0:
+  version "2.78.1"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.78.1.tgz#52fe3934d9c83cb4f7c4cb5fb75d88591be8648f"
+  integrity sha512-VeeCgtGi4P+o9hIg+xz4qQpRl6R401LWEXBmxYKOV4zlF82lyhgh2hTZnheFUbANE8l2A41F458iwj2vEYaXJg==
+  optionalDependencies:
+    fsevents "~2.3.2"
+
 run-async@^2.4.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
@@ -10637,6 +10855,13 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
+strip-literal@^0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/strip-literal/-/strip-literal-0.4.2.tgz#4f9fa6c38bb157b924e9ace7155ebf8a2342cbcf"
+  integrity sha512-pv48ybn4iE1O9RLgCAN0iU4Xv7RlBTiit6DKmMiErbs9x1wH6vXBs45tWc0H5wUIF6TLTrKweqkmYF/iraQKNw==
+  dependencies:
+    acorn "^8.8.0"
+
 style-resources-loader@^1.4.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/style-resources-loader/-/style-resources-loader-1.5.0.tgz#6e0585ca475b9dac45387c308be90d74c814f41f"
@@ -10860,6 +11085,21 @@ tiny-glob@^0.2.9:
     globalyzer "0.1.0"
     globrex "^0.1.2"
 
+tinybench@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/tinybench/-/tinybench-2.3.1.tgz#14f64e6b77d7ef0b1f6ab850c7a808c6760b414d"
+  integrity sha512-hGYWYBMPr7p4g5IarQE7XhlyWveh1EKhy4wUBS1LrHXCKYgvz+4/jCqgmJqZxxldesn05vccrtME2RLLZNW7iA==
+
+tinypool@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-0.3.0.tgz#c405d8b743509fc28ea4ca358433190be654f819"
+  integrity sha512-NX5KeqHOBZU6Bc0xj9Vr5Szbb1j8tUHIeD18s41aDJaPeC5QTdEhK0SpdpUrZlj2nv5cctNcSjaKNanXlfcVEQ==
+
+tinyspy@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/tinyspy/-/tinyspy-1.0.2.tgz#6da0b3918bfd56170fb3cd3a2b5ef832ee1dff0d"
+  integrity sha512-bSGlgwLBYf7PnUsQ6WOc6SJ3pGOcd+d8AA6EUnLDDM0kWEstC1JIlSZA3UNliDXhd9ABoS7hiRBDCu+XP/sf1Q==
+
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -11013,6 +11253,11 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
+type-detect@^4.0.0, type-detect@^4.0.5:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
+  integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
+
 type-fest@^0.20.2:
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
@@ -11408,6 +11653,35 @@ vite@^2.5.1:
   optionalDependencies:
     fsevents "~2.3.2"
 
+vite@^3.0.0:
+  version "3.1.8"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-3.1.8.tgz#fa29144167d19b773baffd65b3972ea4c12359c9"
+  integrity sha512-m7jJe3nufUbuOfotkntGFupinL/fmuTNuQmiVE7cH2IZMuf4UbfbGYMUT3jVWgGYuRVLY9j8NnrRqgw5rr5QTg==
+  dependencies:
+    esbuild "^0.15.9"
+    postcss "^8.4.16"
+    resolve "^1.22.1"
+    rollup "~2.78.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
+vitest@^0.24.3:
+  version "0.24.3"
+  resolved "https://registry.yarnpkg.com/vitest/-/vitest-0.24.3.tgz#d91c7e2d557877d5270033efdf18add6063f0c97"
+  integrity sha512-aM0auuPPgMSstWvr851hB74g/LKaKBzSxcG3da7ejfZbx08Y21JpZmbmDYrMTCGhVZKqTGwzcnLMwyfz2WzkhQ==
+  dependencies:
+    "@types/chai" "^4.3.3"
+    "@types/chai-subset" "^1.3.3"
+    "@types/node" "*"
+    chai "^4.3.6"
+    debug "^4.3.4"
+    local-pkg "^0.4.2"
+    strip-literal "^0.4.2"
+    tinybench "^2.3.0"
+    tinypool "^0.3.0"
+    tinyspy "^1.0.2"
+    vite "^3.0.0"
+
 vm-browserify@^1.0.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"