diff --git a/frontend/src/AppRoutes/Private.tsx b/frontend/src/AppRoutes/Private.tsx
index c612ffe639..d1d5f87585 100644
--- a/frontend/src/AppRoutes/Private.tsx
+++ b/frontend/src/AppRoutes/Private.tsx
@@ -1,6 +1,6 @@
 import getLocalStorageApi from 'api/browser/localstorage/get';
 import setLocalStorageApi from 'api/browser/localstorage/set';
-import getOrgUser from 'api/user/getOrgUser';
+import getOrgUser from 'api/v1/user/getOrgUser';
 import { FeatureKeys } from 'constants/features';
 import { LOCALSTORAGE } from 'constants/localStorage';
 import ROUTES from 'constants/routes';
diff --git a/frontend/src/api/index.ts b/frontend/src/api/index.ts
index 8435bb37ff..25f2ad061d 100644
--- a/frontend/src/api/index.ts
+++ b/frontend/src/api/index.ts
@@ -2,7 +2,7 @@
 /* eslint-disable no-param-reassign */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import getLocalStorageApi from 'api/browser/localstorage/get';
-import loginApi from 'api/user/login';
+import loginApi from 'api/v1/user/login';
 import afterLogin from 'AppRoutes/utils';
 import axios, { AxiosResponse, InternalAxiosRequestConfig } from 'axios';
 import { ENVIRONMENT } from 'constants/env';
diff --git a/frontend/src/api/user/editOrg.ts b/frontend/src/api/organization/editOrg.ts
similarity index 100%
rename from frontend/src/api/user/editOrg.ts
rename to frontend/src/api/organization/editOrg.ts
diff --git a/frontend/src/api/user/getOrganization.ts b/frontend/src/api/organization/getOrganization.ts
similarity index 100%
rename from frontend/src/api/user/getOrganization.ts
rename to frontend/src/api/organization/getOrganization.ts
diff --git a/frontend/src/api/user/changeMyPassword.ts b/frontend/src/api/v1/factor_password/changeMyPassword.ts
similarity index 100%
rename from frontend/src/api/user/changeMyPassword.ts
rename to frontend/src/api/v1/factor_password/changeMyPassword.ts
diff --git a/frontend/src/api/user/getResetPasswordToken.ts b/frontend/src/api/v1/factor_password/getResetPasswordToken.ts
similarity index 100%
rename from frontend/src/api/user/getResetPasswordToken.ts
rename to frontend/src/api/v1/factor_password/getResetPasswordToken.ts
diff --git a/frontend/src/api/user/resetPassword.ts b/frontend/src/api/v1/factor_password/resetPassword.ts
similarity index 100%
rename from frontend/src/api/user/resetPassword.ts
rename to frontend/src/api/v1/factor_password/resetPassword.ts
diff --git a/frontend/src/api/user/inviteUsers.ts b/frontend/src/api/v1/invite/bulk/create.ts
similarity index 100%
rename from frontend/src/api/user/inviteUsers.ts
rename to frontend/src/api/v1/invite/bulk/create.ts
diff --git a/frontend/src/api/user/sendInvite.ts b/frontend/src/api/v1/invite/create.ts
similarity index 100%
rename from frontend/src/api/user/sendInvite.ts
rename to frontend/src/api/v1/invite/create.ts
diff --git a/frontend/src/api/user/getPendingInvites.ts b/frontend/src/api/v1/invite/getPendingInvites.ts
similarity index 100%
rename from frontend/src/api/user/getPendingInvites.ts
rename to frontend/src/api/v1/invite/getPendingInvites.ts
diff --git a/frontend/src/api/user/deleteInvite.ts b/frontend/src/api/v1/invite/id/delete.ts
similarity index 100%
rename from frontend/src/api/user/deleteInvite.ts
rename to frontend/src/api/v1/invite/id/delete.ts
diff --git a/frontend/src/api/user/getInviteDetails.ts b/frontend/src/api/v1/invite/id/get.ts
similarity index 100%
rename from frontend/src/api/user/getInviteDetails.ts
rename to frontend/src/api/v1/invite/id/get.ts
diff --git a/frontend/src/api/login/login.ts b/frontend/src/api/v1/login/login.ts
similarity index 100%
rename from frontend/src/api/login/login.ts
rename to frontend/src/api/v1/login/login.ts
diff --git a/frontend/src/api/user/loginPrecheck.ts b/frontend/src/api/v1/login/loginPrecheck.ts
similarity index 100%
rename from frontend/src/api/user/loginPrecheck.ts
rename to frontend/src/api/v1/login/loginPrecheck.ts
diff --git a/frontend/src/api/user/signup.ts b/frontend/src/api/v1/register/signup.ts
similarity index 100%
rename from frontend/src/api/user/signup.ts
rename to frontend/src/api/v1/register/signup.ts
diff --git a/frontend/src/api/user/getOrgUser.ts b/frontend/src/api/v1/user/getOrgUser.ts
similarity index 100%
rename from frontend/src/api/user/getOrgUser.ts
rename to frontend/src/api/v1/user/getOrgUser.ts
diff --git a/frontend/src/api/user/deleteUser.ts b/frontend/src/api/v1/user/id/delete.ts
similarity index 100%
rename from frontend/src/api/user/deleteUser.ts
rename to frontend/src/api/v1/user/id/delete.ts
diff --git a/frontend/src/api/user/getUser.ts b/frontend/src/api/v1/user/id/get.ts
similarity index 100%
rename from frontend/src/api/user/getUser.ts
rename to frontend/src/api/v1/user/id/get.ts
diff --git a/frontend/src/api/user/getRoles.ts b/frontend/src/api/v1/user/id/getRoles.ts
similarity index 100%
rename from frontend/src/api/user/getRoles.ts
rename to frontend/src/api/v1/user/id/getRoles.ts
diff --git a/frontend/src/api/user/editUser.ts b/frontend/src/api/v1/user/id/update.ts
similarity index 100%
rename from frontend/src/api/user/editUser.ts
rename to frontend/src/api/v1/user/id/update.ts
diff --git a/frontend/src/api/user/updateRole.ts b/frontend/src/api/v1/user/id/updateRole.ts
similarity index 100%
rename from frontend/src/api/user/updateRole.ts
rename to frontend/src/api/v1/user/id/updateRole.ts
diff --git a/frontend/src/api/user/login.ts b/frontend/src/api/v1/user/login.ts
similarity index 100%
rename from frontend/src/api/user/login.ts
rename to frontend/src/api/v1/user/login.ts
diff --git a/frontend/src/api/user/getPreference.ts b/frontend/src/api/v1/user/preferences/get.ts
similarity index 90%
rename from frontend/src/api/user/getPreference.ts
rename to frontend/src/api/v1/user/preferences/get.ts
index b284eab47b..5a29113fa4 100644
--- a/frontend/src/api/user/getPreference.ts
+++ b/frontend/src/api/v1/user/preferences/get.ts
@@ -8,7 +8,7 @@ const getPreference = async (): Promise<
 	SuccessResponse<PayloadProps> | ErrorResponse
 > => {
 	try {
-		const response = await axios.get(`/userPreferences`);
+		const response = await axios.get(`/user/preferences`);
 
 		return {
 			statusCode: 200,
diff --git a/frontend/src/api/user/getLatestVersion.ts b/frontend/src/api/v1/version/getLatestVersion.ts
similarity index 100%
rename from frontend/src/api/user/getLatestVersion.ts
rename to frontend/src/api/v1/version/getLatestVersion.ts
diff --git a/frontend/src/api/user/getVersion.ts b/frontend/src/api/v1/version/getVersion.ts
similarity index 100%
rename from frontend/src/api/user/getVersion.ts
rename to frontend/src/api/v1/version/getVersion.ts
diff --git a/frontend/src/container/AppLayout/index.tsx b/frontend/src/container/AppLayout/index.tsx
index 126c46b05d..03accc56f0 100644
--- a/frontend/src/container/AppLayout/index.tsx
+++ b/frontend/src/container/AppLayout/index.tsx
@@ -9,8 +9,8 @@ import manageCreditCardApi from 'api/billing/manage';
 import getLocalStorageApi from 'api/browser/localstorage/get';
 import setLocalStorageApi from 'api/browser/localstorage/set';
 import logEvent from 'api/common/logEvent';
-import getUserLatestVersion from 'api/user/getLatestVersion';
-import getUserVersion from 'api/user/getVersion';
+import getUserLatestVersion from 'api/v1/version/getLatestVersion';
+import getUserVersion from 'api/v1/version/getVersion';
 import cx from 'classnames';
 import ChatSupportGateway from 'components/ChatSupportGateway/ChatSupportGateway';
 import OverlayScrollbar from 'components/OverlayScrollbar/OverlayScrollbar';
diff --git a/frontend/src/container/Login/index.tsx b/frontend/src/container/Login/index.tsx
index a2a10b184d..02cb4ef125 100644
--- a/frontend/src/container/Login/index.tsx
+++ b/frontend/src/container/Login/index.tsx
@@ -1,9 +1,9 @@
 import { Button, Form, Input, Space, Tooltip, Typography } from 'antd';
 import getLocalStorageApi from 'api/browser/localstorage/get';
 import setLocalStorageApi from 'api/browser/localstorage/set';
-import getUserVersion from 'api/user/getVersion';
-import loginApi from 'api/user/login';
-import loginPrecheckApi from 'api/user/loginPrecheck';
+import loginPrecheckApi from 'api/v1/login/loginPrecheck';
+import loginApi from 'api/v1/user/login';
+import getUserVersion from 'api/v1/version/getVersion';
 import afterLogin from 'AppRoutes/utils';
 import { LOCALSTORAGE } from 'constants/localStorage';
 import ROUTES from 'constants/routes';
diff --git a/frontend/src/container/MySettings/Password/index.tsx b/frontend/src/container/MySettings/Password/index.tsx
index 3a7885cdd9..bb2958bc90 100644
--- a/frontend/src/container/MySettings/Password/index.tsx
+++ b/frontend/src/container/MySettings/Password/index.tsx
@@ -1,5 +1,5 @@
 import { Button, Card, Space, Typography } from 'antd';
-import changeMyPassword from 'api/user/changeMyPassword';
+import changeMyPassword from 'api/v1/factor_password/changeMyPassword';
 import { useNotifications } from 'hooks/useNotifications';
 import { Save } from 'lucide-react';
 import { isPasswordNotValidMessage, isPasswordValid } from 'pages/SignUp/utils';
diff --git a/frontend/src/container/MySettings/UserInfo/index.tsx b/frontend/src/container/MySettings/UserInfo/index.tsx
index cfda747420..3bf38253f5 100644
--- a/frontend/src/container/MySettings/UserInfo/index.tsx
+++ b/frontend/src/container/MySettings/UserInfo/index.tsx
@@ -2,7 +2,7 @@ import '../MySettings.styles.scss';
 import './UserInfo.styles.scss';
 
 import { Button, Card, Flex, Input, Space, Typography } from 'antd';
-import editUser from 'api/user/editUser';
+import editUser from 'api/v1/user/id/update';
 import { useNotifications } from 'hooks/useNotifications';
 import { PencilIcon } from 'lucide-react';
 import { useAppContext } from 'providers/App/App';
diff --git a/frontend/src/container/OnboardingQuestionaire/InviteTeamMembers/InviteTeamMembers.tsx b/frontend/src/container/OnboardingQuestionaire/InviteTeamMembers/InviteTeamMembers.tsx
index def1cf979d..ec68855785 100644
--- a/frontend/src/container/OnboardingQuestionaire/InviteTeamMembers/InviteTeamMembers.tsx
+++ b/frontend/src/container/OnboardingQuestionaire/InviteTeamMembers/InviteTeamMembers.tsx
@@ -3,7 +3,7 @@ import './InviteTeamMembers.styles.scss';
 import { Color } from '@signozhq/design-tokens';
 import { Button, Input, Select, Typography } from 'antd';
 import logEvent from 'api/common/logEvent';
-import inviteUsers from 'api/user/inviteUsers';
+import inviteUsers from 'api/v1/invite/bulk/create';
 import { AxiosError } from 'axios';
 import { cloneDeep, debounce, isEmpty } from 'lodash-es';
 import {
diff --git a/frontend/src/container/OnboardingQuestionaire/OrgQuestions/OrgQuestions.tsx b/frontend/src/container/OnboardingQuestionaire/OrgQuestions/OrgQuestions.tsx
index e3cbf3db36..2e6749af74 100644
--- a/frontend/src/container/OnboardingQuestionaire/OrgQuestions/OrgQuestions.tsx
+++ b/frontend/src/container/OnboardingQuestionaire/OrgQuestions/OrgQuestions.tsx
@@ -4,7 +4,7 @@ import '../OnboardingQuestionaire.styles.scss';
 import { Color } from '@signozhq/design-tokens';
 import { Button, Input, Typography } from 'antd';
 import logEvent from 'api/common/logEvent';
-import editOrg from 'api/user/editOrg';
+import editOrg from 'api/organization/editOrg';
 import { useNotifications } from 'hooks/useNotifications';
 import { ArrowRight, CheckCircle, Loader2 } from 'lucide-react';
 import { useAppContext } from 'providers/App/App';
diff --git a/frontend/src/container/OnboardingV2Container/InviteTeamMembers/InviteTeamMembers.tsx b/frontend/src/container/OnboardingV2Container/InviteTeamMembers/InviteTeamMembers.tsx
index ba1f95d313..0634e5f0f4 100644
--- a/frontend/src/container/OnboardingV2Container/InviteTeamMembers/InviteTeamMembers.tsx
+++ b/frontend/src/container/OnboardingV2Container/InviteTeamMembers/InviteTeamMembers.tsx
@@ -3,7 +3,7 @@ import './InviteTeamMembers.styles.scss';
 import { Color } from '@signozhq/design-tokens';
 import { Button, Input, Select, Typography } from 'antd';
 import logEvent from 'api/common/logEvent';
-import inviteUsers from 'api/user/inviteUsers';
+import inviteUsers from 'api/v1/invite/bulk/create';
 import { AxiosError } from 'axios';
 import { cloneDeep, debounce, isEmpty } from 'lodash-es';
 import { ArrowRight, CheckCircle, Plus, TriangleAlert, X } from 'lucide-react';
diff --git a/frontend/src/container/OrganizationSettings/DisplayName/index.tsx b/frontend/src/container/OrganizationSettings/DisplayName/index.tsx
index c4726eacd1..9a28817856 100644
--- a/frontend/src/container/OrganizationSettings/DisplayName/index.tsx
+++ b/frontend/src/container/OrganizationSettings/DisplayName/index.tsx
@@ -1,5 +1,5 @@
 import { Button, Form, Input } from 'antd';
-import editOrg from 'api/user/editOrg';
+import editOrg from 'api/organization/editOrg';
 import { useNotifications } from 'hooks/useNotifications';
 import { useAppContext } from 'providers/App/App';
 import { IUser } from 'providers/App/types';
diff --git a/frontend/src/container/OrganizationSettings/EditMembersDetails/index.tsx b/frontend/src/container/OrganizationSettings/EditMembersDetails/index.tsx
index 7069b66db3..fb6364702b 100644
--- a/frontend/src/container/OrganizationSettings/EditMembersDetails/index.tsx
+++ b/frontend/src/container/OrganizationSettings/EditMembersDetails/index.tsx
@@ -1,6 +1,6 @@
 import { CopyOutlined } from '@ant-design/icons';
 import { Button, Input, Select, Space, Tooltip } from 'antd';
-import getResetPasswordToken from 'api/user/getResetPasswordToken';
+import getResetPasswordToken from 'api/v1/factor_password/getResetPasswordToken';
 import ROUTES from 'constants/routes';
 import { useNotifications } from 'hooks/useNotifications';
 import {
diff --git a/frontend/src/container/OrganizationSettings/InviteUserModal/InviteUserModal.tsx b/frontend/src/container/OrganizationSettings/InviteUserModal/InviteUserModal.tsx
index dff921184e..c04c46cb2b 100644
--- a/frontend/src/container/OrganizationSettings/InviteUserModal/InviteUserModal.tsx
+++ b/frontend/src/container/OrganizationSettings/InviteUserModal/InviteUserModal.tsx
@@ -1,7 +1,7 @@
 import { Button, Form, Modal } from 'antd';
 import { FormInstance } from 'antd/lib';
-import getPendingInvites from 'api/user/getPendingInvites';
-import sendInvite from 'api/user/sendInvite';
+import sendInvite from 'api/v1/invite/create';
+import getPendingInvites from 'api/v1/invite/getPendingInvites';
 import ROUTES from 'constants/routes';
 import { useNotifications } from 'hooks/useNotifications';
 import { useAppContext } from 'providers/App/App';
diff --git a/frontend/src/container/OrganizationSettings/Members/index.tsx b/frontend/src/container/OrganizationSettings/Members/index.tsx
index 48081f6a40..8a80088caa 100644
--- a/frontend/src/container/OrganizationSettings/Members/index.tsx
+++ b/frontend/src/container/OrganizationSettings/Members/index.tsx
@@ -1,9 +1,9 @@
 import { Button, Modal, Space, Typography } from 'antd';
 import { ColumnsType } from 'antd/lib/table';
-import deleteUser from 'api/user/deleteUser';
-import editUserApi from 'api/user/editUser';
-import getOrgUser from 'api/user/getOrgUser';
-import updateRole from 'api/user/updateRole';
+import getOrgUser from 'api/v1/user/getOrgUser';
+import deleteUser from 'api/v1/user/id/delete';
+import editUserApi from 'api/v1/user/id/update';
+import updateRole from 'api/v1/user/id/updateRole';
 import { ResizeTable } from 'components/ResizeTable';
 import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
 import dayjs from 'dayjs';
diff --git a/frontend/src/container/OrganizationSettings/PendingInvitesContainer/index.tsx b/frontend/src/container/OrganizationSettings/PendingInvitesContainer/index.tsx
index ff91e50e76..c08aa2c420 100644
--- a/frontend/src/container/OrganizationSettings/PendingInvitesContainer/index.tsx
+++ b/frontend/src/container/OrganizationSettings/PendingInvitesContainer/index.tsx
@@ -1,8 +1,8 @@
 import { PlusOutlined } from '@ant-design/icons';
 import { Button, Form, Space, Typography } from 'antd';
 import { ColumnsType } from 'antd/lib/table';
-import deleteInvite from 'api/user/deleteInvite';
-import getPendingInvites from 'api/user/getPendingInvites';
+import getPendingInvites from 'api/v1/invite/getPendingInvites';
+import deleteInvite from 'api/v1/invite/id/delete';
 import { ResizeTable } from 'components/ResizeTable';
 import { INVITE_MEMBERS_HASH } from 'constants/app';
 import ROUTES from 'constants/routes';
diff --git a/frontend/src/container/ResetPassword/ResetPassword.test.tsx b/frontend/src/container/ResetPassword/ResetPassword.test.tsx
index b3345fedf3..508877f25a 100644
--- a/frontend/src/container/ResetPassword/ResetPassword.test.tsx
+++ b/frontend/src/container/ResetPassword/ResetPassword.test.tsx
@@ -4,7 +4,7 @@ import { act } from 'react-dom/test-utils';
 
 import ResetPassword from './index';
 
-jest.mock('api/user/resetPassword', () => ({
+jest.mock('api/v1/factor_password/resetPassword', () => ({
 	__esModule: true,
 	default: jest.fn(),
 }));
diff --git a/frontend/src/container/ResetPassword/index.tsx b/frontend/src/container/ResetPassword/index.tsx
index f4be5310e2..e84d4edc00 100644
--- a/frontend/src/container/ResetPassword/index.tsx
+++ b/frontend/src/container/ResetPassword/index.tsx
@@ -1,6 +1,6 @@
 import { Button, Form, Input, Typography } from 'antd';
-import resetPasswordApi from 'api/user/resetPassword';
 import { Logout } from 'api/utils';
+import resetPasswordApi from 'api/v1/factor_password/resetPassword';
 import WelcomeLeftContainer from 'components/WelcomeLeftContainer';
 import ROUTES from 'constants/routes';
 import useDebouncedFn from 'hooks/useDebouncedFunction';
diff --git a/frontend/src/hooks/user/useGetUser.ts b/frontend/src/hooks/user/useGetUser.ts
index d645adda89..bf98f85801 100644
--- a/frontend/src/hooks/user/useGetUser.ts
+++ b/frontend/src/hooks/user/useGetUser.ts
@@ -1,4 +1,4 @@
-import getUser from 'api/user/getUser';
+import getUser from 'api/v1/user/id/get';
 import { useQuery, UseQueryResult } from 'react-query';
 import { ErrorResponse, SuccessResponse } from 'types/api';
 import { PayloadProps } from 'types/api/user/getUser';
diff --git a/frontend/src/pages/Login/index.tsx b/frontend/src/pages/Login/index.tsx
index 4da2baff74..40b6087d28 100644
--- a/frontend/src/pages/Login/index.tsx
+++ b/frontend/src/pages/Login/index.tsx
@@ -1,5 +1,5 @@
 import { Typography } from 'antd';
-import getUserVersion from 'api/user/getVersion';
+import getUserVersion from 'api/v1/version/getVersion';
 import Spinner from 'components/Spinner';
 import WelcomeLeftContainer from 'components/WelcomeLeftContainer';
 import LoginContainer from 'container/Login';
diff --git a/frontend/src/pages/ResetPassword/index.tsx b/frontend/src/pages/ResetPassword/index.tsx
index b40517b9ea..03eb173ca2 100644
--- a/frontend/src/pages/ResetPassword/index.tsx
+++ b/frontend/src/pages/ResetPassword/index.tsx
@@ -1,5 +1,5 @@
 import { Typography } from 'antd';
-import getUserVersion from 'api/user/getVersion';
+import getUserVersion from 'api/v1/version/getVersion';
 import Spinner from 'components/Spinner';
 import ResetPasswordContainer from 'container/ResetPassword';
 import { useAppContext } from 'providers/App/App';
diff --git a/frontend/src/pages/SignUp/SignUp.tsx b/frontend/src/pages/SignUp/SignUp.tsx
index 4705705e88..554e30f5f7 100644
--- a/frontend/src/pages/SignUp/SignUp.tsx
+++ b/frontend/src/pages/SignUp/SignUp.tsx
@@ -1,8 +1,8 @@
 import { Button, Form, Input, Typography } from 'antd';
 import logEvent from 'api/common/logEvent';
-import getInviteDetails from 'api/user/getInviteDetails';
-import loginApi from 'api/user/login';
-import signUpApi from 'api/user/signup';
+import getInviteDetails from 'api/v1/invite/id/get';
+import signUpApi from 'api/v1/register/signup';
+import loginApi from 'api/v1/user/login';
 import afterLogin from 'AppRoutes/utils';
 import WelcomeLeftContainer from 'components/WelcomeLeftContainer';
 import ROUTES from 'constants/routes';
diff --git a/frontend/src/pages/SignUp/index.tsx b/frontend/src/pages/SignUp/index.tsx
index 6d31799351..7bd27fbf13 100644
--- a/frontend/src/pages/SignUp/index.tsx
+++ b/frontend/src/pages/SignUp/index.tsx
@@ -1,5 +1,5 @@
 import { Typography } from 'antd';
-import getUserVersion from 'api/user/getVersion';
+import getUserVersion from 'api/v1/version/getVersion';
 import Spinner from 'components/Spinner';
 import { useAppContext } from 'providers/App/App';
 import { useTranslation } from 'react-i18next';
diff --git a/frontend/src/providers/EventSource.tsx b/frontend/src/providers/EventSource.tsx
index fa8f1fd223..376d53f72e 100644
--- a/frontend/src/providers/EventSource.tsx
+++ b/frontend/src/providers/EventSource.tsx
@@ -1,7 +1,7 @@
 import { apiV3 } from 'api/apiV1';
 import getLocalStorageApi from 'api/browser/localstorage/get';
-import loginApi from 'api/user/login';
 import { Logout } from 'api/utils';
+import loginApi from 'api/v1/user/login';
 import afterLogin from 'AppRoutes/utils';
 import { ENVIRONMENT } from 'constants/env';
 import { LIVE_TAIL_HEARTBEAT_TIMEOUT } from 'constants/liveTail';