Refactor: begin reorganizing services dir.

- Renamed files and directories to reflect the new structure
- Moved comment-related services to the 'comments' directory
- Moved image-related services to the 'images' directory
- Moved like-related services to the 'likes' directory
- Moved post-related services to the 'posts' directory
- Moved user-related services to the 'users' directory

src/components/Account/AccountInfo.tsx

@@ -1,6 +1,6 @@
 import validateEmailRequest from '@/requests/User/validateEmailRequest';
 import validateUsernameRequest from '@/requests/validateUsernameRequest';
-import { BaseCreateUserSchema } from '@/services/User/schema/CreateUserValidationSchemas';
+import { BaseCreateUserSchema } from '@/services/users/User/schema/CreateUserValidationSchemas';
 import { Switch } from '@headlessui/react';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { Dispatch, FC, useContext } from 'react';

src/components/Account/Security.tsx

@@ -3,7 +3,7 @@ import { Dispatch, FunctionComponent } from 'react';
 import { SubmitHandler, useForm } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { z } from 'zod';
-import { UpdatePasswordSchema } from '@/services/User/schema/CreateUserValidationSchemas';
+import { UpdatePasswordSchema } from '@/services/users/User/schema/CreateUserValidationSchemas';
 import sendUpdatePasswordRequest from '@/requests/User/sendUpdatePasswordRequest';
 import { AccountPageState, AccountPageAction } from '@/reducers/accountPageReducer';
 import toast from 'react-hot-toast';

src/components/Account/UpdateProfileForm.tsx

@@ -5,7 +5,7 @@ import FormSegment from '@/components/ui/forms/FormSegment';
 import Link from 'next/link';
 import FormTextArea from '@/components/ui/forms/FormTextArea';
 import { FC } from 'react';
-import GetUserSchema from '@/services/User/schema/GetUserSchema';
+import GetUserSchema from '@/services/users/User/schema/GetUserSchema';
 import type {
   UseFormHandleSubmit,
   SubmitHandler,
@@ -13,7 +13,7 @@ import type {
   UseFormRegister,
 } from 'react-hook-form';
 import { z } from 'zod';
-import UpdateProfileSchema from '../../services/User/schema/UpdateProfileSchema';
+import UpdateProfileSchema from '../../services/users/User/schema/UpdateProfileSchema';
 
 type UpdateProfileSchemaT = z.infer<typeof UpdateProfileSchema>;
 

src/components/Account/UserAvatar.tsx

@@ -1,7 +1,7 @@
 import { FC } from 'react';
 import { CldImage } from 'next-cloudinary';
 import { z } from 'zod';
-import GetUserSchema from '@/services/User/schema/GetUserSchema';
+import GetUserSchema from '@/services/users/User/schema/GetUserSchema';
 import { FaUser } from 'react-icons/fa';
 
 interface UserAvatarProps {

src/components/BeerById/BeerCommentForm.tsx

@@ -1,6 +1,6 @@
 import sendCreateBeerCommentRequest from '@/requests/BeerComment/sendCreateBeerCommentRequest';
 
-import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
+import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult';
 import { zodResolver } from '@hookform/resolvers/zod';
 
 import { FunctionComponent } from 'react';

src/components/BeerById/BeerInfoHeader.tsx

@@ -4,7 +4,7 @@ import { FC, useContext } from 'react';
 
 import UserContext from '@/contexts/UserContext';
 import { FaRegEdit } from 'react-icons/fa';
-import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
+import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult';
 import { z } from 'zod';
 import useGetBeerPostLikeCount from '@/hooks/data-fetching/beer-likes/useBeerPostLikeCount';
 import useTimeDistance from '@/hooks/utilities/useTimeDistance';

src/components/BeerById/BeerPostCommentsSection.tsx

@@ -1,6 +1,6 @@
 import UserContext from '@/contexts/UserContext';
 
-import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
+import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult';
 
 import { FC, MutableRefObject, useContext, useRef } from 'react';
 import { z } from 'zod';

src/components/BeerById/BeerRecommendations.tsx

@@ -3,7 +3,7 @@ import { FC, MutableRefObject, useRef } from 'react';
 import { useInView } from 'react-intersection-observer';
 import { z } from 'zod';
 import useBeerRecommendations from '@/hooks/data-fetching/beer-posts/useBeerRecommendations';
-import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
+import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult';
 import debounce from 'lodash/debounce';
 import BeerRecommendationLoadingComponent from './BeerRecommendationLoadingComponent';
 

src/components/BeerIndex/BeerCard.tsx

@@ -1,7 +1,7 @@
 import Link from 'next/link';
 import { FC, useContext } from 'react';
 
-import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
+import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult';
 import { z } from 'zod';
 import UserContext from '@/contexts/UserContext';
 import useGetBeerPostLikeCount from '@/hooks/data-fetching/beer-likes/useBeerPostLikeCount';

src/components/BeerStyleById/BeerStyleBeerSection.tsx

@@ -3,7 +3,7 @@ import { FC, MutableRefObject, useRef } from 'react';
 import { useInView } from 'react-intersection-observer';
 import { z } from 'zod';
 
-import BeerStyleQueryResult from '@/services/BeerStyles/schema/BeerStyleQueryResult';
+import BeerStyleQueryResult from '@/services/posts/BeerStyles/schema/BeerStyleQueryResult';
 import useBeerPostsByBeerStyle from '@/hooks/data-fetching/beer-posts/useBeerPostsByBeerStyles';
 import BeerRecommendationLoadingComponent from '../BeerById/BeerRecommendationLoadingComponent';
 

src/components/BeerStyleById/BeerStyleCommentForm.tsx

@@ -8,7 +8,7 @@ import CreateCommentValidationSchema from '@/services/schema/CommentSchema/Creat
 import toast from 'react-hot-toast';
 import createErrorToast from '@/util/createErrorToast';
 
-import BeerStyleQueryResult from '@/services/BeerStyles/schema/BeerStyleQueryResult';
+import BeerStyleQueryResult from '@/services/posts/BeerStyles/schema/BeerStyleQueryResult';
 import useBeerStyleComments from '@/hooks/data-fetching/beer-style-comments/useBeerStyleComments';
 import sendCreateBeerStyleCommentRequest from '@/requests/BeerStyleComment/sendCreateBeerStyleCommentRequest';
 import CommentForm from '../ui/CommentForm';

src/components/BeerStyleById/BeerStyleCommentSection.tsx

@@ -5,7 +5,7 @@ import { z } from 'zod';
 import { useRouter } from 'next/router';
 import CreateCommentValidationSchema from '@/services/schema/CommentSchema/CreateCommentValidationSchema';
 
-import BeerStyleQueryResult from '@/services/BeerStyles/schema/BeerStyleQueryResult';
+import BeerStyleQueryResult from '@/services/posts/BeerStyles/schema/BeerStyleQueryResult';
 import useBeerStyleComments from '@/hooks/data-fetching/beer-style-comments/useBeerStyleComments';
 import LoadingComponent from '../BeerById/LoadingComponent';
 import CommentsComponent from '../ui/CommentsComponent';

src/components/BeerStyleById/BeerStyleHeader.tsx

@@ -7,7 +7,7 @@ import { FaRegEdit } from 'react-icons/fa';
 
 import { z } from 'zod';
 import useTimeDistance from '@/hooks/utilities/useTimeDistance';
-import BeerStyleQueryResult from '@/services/BeerStyles/schema/BeerStyleQueryResult';
+import BeerStyleQueryResult from '@/services/posts/BeerStyles/schema/BeerStyleQueryResult';
 import useBeerStyleLikeCount from '@/hooks/data-fetching/beer-style-likes/useBeerStyleLikeCount';
 import BeerStyleLikeButton from './BeerStyleLikeButton';
 

src/components/BeerStyleIndex/BeerStyleCard.tsx

@@ -1,4 +1,4 @@
-import BeerStyleQueryResult from '@/services/BeerStyles/schema/BeerStyleQueryResult';
+import BeerStyleQueryResult from '@/services/posts/BeerStyles/schema/BeerStyleQueryResult';
 import Link from 'next/link';
 import { FC } from 'react';
 

src/components/BreweryById/BreweryBeerSection.tsx

@@ -1,5 +1,5 @@
 import UseBeerPostsByBrewery from '@/hooks/data-fetching/beer-posts/useBeerPostsByBrewery';
-import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult';
+import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult';
 import Link from 'next/link';
 import { FC, MutableRefObject, useContext, useRef } from 'react';
 import { useInView } from 'react-intersection-observer';

src/components/BreweryById/BreweryCommentForm.tsx

@@ -1,5 +1,5 @@
 import useBreweryPostComments from '@/hooks/data-fetching/brewery-comments/useBreweryPostComments';
-import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult';
+import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult';
 import CreateCommentValidationSchema from '@/services/schema/CommentSchema/CreateCommentValidationSchema';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { FC } from 'react';

src/components/BreweryById/BreweryCommentsSection.tsx

@@ -1,5 +1,5 @@
 import UserContext from '@/contexts/UserContext';
-import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult';
+import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult';
 import { FC, MutableRefObject, useContext, useRef } from 'react';
 import { z } from 'zod';
 import CreateCommentValidationSchema from '@/services/schema/CommentSchema/CreateCommentValidationSchema';

src/components/BreweryById/BreweryInfoHeader.tsx

@@ -1,7 +1,7 @@
 import UserContext from '@/contexts/UserContext';
 import useGetBreweryPostLikeCount from '@/hooks/data-fetching/brewery-likes/useGetBreweryPostLikeCount';
 import useTimeDistance from '@/hooks/utilities/useTimeDistance';
-import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult';
+import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult';
 import { format } from 'date-fns';
 import { FC, useContext } from 'react';
 

src/components/BreweryIndex/BreweryCard.tsx

@@ -1,6 +1,6 @@
 import UserContext from '@/contexts/UserContext';
 import useGetBreweryPostLikeCount from '@/hooks/data-fetching/brewery-likes/useGetBreweryPostLikeCount';
-import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult';
+import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult';
 import { FC, useContext } from 'react';
 import Link from 'next/link';
 import { z } from 'zod';

src/components/BreweryPost/CreateBreweryPostForm.tsx

@@ -1,6 +1,6 @@
 import sendUploadBreweryImagesRequest from '@/requests/BreweryImage/sendUploadBreweryImageRequest';
 import sendCreateBreweryPostRequest from '@/requests/BreweryPost/sendCreateBreweryPostRequest';
-import CreateBreweryPostSchema from '@/services/BreweryPost/schema/CreateBreweryPostSchema';
+import CreateBreweryPostSchema from '@/services/posts/BreweryPost/schema/CreateBreweryPostSchema';
 import UploadImageValidationSchema from '@/services/schema/ImageSchema/UploadImageValidationSchema';
 import createErrorToast from '@/util/createErrorToast';
 import { Tab } from '@headlessui/react';

src/components/CreateBeerPostForm.tsx

@@ -4,8 +4,8 @@ import router from 'next/router';
 import { FunctionComponent } from 'react';
 import { useForm, SubmitHandler, FieldError } from 'react-hook-form';
 import { z } from 'zod';
-import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult';
-import CreateBeerPostValidationSchema from '@/services/BeerPost/schema/CreateBeerPostValidationSchema';
+import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult';
+import CreateBeerPostValidationSchema from '@/services/posts/BeerPost/schema/CreateBeerPostValidationSchema';
 import sendCreateBeerPostRequest from '@/requests/BeerPost/sendCreateBeerPostRequest';
 import UploadImageValidationSchema from '@/services/schema/ImageSchema/UploadImageValidationSchema';
 import sendUploadBeerImagesRequest from '@/requests/BeerImage/sendUploadBeerImageRequest';

src/components/EditBeerPostForm.tsx

@@ -7,7 +7,7 @@ import { useForm, SubmitHandler } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 
 import deleteBeerPostRequest from '@/requests/BeerPost/deleteBeerPostRequest';
-import EditBeerPostValidationSchema from '@/services/BeerPost/schema/EditBeerPostValidationSchema';
+import EditBeerPostValidationSchema from '@/services/posts/BeerPost/schema/EditBeerPostValidationSchema';
 import sendEditBeerPostRequest from '@/requests/BeerPost/sendEditBeerPostRequest';
 import createErrorToast from '@/util/createErrorToast';
 import Button from './ui/forms/Button';

src/components/Login/LoginForm.tsx

@@ -1,5 +1,5 @@
 import sendLoginUserRequest from '@/requests/User/sendLoginUserRequest';
-import LoginValidationSchema from '@/services/User/schema/LoginValidationSchema';
+import LoginValidationSchema from '@/services/users/User/schema/LoginValidationSchema';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useRouter } from 'next/router';
 import { useContext } from 'react';

src/components/RegisterUserForm.tsx

@@ -1,5 +1,5 @@
 import sendRegisterUserRequest from '@/requests/User/sendRegisterUserRequest';
-import { CreateUserValidationSchemaWithUsernameAndEmailCheck } from '@/services/User/schema/CreateUserValidationSchemas';
+import { CreateUserValidationSchemaWithUsernameAndEmailCheck } from '@/services/users/User/schema/CreateUserValidationSchemas';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useRouter } from 'next/router';
 import { FC } from 'react';

src/components/UserPage/UserFollowButton.tsx

@@ -2,7 +2,7 @@ import useFollowStatus from '@/hooks/data-fetching/user-follows/useFollowStatus'
 import useGetUsersFollowedByUser from '@/hooks/data-fetching/user-follows/useGetUsersFollowedByUser';
 import useGetUsersFollowingUser from '@/hooks/data-fetching/user-follows/useGetUsersFollowingUser';
 import sendUserFollowRequest from '@/requests/UserFollow/sendUserFollowRequest';
-import GetUserSchema from '@/services/User/schema/GetUserSchema';
+import GetUserSchema from '@/services/users/User/schema/GetUserSchema';
 import { FC, useState } from 'react';
 import { FaUserCheck, FaUserPlus } from 'react-icons/fa';
 import { z } from 'zod';

src/components/UserPage/UserHeader.tsx

@@ -3,7 +3,7 @@ import useTimeDistance from '@/hooks/utilities/useTimeDistance';
 import { FC, useContext } from 'react';
 import { z } from 'zod';
 import { format } from 'date-fns';
-import GetUserSchema from '@/services/User/schema/GetUserSchema';
+import GetUserSchema from '@/services/users/User/schema/GetUserSchema';
 import useGetUsersFollowedByUser from '@/hooks/data-fetching/user-follows/useGetUsersFollowedByUser';
 import useGetUsersFollowingUser from '@/hooks/data-fetching/user-follows/useGetUsersFollowingUser';
 import UserContext from '@/contexts/UserContext';

src/config/auth/localStrat.ts

@@ -1,4 +1,4 @@
-import findUserByUsername from '@/services/User/findUserByUsername';
+import findUserByUsername from '@/services/users/User/findUserByUsername';
 import Local from 'passport-local';
 import ServerError from '../util/ServerError';
 import { validatePassword } from './passwordFns';

src/config/auth/types.ts

@@ -1,4 +1,4 @@
-import GetUserSchema from '@/services/User/schema/GetUserSchema';
+import GetUserSchema from '@/services/users/User/schema/GetUserSchema';
 import { IncomingMessage } from 'http';
 import { NextApiRequest } from 'next';
 import { z } from 'zod';

src/config/nextConnect/middleware/getCurrentUser.ts

@@ -1,6 +1,6 @@
 import { NextApiResponse } from 'next';
 import { NextHandler } from 'next-connect';
-import findUserById from '@/services/User/findUserById';
+import findUserById from '@/services/users/User/findUserById';
 import ServerError from '@/config/util/ServerError';
 import { getLoginSession } from '../../auth/session';
 import { UserExtendedNextApiRequest } from '../../auth/types';

src/contexts/UserContext.tsx

@@ -1,5 +1,5 @@
 import useUser from '@/hooks/auth/useUser';
-import GetUserSchema from '@/services/User/schema/GetUserSchema';
+import GetUserSchema from '@/services/users/User/schema/GetUserSchema';
 import { ReactNode, createContext } from 'react';
 import { z } from 'zod';
 

src/controllers/comments/beerComments/index.ts

@@ -1,13 +1,13 @@
 import ServerError from '@/config/util/ServerError';
 import DBClient from '@/prisma/DBClient';
-import editBeerCommentById from '@/services/BeerComment/editBeerCommentById';
-import findBeerCommentById from '@/services/BeerComment/findBeerCommentById';
+import editBeerCommentById from '@/services/comments/BeerComment/editBeerCommentById';
+import findBeerCommentById from '@/services/comments/BeerComment/findBeerCommentById';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import { NextApiResponse } from 'next';
 import { NextHandler } from 'next-connect';
 import { z } from 'zod';
-import createNewBeerComment from '@/services/BeerComment/createNewBeerComment';
-import getAllBeerComments from '@/services/BeerComment/getAllBeerComments';
+import createNewBeerComment from '@/services/comments/BeerComment/createNewBeerComment';
+import getAllBeerComments from '@/services/comments/BeerComment/getAllBeerComments';
 import {
   CommentRequest,
   EditAndCreateCommentRequest,

src/controllers/comments/beerStyleComments/index.ts

@@ -1,14 +1,14 @@
 import ServerError from '@/config/util/ServerError';
 import DBClient from '@/prisma/DBClient';
-import updateBeerStyleCommentById from '@/services/BeerStyleComment/updateBeerStyleCommentById';
+import updateBeerStyleCommentById from '@/services/comments/BeerStyleComment/updateBeerStyleCommentById';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import { NextApiResponse } from 'next';
 import { NextHandler } from 'next-connect';
 import { z } from 'zod';
 
 import CommentQueryResult from '@/services/schema/CommentSchema/CommentQueryResult';
-import createNewBeerStyleComment from '@/services/BeerStyleComment/createNewBeerStyleComment';
-import getAllBeerStyleComments from '@/services/BeerStyleComment/getAllBeerStyleComments';
+import createNewBeerStyleComment from '@/services/comments/BeerStyleComment/createNewBeerStyleComment';
+import getAllBeerStyleComments from '@/services/comments/BeerStyleComment/getAllBeerStyleComments';
 
 import {
   CommentRequest,

src/controllers/comments/breweryComments/index.ts

@@ -1,13 +1,13 @@
 import ServerError from '@/config/util/ServerError';
 import DBClient from '@/prisma/DBClient';
-import getBreweryCommentById from '@/services/BreweryComment/getBreweryCommentById';
+import getBreweryCommentById from '@/services/comments/BreweryComment/getBreweryCommentById';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import { NextApiResponse } from 'next';
 import { NextHandler } from 'next-connect';
 import { z } from 'zod';
 import CommentQueryResult from '@/services/schema/CommentSchema/CommentQueryResult';
-import createNewBreweryComment from '@/services/BreweryComment/createNewBreweryComment';
-import getAllBreweryComments from '@/services/BreweryComment/getAllBreweryComments';
+import createNewBreweryComment from '@/services/comments/BreweryComment/createNewBreweryComment';
+import getAllBreweryComments from '@/services/comments/BreweryComment/getAllBreweryComments';
 import {
   CommentRequest,
   EditAndCreateCommentRequest,

src/controllers/images/beerImages/index.ts

@@ -1,5 +1,5 @@
 import ServerError from '@/config/util/ServerError';
-import addBeerImageToDB from '@/services/BeerImage/addBeerImageToDB';
+import addBeerImageToDB from '@/services/images/BeerImage/addBeerImageToDB';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import { NextApiResponse } from 'next';
 import { z } from 'zod';

src/controllers/images/breweryImages/index.ts

@@ -1,5 +1,5 @@
 import ServerError from '@/config/util/ServerError';
-import addBreweryImageToDB from '@/services/BreweryImage/addBreweryImageToDB';
+import addBreweryImageToDB from '@/services/images/BreweryImage/addBreweryImageToDB';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import { NextApiResponse } from 'next';
 import { z } from 'zod';

src/controllers/likes/beerPostLikes/index.ts

@@ -1,10 +1,10 @@
 import { UserExtendedNextApiRequest } from '@/config/auth/types';
 import ServerError from '@/config/util/ServerError';
-import getBeerPostById from '@/services/BeerPost/getBeerPostById';
-import createBeerPostLike from '@/services/BeerPostLike/createBeerPostLike';
-import findBeerPostLikeById from '@/services/BeerPostLike/findBeerPostLikeById';
-import getBeerPostLikeCountByBeerPostId from '@/services/BeerPostLike/getBeerPostLikeCount';
-import removeBeerPostLikeById from '@/services/BeerPostLike/removeBeerPostLikeById';
+import getBeerPostById from '@/services/posts/BeerPost/getBeerPostById';
+import createBeerPostLike from '@/services/likes/BeerPostLike/createBeerPostLike';
+import findBeerPostLikeById from '@/services/likes/BeerPostLike/findBeerPostLikeById';
+import getBeerPostLikeCountByBeerPostId from '@/services/likes/BeerPostLike/getBeerPostLikeCount';
+import removeBeerPostLikeById from '@/services/likes/BeerPostLike/removeBeerPostLikeById';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import { NextApiResponse, NextApiRequest } from 'next';
 import { z } from 'zod';

src/controllers/likes/beerStyleLikes/index.ts

@@ -1,9 +1,9 @@
 import ServerError from '@/config/util/ServerError';
-import createBeerStyleLike from '@/services/BeerStyleLike/createBeerStyleLike';
-import findBeerStyleLikeById from '@/services/BeerStyleLike/findBeerStyleLikeById';
-import getBeerStyleLikeCount from '@/services/BeerStyleLike/getBeerStyleLikeCount';
-import removeBeerStyleLikeById from '@/services/BeerStyleLike/removeBeerStyleLikeById';
-import getBeerStyleById from '@/services/BeerStyles/getBeerStyleById';
+import createBeerStyleLike from '@/services/likes/BeerStyleLike/createBeerStyleLike';
+import findBeerStyleLikeById from '@/services/likes/BeerStyleLike/findBeerStyleLikeById';
+import getBeerStyleLikeCount from '@/services/likes/BeerStyleLike/getBeerStyleLikeCount';
+import removeBeerStyleLikeById from '@/services/likes/BeerStyleLike/removeBeerStyleLikeById';
+import getBeerStyleById from '@/services/posts/BeerStyles/getBeerStyleById';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import { NextApiResponse, NextApiRequest } from 'next';
 import { z } from 'zod';

src/controllers/posts/beerPosts/index.ts

@@ -1,16 +1,16 @@
 import ServerError from '@/config/util/ServerError';
-import deleteBeerPostById from '@/services/BeerPost/deleteBeerPostById';
-import editBeerPostById from '@/services/BeerPost/editBeerPostById';
-import getBeerPostById from '@/services/BeerPost/getBeerPostById';
+import deleteBeerPostById from '@/services/posts/BeerPost/deleteBeerPostById';
+import editBeerPostById from '@/services/posts/BeerPost/editBeerPostById';
+import getBeerPostById from '@/services/posts/BeerPost/getBeerPostById';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import { NextApiResponse } from 'next';
 import { NextHandler } from 'next-connect';
 import { z } from 'zod';
-import getBeerRecommendations from '@/services/BeerPost/getBeerRecommendations';
-import getAllBeerPosts from '@/services/BeerPost/getAllBeerPosts';
+import getBeerRecommendations from '@/services/posts/BeerPost/getBeerRecommendations';
+import getAllBeerPosts from '@/services/posts/BeerPost/getAllBeerPosts';
 import DBClient from '@/prisma/DBClient';
-import createNewBeerPost from '@/services/BeerPost/createNewBeerPost';
-import getBeerPostsByPostedById from '@/services/BeerPost/getBeerPostsByPostedById';
+import createNewBeerPost from '@/services/posts/BeerPost/createNewBeerPost';
+import getBeerPostsByPostedById from '@/services/posts/BeerPost/getBeerPostsByPostedById';
 import {
   BeerPostRequest,
   CreateBeerPostRequest,

src/controllers/posts/beerPosts/types/index.ts

@@ -1,6 +1,6 @@
 import { UserExtendedNextApiRequest } from '@/config/auth/types';
-import CreateBeerPostValidationSchema from '@/services/BeerPost/schema/CreateBeerPostValidationSchema';
-import EditBeerPostValidationSchema from '@/services/BeerPost/schema/EditBeerPostValidationSchema';
+import CreateBeerPostValidationSchema from '@/services/posts/BeerPost/schema/CreateBeerPostValidationSchema';
+import EditBeerPostValidationSchema from '@/services/posts/BeerPost/schema/EditBeerPostValidationSchema';
 import { NextApiRequest } from 'next';
 import { z } from 'zod';
 

src/controllers/posts/beerStyles/index.ts

@@ -5,9 +5,9 @@ import DBClient from '@/prisma/DBClient';
 
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 
-import getBeerStyleById from '@/services/BeerStyles/getBeerStyleById';
-import getBeerPostsByBeerStyleId from '@/services/BeerPost/getBeerPostsByBeerStyleId';
-import getAllBeerStyles from '@/services/BeerStyles/getAllBeerStyles';
+import getBeerStyleById from '@/services/posts/BeerStyles/getBeerStyleById';
+import getBeerPostsByBeerStyleId from '@/services/posts/BeerPost/getBeerPostsByBeerStyleId';
+import getAllBeerStyles from '@/services/posts/BeerStyles/getAllBeerStyles';
 
 import ServerError from '@/config/util/ServerError';
 import { CreateBeerStyleRequest, GetBeerStyleByIdRequest } from './types';

src/controllers/posts/beerStyles/types/index.ts

@@ -2,7 +2,7 @@ import { NextApiRequest } from 'next';
 
 import { UserExtendedNextApiRequest } from '@/config/auth/types';
 import { z } from 'zod';
-import CreateBeerStyleValidationSchema from '@/services/BeerStyles/schema/CreateBeerStyleValidationSchema';
+import CreateBeerStyleValidationSchema from '@/services/posts/BeerStyles/schema/CreateBeerStyleValidationSchema';
 
 export interface GetBeerStyleByIdRequest extends NextApiRequest {
   query: { id: string };

src/controllers/posts/breweries/index.ts

@@ -1,14 +1,14 @@
 import DBClient from '@/prisma/DBClient';
-import getAllBreweryPostsByPostedById from '@/services/BreweryPost/getAllBreweryPostsByPostedById';
+import getAllBreweryPostsByPostedById from '@/services/posts/BreweryPost/getAllBreweryPostsByPostedById';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import { NextApiResponse } from 'next';
 import { z } from 'zod';
-import getAllBreweryPosts from '@/services/BreweryPost/getAllBreweryPosts';
-import createNewBreweryPost from '@/services/BreweryPost/createNewBreweryPost';
+import getAllBreweryPosts from '@/services/posts/BreweryPost/getAllBreweryPosts';
+import createNewBreweryPost from '@/services/posts/BreweryPost/createNewBreweryPost';
 import geocode from '@/config/mapbox/geocoder';
 import ServerError from '@/config/util/ServerError';
-import BreweryPostMapQueryResult from '@/services/BreweryPost/schema/BreweryPostMapQueryResult';
-import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
+import BreweryPostMapQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostMapQueryResult';
+import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult';
 import { CreateBreweryPostRequest, GetBreweryPostsRequest } from './types';
 import { GetAllPostsByConnectedPostId } from '../types';
 

src/controllers/posts/breweries/types/index.ts

@@ -1,5 +1,5 @@
 import { UserExtendedNextApiRequest } from '@/config/auth/types';
-import CreateBreweryPostSchema from '@/services/BreweryPost/schema/CreateBreweryPostSchema';
+import CreateBreweryPostSchema from '@/services/posts/BreweryPost/schema/CreateBreweryPostSchema';
 import PaginatedQueryResponseSchema from '@/services/schema/PaginatedQueryResponseSchema';
 import { NextApiRequest } from 'next';
 import { z } from 'zod';

src/controllers/users/auth/index.ts

@@ -3,24 +3,24 @@ import localStrat from '@/config/auth/localStrat';
 import { getLoginSession, setLoginSession } from '@/config/auth/session';
 import { UserExtendedNextApiRequest } from '@/config/auth/types';
 import ServerError from '@/config/util/ServerError';
-import createNewUser from '@/services/User/createNewUser';
-import findUserByEmail from '@/services/User/findUserByEmail';
+import createNewUser from '@/services/users/User/createNewUser';
+import findUserByEmail from '@/services/users/User/findUserByEmail';
 import { NextApiRequest, NextApiResponse } from 'next';
 import { expressWrapper } from 'next-connect';
 import passport from 'passport';
 import { z } from 'zod';
 
-import findUserByUsername from '@/services/User/findUserByUsername';
-import GetUserSchema from '@/services/User/schema/GetUserSchema';
-import sendConfirmationEmail from '@/services/User/sendConfirmationEmail';
+import findUserByUsername from '@/services/users/User/findUserByUsername';
+import GetUserSchema from '@/services/users/User/schema/GetUserSchema';
+import sendConfirmationEmail from '@/services/users/User/sendConfirmationEmail';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import type { NextFunction } from 'express';
 import { verifyConfirmationToken } from '@/config/jwt';
-import updateUserToBeConfirmedById from '@/services/User/updateUserToBeConfirmedById';
+import updateUserToBeConfirmedById from '@/services/users/User/updateUserToBeConfirmedById';
 import DBClient from '@/prisma/DBClient';
-import sendResetPasswordEmail from '@/services/User/sendResetPasswordEmail';
+import sendResetPasswordEmail from '@/services/users/User/sendResetPasswordEmail';
 import { hashPassword } from '@/config/auth/passwordFns';
-import deleteUserById from '@/services/User/deleteUserById';
+import deleteUserById from '@/services/users/User/deleteUserById';
 import {
   CheckEmailRequest,
   CheckUsernameRequest,

src/controllers/users/auth/types/index.ts

@@ -2,8 +2,8 @@ import { UserExtendedNextApiRequest } from '@/config/auth/types';
 import {
   CreateUserValidationSchema,
   UpdatePasswordSchema,
-} from '@/services/User/schema/CreateUserValidationSchemas';
-import TokenValidationSchema from '@/services/User/schema/TokenValidationSchema';
+} from '@/services/users/User/schema/CreateUserValidationSchemas';
+import TokenValidationSchema from '@/services/users/User/schema/TokenValidationSchema';
 import { NextApiRequest } from 'next';
 import { z } from 'zod';
 

src/controllers/users/profile/index.ts

@@ -1,17 +1,17 @@
 import ServerError from '@/config/util/ServerError';
 import DBClient from '@/prisma/DBClient';
-import findUserById from '@/services/User/findUserById';
+import findUserById from '@/services/users/User/findUserById';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import { NextApiResponse } from 'next';
 import { z } from 'zod';
-import getUsersFollowingUser from '@/services/UserFollows/getUsersFollowingUser';
-import getUsersFollowedByUser from '@/services/UserFollows/getUsersFollowedByUser';
+import getUsersFollowingUser from '@/services/users/UserFollows/getUsersFollowingUser';
+import getUsersFollowedByUser from '@/services/users/UserFollows/getUsersFollowedByUser';
 import { NextHandler } from 'next-connect';
 import updateUserAvatarById, {
   UpdateUserAvatarByIdParams,
-} from '@/services/UserAccount/UpdateUserAvatarByIdParams';
+} from '@/services/users/UserAccount/UpdateUserAvatarByIdParams';
 import { UserExtendedNextApiRequest } from '@/config/auth/types';
-import updateUserProfileById from '@/services/User/updateUserProfileById';
+import updateUserProfileById from '@/services/users/User/updateUserProfileById';
 import {
   UserRouteRequest,
   GetUserFollowInfoRequest,

src/controllers/users/profile/types/index.ts

@@ -1,5 +1,5 @@
 import { UserExtendedNextApiRequest } from '@/config/auth/types';
-import EditUserSchema from '@/services/User/schema/EditUserSchema';
+import EditUserSchema from '@/services/users/User/schema/EditUserSchema';
 import { z } from 'zod';
 
 export interface UserRouteRequest extends UserExtendedNextApiRequest {

src/hooks/auth/useUser.ts

@@ -1,4 +1,4 @@
-import GetUserSchema from '@/services/User/schema/GetUserSchema';
+import GetUserSchema from '@/services/users/User/schema/GetUserSchema';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import useSWR from 'swr';
 

src/hooks/data-fetching/beer-posts/useBeerPostSearch.ts

@@ -1,4 +1,4 @@
-import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
+import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult';
 import useSWR from 'swr';
 import { z } from 'zod';
 

src/hooks/data-fetching/beer-posts/useBeerPosts.ts

@@ -1,4 +1,4 @@
-import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
+import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import useSWRInfinite from 'swr/infinite';
 import { z } from 'zod';

src/hooks/data-fetching/beer-posts/useBeerPostsByBeerStyles.ts

@@ -1,4 +1,4 @@
-import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
+import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import useSWRInfinite from 'swr/infinite';
 import { z } from 'zod';

src/hooks/data-fetching/beer-posts/useBeerPostsByBrewery.ts

@@ -1,4 +1,4 @@
-import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
+import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import useSWRInfinite from 'swr/infinite';
 import { z } from 'zod';

src/hooks/data-fetching/beer-posts/useBeerPostsByUser.ts

@@ -1,4 +1,4 @@
-import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
+import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import useSWRInfinite from 'swr/infinite';
 import { z } from 'zod';

src/hooks/data-fetching/beer-posts/useBeerRecommendations.ts

@@ -1,4 +1,4 @@
-import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
+import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import useSWRInfinite from 'swr/infinite';
 import { z } from 'zod';

src/hooks/data-fetching/beer-styles/useBeerStyles.ts

@@ -1,4 +1,4 @@
-import BeerStyleQueryResult from '@/services/BeerStyles/schema/BeerStyleQueryResult';
+import BeerStyleQueryResult from '@/services/posts/BeerStyles/schema/BeerStyleQueryResult';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import useSWRInfinite from 'swr/infinite';
 import { z } from 'zod';

src/hooks/data-fetching/brewery-posts/useBreweryMapPagePosts.ts

@@ -1,4 +1,4 @@
-import BreweryPostMapQueryResult from '@/services/BreweryPost/schema/BreweryPostMapQueryResult';
+import BreweryPostMapQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostMapQueryResult';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import useSWRInfinite from 'swr/infinite';
 import { z } from 'zod';

src/hooks/data-fetching/brewery-posts/useBreweryPosts.ts

@@ -1,4 +1,4 @@
-import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult';
+import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import useSWRInfinite from 'swr/infinite';
 import { z } from 'zod';

src/hooks/data-fetching/brewery-posts/useBreweryPostsByUser.ts

@@ -1,4 +1,4 @@
-import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult';
+import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import useSWRInfinite from 'swr/infinite';
 import { z } from 'zod';

src/hooks/data-fetching/user-follows/useGetUsersFollowedByUser.ts

@@ -17,7 +17,7 @@
  *   - `mutate` A function to mutate the data.
  *   - `error` The error object, if any.
  */
-import FollowInfoSchema from '@/services/UserFollows/schema/FollowInfoSchema';
+import FollowInfoSchema from '@/services/users/UserFollows/schema/FollowInfoSchema';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import useSWRInfinite from 'swr/infinite';
 import { z } from 'zod';

src/hooks/data-fetching/user-follows/useGetUsersFollowingUser.ts

@@ -1,4 +1,4 @@
-import FollowInfoSchema from '@/services/UserFollows/schema/FollowInfoSchema';
+import FollowInfoSchema from '@/services/users/UserFollows/schema/FollowInfoSchema';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import useSWRInfinite from 'swr/infinite';
 import { z } from 'zod';

src/pages/api/beers/[id]/index.ts

@@ -13,7 +13,7 @@ import {
   deleteBeerPost,
 } from '@/controllers/posts/beerPosts';
 
-import EditBeerPostValidationSchema from '@/services/BeerPost/schema/EditBeerPostValidationSchema';
+import EditBeerPostValidationSchema from '@/services/posts/BeerPost/schema/EditBeerPostValidationSchema';
 
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 

src/pages/api/beers/create.ts

@@ -1,7 +1,7 @@
 import validateRequest from '@/config/nextConnect/middleware/validateRequest';
 import { createRouter } from 'next-connect';
 
-import CreateBeerPostValidationSchema from '@/services/BeerPost/schema/CreateBeerPostValidationSchema';
+import CreateBeerPostValidationSchema from '@/services/posts/BeerPost/schema/CreateBeerPostValidationSchema';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import { NextApiResponse } from 'next';
 import { z } from 'zod';

src/pages/api/beers/search.ts

@@ -5,7 +5,7 @@ import { NextApiRequest, NextApiResponse } from 'next';
 import { createRouter } from 'next-connect';
 import { z } from 'zod';
 import DBClient from '@/prisma/DBClient';
-import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
+import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult';
 
 const SearchSchema = z.object({
   search: z.string().min(1),

src/pages/api/beers/styles/create.ts

@@ -2,7 +2,7 @@ import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
 import validateRequest from '@/config/nextConnect/middleware/validateRequest';
 import { createBeerStyle } from '@/controllers/posts/beerStyles';
 import { CreateBeerStyleRequest } from '@/controllers/posts/beerStyles/types';
-import CreateBeerStyleValidationSchema from '@/services/BeerStyles/schema/CreateBeerStyleValidationSchema';
+import CreateBeerStyleValidationSchema from '@/services/posts/BeerStyles/schema/CreateBeerStyleValidationSchema';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import { NextApiResponse } from 'next';
 import { createRouter } from 'next-connect';

src/pages/api/breweries/[id]/index.ts

@@ -7,8 +7,8 @@ import { createRouter, NextHandler } from 'next-connect';
 import { z } from 'zod';
 import ServerError from '@/config/util/ServerError';
 import DBClient from '@/prisma/DBClient';
-import getBreweryPostById from '@/services/BreweryPost/getBreweryPostById';
-import EditBreweryPostValidationSchema from '@/services/BreweryPost/schema/EditBreweryPostValidationSchema';
+import getBreweryPostById from '@/services/posts/BreweryPost/getBreweryPostById';
+import EditBreweryPostValidationSchema from '@/services/posts/BreweryPost/schema/EditBreweryPostValidationSchema';
 
 interface BreweryPostRequest extends UserExtendedNextApiRequest {
   query: { id: string };

src/pages/api/breweries/create.ts

@@ -5,8 +5,8 @@ import { NextApiResponse } from 'next';
 import { z } from 'zod';
 import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
 import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
-import CreateBreweryPostSchema from '@/services/BreweryPost/schema/CreateBreweryPostSchema';
-import createNewBreweryPost from '@/services/BreweryPost/createNewBreweryPost';
+import CreateBreweryPostSchema from '@/services/posts/BreweryPost/schema/CreateBreweryPostSchema';
+import createNewBreweryPost from '@/services/posts/BreweryPost/createNewBreweryPost';
 import geocode from '@/config/mapbox/geocoder';
 import ServerError from '@/config/util/ServerError';
 import DBClient from '@/prisma/DBClient';

src/pages/api/breweries/map/index.ts

@@ -1,6 +1,6 @@
 import validateRequest from '@/config/nextConnect/middleware/validateRequest';
 import DBClient from '@/prisma/DBClient';
-import BreweryPostMapQueryResult from '@/services/BreweryPost/schema/BreweryPostMapQueryResult';
+import BreweryPostMapQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostMapQueryResult';
 import PaginatedQueryResponseSchema from '@/services/schema/PaginatedQueryResponseSchema';
 
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';

src/pages/api/users/[id]/index.ts

@@ -4,7 +4,7 @@ import validateRequest from '@/config/nextConnect/middleware/validateRequest';
 import { editUserInfo, deleteAccount } from '@/controllers/users/auth';
 import { checkIfUserCanEditUser } from '@/controllers/users/profile';
 import { EditUserRequest } from '@/controllers/users/profile/types';
-import EditUserSchema from '@/services/User/schema/EditUserSchema';
+import EditUserSchema from '@/services/users/User/schema/EditUserSchema';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 
 import { NextApiResponse } from 'next';

src/pages/api/users/confirm.ts

@@ -9,7 +9,7 @@ import validateRequest from '@/config/nextConnect/middleware/validateRequest';
 
 import { TokenValidationRequest } from '@/controllers/users/auth/types';
 import { confirmUser } from '@/controllers/users/auth';
-import TokenValidationSchema from '@/services/User/schema/TokenValidationSchema';
+import TokenValidationSchema from '@/services/users/User/schema/TokenValidationSchema';
 
 const router = createRouter<
   TokenValidationRequest,

src/pages/api/users/edit-password.ts

@@ -3,7 +3,7 @@ import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
 import validateRequest from '@/config/nextConnect/middleware/validateRequest';
 import { updatePassword } from '@/controllers/users/auth';
 import { UpdatePasswordRequest } from '@/controllers/users/auth/types';
-import { UpdatePasswordSchema } from '@/services/User/schema/CreateUserValidationSchemas';
+import { UpdatePasswordSchema } from '@/services/users/User/schema/CreateUserValidationSchemas';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import { NextApiResponse } from 'next';
 import { createRouter } from 'next-connect';

src/pages/api/users/login.ts

@@ -3,7 +3,7 @@ import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
 import { createRouter } from 'next-connect';
 import { NextApiResponse } from 'next';
 import { z } from 'zod';
-import LoginValidationSchema from '@/services/User/schema/LoginValidationSchema';
+import LoginValidationSchema from '@/services/users/User/schema/LoginValidationSchema';
 import { UserExtendedNextApiRequest } from '@/config/auth/types';
 import validateRequest from '@/config/nextConnect/middleware/validateRequest';
 import { authenticateUser, loginUser } from '@/controllers/users/auth';

src/pages/api/users/register.ts

@@ -1,7 +1,7 @@
 import { NextApiResponse } from 'next';
 import { z } from 'zod';
 import { createRouter } from 'next-connect';
-import { CreateUserValidationSchema } from '@/services/User/schema/CreateUserValidationSchemas';
+import { CreateUserValidationSchema } from '@/services/users/User/schema/CreateUserValidationSchemas';
 import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
 import validateRequest from '@/config/nextConnect/middleware/validateRequest';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';

src/pages/beers/[id]/edit.tsx

@@ -3,8 +3,8 @@ import Head from 'next/head';
 import React from 'react';
 
 import withPageAuthRequired from '@/util/withPageAuthRequired';
-import getBeerPostById from '@/services/BeerPost/getBeerPostById';
-import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
+import getBeerPostById from '@/services/posts/BeerPost/getBeerPostById';
+import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult';
 import EditBeerPostForm from '@/components/EditBeerPostForm';
 import FormPageLayout from '@/components/ui/forms/FormPageLayout';
 import { BiBeer } from 'react-icons/bi';

src/pages/beers/[id]/index.tsx

@@ -1,8 +1,8 @@
 import { NextPage, GetServerSideProps } from 'next';
 import Head from 'next/head';
-import getBeerPostById from '@/services/BeerPost/getBeerPostById';
+import getBeerPostById from '@/services/posts/BeerPost/getBeerPostById';
 
-import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
+import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult';
 
 import { z } from 'zod';
 

src/pages/beers/styles/[id]/index.tsx

@@ -5,9 +5,9 @@ import { z } from 'zod';
 
 import useMediaQuery from '@/hooks/utilities/useMediaQuery';
 import { Tab } from '@headlessui/react';
-import getBeerStyleById from '@/services/BeerStyles/getBeerStyleById';
+import getBeerStyleById from '@/services/posts/BeerStyles/getBeerStyleById';
 import BeerStyleHeader from '@/components/BeerStyleById/BeerStyleHeader';
-import BeerStyleQueryResult from '@/services/BeerStyles/schema/BeerStyleQueryResult';
+import BeerStyleQueryResult from '@/services/posts/BeerStyles/schema/BeerStyleQueryResult';
 import BeerStyleCommentSection from '@/components/BeerStyleById/BeerStyleCommentSection';
 import BeerStyleBeerSection from '@/components/BeerStyleById/BeerStyleBeerSection';
 

src/pages/breweries/[id]/beers/create.tsx

@@ -3,12 +3,12 @@ import FormPageLayout from '@/components/ui/forms/FormPageLayout';
 
 import withPageAuthRequired from '@/util/withPageAuthRequired';
 import DBClient from '@/prisma/DBClient';
-import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult';
+import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult';
 import { BeerStyle } from '@prisma/client';
 import { NextPage } from 'next';
 import { BiBeer } from 'react-icons/bi';
 import { z } from 'zod';
-import getBreweryPostById from '@/services/BreweryPost/getBreweryPostById';
+import getBreweryPostById from '@/services/posts/BreweryPost/getBreweryPostById';
 
 interface CreateBeerPageProps {
   brewery: z.infer<typeof BreweryPostQueryResult>;

src/pages/breweries/[id]/edit.tsx

@@ -5,9 +5,9 @@ import FormPageLayout from '@/components/ui/forms/FormPageLayout';
 import FormSegment from '@/components/ui/forms/FormSegment';
 import FormTextArea from '@/components/ui/forms/FormTextArea';
 import FormTextInput from '@/components/ui/forms/FormTextInput';
-import getBreweryPostById from '@/services/BreweryPost/getBreweryPostById';
-import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult';
-import EditBreweryPostValidationSchema from '@/services/BreweryPost/schema/EditBreweryPostValidationSchema';
+import getBreweryPostById from '@/services/posts/BreweryPost/getBreweryPostById';
+import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult';
+import EditBreweryPostValidationSchema from '@/services/posts/BreweryPost/schema/EditBreweryPostValidationSchema';
 import withPageAuthRequired from '@/util/withPageAuthRequired';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { NextPage } from 'next';

src/pages/breweries/[id]/index.tsx

@@ -1,5 +1,5 @@
-import getBreweryPostById from '@/services/BreweryPost/getBreweryPostById';
-import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult';
+import getBreweryPostById from '@/services/posts/BreweryPost/getBreweryPostById';
+import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult';
 import { GetServerSideProps, NextPage } from 'next';
 
 import { z } from 'zod';

src/pages/breweries/index.tsx

@@ -3,7 +3,7 @@ import LoadingCard from '@/components/ui/LoadingCard';
 import Spinner from '@/components/ui/Spinner';
 import UserContext from '@/contexts/UserContext';
 import useBreweryPosts from '@/hooks/data-fetching/brewery-posts/useBreweryPosts';
-import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult';
+import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult';
 import { NextPage } from 'next';
 import Head from 'next/head';
 import { useContext, MutableRefObject, useRef } from 'react';

src/pages/breweries/map.tsx

@@ -7,7 +7,7 @@ import LocationMarker from '@/components/ui/LocationMarker';
 import Link from 'next/link';
 import Head from 'next/head';
 import useGeolocation from '@/hooks/utilities/useGeolocation';
-import BreweryPostMapQueryResult from '@/services/BreweryPost/schema/BreweryPostMapQueryResult';
+import BreweryPostMapQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostMapQueryResult';
 import { z } from 'zod';
 import useBreweryMapPagePosts from '@/hooks/data-fetching/brewery-posts/useBreweryMapPagePosts';
 import ControlPanel from '@/components/ui/maps/ControlPanel';

src/pages/users/[id].tsx

@@ -1,6 +1,6 @@
 import useMediaQuery from '@/hooks/utilities/useMediaQuery';
-import findUserById from '@/services/User/findUserById';
-import GetUserSchema from '@/services/User/schema/GetUserSchema';
+import findUserById from '@/services/users/User/findUserById';
+import GetUserSchema from '@/services/users/User/schema/GetUserSchema';
 
 import Head from 'next/head';
 import { FC } from 'react';

src/pages/users/account/edit-profile.tsx

@@ -21,7 +21,7 @@ import UpdateProfileForm from '@/components/Account/UpdateProfileForm';
 import useGetUsersFollowedByUser from '@/hooks/data-fetching/user-follows/useGetUsersFollowedByUser';
 import useGetUsersFollowingUser from '@/hooks/data-fetching/user-follows/useGetUsersFollowingUser';
 
-import UpdateProfileSchema from '@/services/User/schema/UpdateProfileSchema';
+import UpdateProfileSchema from '@/services/users/User/schema/UpdateProfileSchema';
 import sendUpdateUserAvatarRequest from '@/requests/Account/sendUpdateUserAvatarRequest';
 import sendUpdateUserProfileRequest from '@/requests/Account/sendUpdateUserProfileRequest';
 import Spinner from '@/components/ui/Spinner';

src/pages/users/forgot-password.tsx

@@ -4,7 +4,7 @@ import FormInfo from '@/components/ui/forms/FormInfo';
 import FormLabel from '@/components/ui/forms/FormLabel';
 import FormSegment from '@/components/ui/forms/FormSegment';
 import FormTextInput from '@/components/ui/forms/FormTextInput';
-import { BaseCreateUserSchema } from '@/services/User/schema/CreateUserValidationSchemas';
+import { BaseCreateUserSchema } from '@/services/users/User/schema/CreateUserValidationSchemas';
 import createErrorToast from '@/util/createErrorToast';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { NextPage } from 'next';

src/pages/users/reset-password.tsx

@@ -1,7 +1,7 @@
 import { setLoginSession } from '@/config/auth/session';
 import { verifyResetPasswordToken } from '@/config/jwt';
 import ServerError from '@/config/util/ServerError';
-import findUserById from '@/services/User/findUserById';
+import findUserById from '@/services/users/User/findUserById';
 
 import { GetServerSideProps, NextApiResponse, NextPage } from 'next';
 

src/prisma/seed/create/createAdminUser.ts

@@ -4,7 +4,7 @@ import { hashPassword } from '../../../config/auth/passwordFns';
 import { ADMIN_PASSWORD } from '../../../config/env';
 
 import DBClient from '../../DBClient';
-import GetUserSchema from '../../../services/User/schema/GetUserSchema';
+import GetUserSchema from '../../../services/users/User/schema/GetUserSchema';
 import imageUrls from '../util/imageUrls';
 
 const createAdminUser = async () => {

src/requests/Account/sendUpdateUserProfileRequest.ts

@@ -1,4 +1,4 @@
-import UpdateProfileSchema from '@/services/User/schema/UpdateProfileSchema';
+import UpdateProfileSchema from '@/services/users/User/schema/UpdateProfileSchema';
 import { z } from 'zod';
 
 interface UpdateProfileRequestParams {

src/requests/BeerImage/sendUploadBeerImageRequest.ts

@@ -1,4 +1,4 @@
-import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
+import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import { z } from 'zod';
 

src/requests/BeerPost/sendCreateBeerPostRequest.ts

@@ -1,5 +1,5 @@
-import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
-import CreateBeerPostValidationSchema from '@/services/BeerPost/schema/CreateBeerPostValidationSchema';
+import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult';
+import CreateBeerPostValidationSchema from '@/services/posts/BeerPost/schema/CreateBeerPostValidationSchema';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import { z } from 'zod';
 

src/requests/BeerPost/sendEditBeerPostRequest.ts

@@ -1,4 +1,4 @@
-import EditBeerPostValidationSchema from '@/services/BeerPost/schema/EditBeerPostValidationSchema';
+import EditBeerPostValidationSchema from '@/services/posts/BeerPost/schema/EditBeerPostValidationSchema';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import { z } from 'zod';
 

src/requests/BreweryImage/sendUploadBreweryImageRequest.ts

@@ -1,4 +1,4 @@
-import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult';
+import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult';
 import { z } from 'zod';
 
 interface SendUploadBeerImagesRequestArgs {

src/requests/BreweryPost/sendCreateBreweryPostRequest.ts

@@ -1,5 +1,5 @@
-import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult';
-import CreateBreweryPostSchema from '@/services/BreweryPost/schema/CreateBreweryPostSchema';
+import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult';
+import CreateBreweryPostSchema from '@/services/posts/BreweryPost/schema/CreateBreweryPostSchema';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import { z } from 'zod';
 

src/requests/User/sendEditUserRequest.ts

@@ -1,4 +1,4 @@
-import GetUserSchema from '@/services/User/schema/GetUserSchema';
+import GetUserSchema from '@/services/users/User/schema/GetUserSchema';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import { z } from 'zod';
 

src/requests/User/sendRegisterUserRequest.ts

@@ -1,5 +1,5 @@
-import { CreateUserValidationSchema } from '@/services/User/schema/CreateUserValidationSchemas';
-import GetUserSchema from '@/services/User/schema/GetUserSchema';
+import { CreateUserValidationSchema } from '@/services/users/User/schema/CreateUserValidationSchemas';
+import GetUserSchema from '@/services/users/User/schema/GetUserSchema';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import { z } from 'zod';
 

src/requests/User/sendUpdatePasswordRequest.ts

@@ -1,4 +1,4 @@
-import { UpdatePasswordSchema } from '@/services/User/schema/CreateUserValidationSchemas';
+import { UpdatePasswordSchema } from '@/services/users/User/schema/CreateUserValidationSchemas';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import { z } from 'zod';
 

src/services/comments/BeerComment/createNewBeerComment.ts

@@ -1,7 +1,7 @@
 import DBClient from '@/prisma/DBClient';
 import { z } from 'zod';
-import CreateCommentValidationSchema from '../schema/CommentSchema/CreateCommentValidationSchema';
-import CommentQueryResult from '../schema/CommentSchema/CommentQueryResult';
+import CreateCommentValidationSchema from '../../schema/CommentSchema/CreateCommentValidationSchema';
+import CommentQueryResult from '../../schema/CommentSchema/CommentQueryResult';
 
 const CreateNewBeerCommentServiceSchema = CreateCommentValidationSchema.extend({
   userId: z.string().cuid(),

src/services/comments/BeerComment/editBeerCommentById.ts

@@ -1,6 +1,6 @@
 import DBClient from '@/prisma/DBClient';
 import { z } from 'zod';
-import CommentQueryResult from '../schema/CommentSchema/CommentQueryResult';
+import CommentQueryResult from '../../schema/CommentSchema/CommentQueryResult';
 
 interface EditBeerCommentByIdArgs {
   id: string;

src/services/comments/BeerComment/findBeerCommentById.ts

@@ -1,6 +1,6 @@
 import DBClient from '@/prisma/DBClient';
 import { z } from 'zod';
-import CommentQueryResult from '../schema/CommentSchema/CommentQueryResult';
+import CommentQueryResult from '../../schema/CommentSchema/CommentQueryResult';
 
 interface FindBeerCommentArgs {
   beerCommentId: string;

src/services/comments/BeerComment/getAllBeerComments.ts

@@ -1,6 +1,6 @@
 import DBClient from '@/prisma/DBClient';
 import { z } from 'zod';
-import CommentQueryResult from '../schema/CommentSchema/CommentQueryResult';
+import CommentQueryResult from '../../schema/CommentSchema/CommentQueryResult';
 
 interface GetAllBeerCommentsArgs {
   beerPostId: string;

src/services/comments/BeerStyleComment/createNewBeerStyleComment.ts

@@ -1,7 +1,7 @@
 import DBClient from '@/prisma/DBClient';
 import { z } from 'zod';
-import CreateCommentValidationSchema from '../schema/CommentSchema/CreateCommentValidationSchema';
-import CommentQueryResult from '../schema/CommentSchema/CommentQueryResult';
+import CreateCommentValidationSchema from '../../schema/CommentSchema/CreateCommentValidationSchema';
+import CommentQueryResult from '../../schema/CommentSchema/CommentQueryResult';
 
 const CreateNewBeerStyleCommentServiceSchema = CreateCommentValidationSchema.extend({
   userId: z.string().cuid(),