erDetails(userData)

diff --git a/apps/platform/.eslintrc.cjs b/apps/platform/.eslintrc.cjs
index 28a8b27..fa9233a 100644
--- a/apps/platform/.eslintrc.cjs
+++ b/apps/platform/.eslintrc.cjs
@@ -7,24 +7,13 @@ module.exports = {
   },
   rules: {
     'import/no-extraneous-dependencies': 0,
-    '@typescript-eslint/interface-name-prefix': 'off',
     '@typescript-eslint/explicit-function-return-type': 'off',
     '@typescript-eslint/explicit-module-boundary-types': 'off',
-    '@typescript-eslint/no-explicit-any': 'off',
     '@typescript-eslint/no-unused-vars': ['warn'],
-    '@typescript-eslint/no-unsafe-call': 'off',
-    '@typescript-eslint/no-unsafe-return': 'off',
     '@typescript-eslint/space-before-function-paren': 'off',
     '@typescript-eslint/strict-boolean-expressions': 'off',
-    '@typescript-eslint/prefer-nullish-coalescing': 'off',
-    'space-before-function-paren': 'off',
-    '@typescript-eslint/member-delimiter-style': 'off',
     '@typescript-eslint/no-confusing-void-expression': 'off',
     '@typescript-eslint/no-floating-promises': 'off',
-    '@typescript-eslint/no-misused-promises': 'off',
-    '@typescript-eslint/no-unsafe-assignment': 'off',
-    '@typescript-eslint/no-unsafe-member-access': 'off',
-    '@typescript-eslint/no-unsafe-argument': 'off',
-    '@typescript-eslint/no-unnecessary-condition': 'off'
+    '@typescript-eslint/no-misused-promises': 'off'
   }
 }
diff --git a/apps/platform/src/app/(main)/page.tsx b/apps/platform/src/app/(main)/page.tsx
index fe8fa2a..9a9cb2a 100644
--- a/apps/platform/src/app/(main)/page.tsx
+++ b/apps/platform/src/app/(main)/page.tsx
@@ -6,7 +6,6 @@ import type {
   ProjectWithCount,
   Workspace
 } from '@keyshade/schema'
-import { ProjectController } from '@keyshade/api-client'
 import { AddSVG } from '@public/svg/shared'
 import { FolderSVG } from '@public/svg/dashboard'
 import ProjectCard from '@/components/dashboard/projectCard'
@@ -38,6 +37,7 @@ import {
   DialogHeader,
   DialogTrigger
 } from '@/components/ui/dialog'
+import ControllerInstance from '@/lib/controller-instance'
 
 export default function Index(): JSX.Element {
   const [isSheetOpen, setIsSheetOpen] = useState<boolean>(false)
@@ -76,16 +76,13 @@ export default function Index(): JSX.Element {
   // If a workspace is selected, we want to fetch all the projects
   // under that workspace and display it in the dashboard.
   useEffect(() => {
-    const projectController = new ProjectController(
-      process.env.NEXT_PUBLIC_BACKEND_URL
-    )
-
     async function getAllProjects() {
       if (currentWorkspace) {
-        const { success, error, data } = await projectController.getAllProjects(
-          { workspaceSlug: currentWorkspace.slug },
-          {}
-        )
+        const { success, error, data } =
+          await ControllerInstance.getInstance().projectController.getAllProjects(
+            { workspaceSlug: currentWorkspace.slug },
+            {}
+          )
 
         if (success && data) {
           setProjects(data.items)
@@ -105,16 +102,13 @@ export default function Index(): JSX.Element {
   // Function to create a new project
   const createNewProject = useCallback(async () => {
     if (currentWorkspace) {
-      const projectController = new ProjectController(
-        process.env.NEXT_PUBLIC_BACKEND_URL
-      )
-
       newProjectData.workspaceSlug = currentWorkspace.slug
 
-      const { data, error, success } = await projectController.createProject(
-        newProjectData,
-        {}
-      )
+      const { data, error, success } =
+        await ControllerInstance.getInstance().projectController.createProject(
+          newProjectData,
+          {}
+        )
 
       if (success && data) {
         setProjects([
diff --git a/apps/platform/src/app/(main)/project/[project]/@secret/page.tsx b/apps/platform/src/app/(main)/project/[project]/@secret/page.tsx
index 18134ab..e1bd8e6 100644
--- a/apps/platform/src/app/(main)/project/[project]/@secret/page.tsx
+++ b/apps/platform/src/app/(main)/project/[project]/@secret/page.tsx
@@ -5,6 +5,7 @@ import { usePathname } from 'next/navigation'
 import dayjs, { extend } from 'dayjs'
 import relativeTime from 'dayjs/plugin/relativeTime'
 import { NoteIconSVG } from '@public/svg/secret'
+import type { GetAllSecretsOfProjectResponse } from '@keyshade/schema'
 import {
   Accordion,
   AccordionContent,
@@ -19,8 +20,6 @@ import {
   TableHeader,
   TableRow
 } from '@/components/ui/table'
-import type { Secret } from '@keyshade/schema'
-import { SecretController } from '@keyshade/api-client'
 import { ScrollArea } from '@/components/ui/scroll-area'
 import {
   Tooltip,
@@ -29,31 +28,28 @@ import {
   TooltipTrigger
 } from '@/components/ui/tooltip'
 import { Skeleton } from '@/components/ui/skeleton'
+import ControllerInstance from '@/lib/controller-instance'
 
 extend(relativeTime)
 
 function SecretPage(): React.JSX.Element {
-  const [allSecrets, setAllSecrets] = useState<Secret[]>()
+  const [allSecrets, setAllSecrets] =
+    useState<GetAllSecretsOfProjectResponse['items']>()
   const [isLoading, setIsLoading] = useState<boolean>(true)
   const pathname = usePathname()
 
   useEffect(() => {
     setIsLoading(true)
 
-    const secretController = new SecretController(
-      process.env.NEXT_PUBLIC_BACKEND_URL
-    )
-
     async function getAllSecretsByProjectSlug() {
       const { success, error, data } =
-        await secretController.getAllSecretsOfProject(
+        await ControllerInstance.getInstance().secretController.getAllSecretsOfProject(
           { projectSlug: pathname.split('/')[2] },
           {}
         )
 
       if (success && data) {
-        //@ts-ignore
-        setAllSecrets(data)
+        setAllSecrets(data.items)
       } else {
         // eslint-disable-next-line no-console -- we need to log the error
         console.error(error)
@@ -68,9 +64,9 @@ function SecretPage(): React.JSX.Element {
   if (isLoading) {
     return (
       <div className="space-y-4">
-        <SerectLoader />
-        <SerectLoader />
-        <SerectLoader />
+        <SecretLoader />
+        <SecretLoader />
+        <SecretLoader />
       </div>
     )
   }
@@ -82,7 +78,7 @@ function SecretPage(): React.JSX.Element {
         collapsible
         type="single"
       >
-        {allSecrets?.map((secret) => {
+        {allSecrets?.map(({ secret, values }) => {
           return (
             <AccordionItem
               className="rounded-xl bg-white/5 px-5"
@@ -126,7 +122,7 @@ function SecretPage(): React.JSX.Element {
                     </TableRow>
                   </TableHeader>
                   <TableBody>
-                    {secret.versions.map((value) => {
+                    {values.map((value) => {
                       return (
                         <TableRow key={value.environment.id}>
                           <TableCell>{value.environment.slug}</TableCell>
@@ -147,7 +143,7 @@ function SecretPage(): React.JSX.Element {
   )
 }
 
-function SerectLoader(): React.JSX.Element {
+function SecretLoader(): React.JSX.Element {
   return (
     <div className=" rounded-xl bg-white/5 p-4">
       <div className="flex justify-between">
diff --git a/apps/platform/src/app/(main)/project/[project]/layout.tsx b/apps/platform/src/app/(main)/project/[project]/layout.tsx
index 1eb511b..9edfb0b 100644
--- a/apps/platform/src/app/(main)/project/[project]/layout.tsx
+++ b/apps/platform/src/app/(main)/project/[project]/layout.tsx
@@ -2,6 +2,7 @@
 import { useEffect, useState } from 'react'
 import { useSearchParams } from 'next/navigation'
 import { AddSVG } from '@public/svg/shared'
+import type { Project } from '@keyshade/schema'
 import { Button } from '@/components/ui/button'
 import {
   Dialog,
@@ -13,8 +14,7 @@ import {
 } from '@/components/ui/dialog'
 import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
-import { ProjectController } from '@keyshade/api-client'
-import type { Project } from '@keyshade/schema'
+import ControllerInstance from '@/lib/controller-instance'
 
 interface DetailedProjectPageProps {
   params: { project: string }
@@ -38,29 +38,22 @@ function DetailedProjectPage({
   const tab = searchParams.get('tab') ?? 'rollup-details'
 
   useEffect(() => {
+    async function getProjectBySlug() {
+      const { success, error, data } =
+        await ControllerInstance.getInstance().projectController.getProject(
+          { projectSlug: params.project },
+          {}
+        )
 
-    const projectController = new ProjectController(
-      process.env.NEXT_PUBLIC_BACKEND_URL
-    )
-
-    async function getProjectBySlug(){
-      const {success, error, data} = await projectController.getProject(
-        {projectSlug: params.project},
-        {}
-      )
-
-      if( success && data ){
-        //@ts-ignore
+      if (success && data) {
         setCurrentProject(data)
-      }
-      else{
+      } else {
         // eslint-disable-next-line no-console -- we need to log the error
         console.error(error)
       }
     }
 
     getProjectBySlug()
-
   }, [params.project])
 
   return (
diff --git a/apps/platform/src/app/(main)/settings/@profile/page.tsx b/apps/platform/src/app/(main)/settings/@profile/page.tsx
index 21de60b..4559ec6 100644
--- a/apps/platform/src/app/(main)/settings/@profile/page.tsx
+++ b/apps/platform/src/app/(main)/settings/@profile/page.tsx
@@ -1,54 +1,52 @@
 'use client'
-import React, { useEffect, useState } from 'react'
+import React, { useCallback, useEffect, useState } from 'react'
 import { toast } from 'sonner'
-import type { User } from '@keyshade/schema'
 import InputLoading from './loading'
 import { Input } from '@/components/ui/input'
 import { Separator } from '@/components/ui/separator'
+import ControllerInstance from '@/lib/controller-instance'
 import { Button } from '@/components/ui/button'
-import { apiClient } from '@/lib/api-client'
-
-type UserData = Omit<
-  User,
-  'id' | 'isActive' | 'isOnboardingFinished' | 'isAdmin' | 'authProvider'
->
-async function getUserDetails(): Promise<User | undefined> {
-  try {
-    return await apiClient.get<User>('/user')
-  } catch (error) {
-    // eslint-disable-next-line no-console -- we need to log the error
-    console.error(error)
-  }
-}
-
-async function updateUserDetails(userData: UserData): Promise<void> {
-  try {
-    await apiClient.put<User>('/user', userData)
-  } catch (error) {
-    // eslint-disable-next-line no-console -- we need to log the error
-    console.error(error)
-  }
-}
 
 function ProfilePage(): React.JSX.Element {
   const [isLoading, setIsLoading] = useState<boolean>(true)
-  const [userData, setUserData] = useState<UserData>({
+  const [userData, setUserData] = useState({
     email: '',
     name: '',
     profilePictureUrl: ''
   })
   const [isModified, setIsModified] = useState<boolean>(false)
 
+  const updateSelf = useCallback(async () => {
+    try {
+      await ControllerInstance.getInstance().userController.updateSelf(
+        {
+          name: userData.name,
+          email: userData.email
+        },
+        {}
+      )
+      toast.success('Profile updated successfully')
+    } catch (error) {
+      // eslint-disable-next-line no-console -- we need to log the error
+      console.error(error)
+    }
+    setIsModified(false)
+  }, [userData])
+
   useEffect(() => {
-    getUserDetails()
-      .then((data) => {
-        if (data) {
+    ControllerInstance.getInstance()
+      .userController.getSelf()
+      .then(({ data, success, error }) => {
+        if (success && data) {
           setUserData({
             email: data.email,
-            name: data.name ?? '',
-            profilePictureUrl: data.profilePictureUrl
+            name: data.name,
+            profilePictureUrl: data.profilePictureUrl || ''
           })
           setIsLoading(false)
+        } else {
+          // eslint-disable-next-line no-console -- we need to log the error
+          console.error(error)
         }
       })
       .catch((error) => {
@@ -67,7 +65,7 @@ function ProfilePage(): React.JSX.Element {
             Upload a picture to change your avatar across Keyshade.
           </span>
         </div>
-        <div className="aspect-square w-[5rem] rounded-full bg-gray-600" />{' '}
+        <div className="aspect-square w-[5rem] rounded-full bg-gray-600" />
         {/* //! This is will be replaced by an image tag */}
       </div>
       {/* Name */}
@@ -114,20 +112,7 @@ function ProfilePage(): React.JSX.Element {
         )}
       </div>
       <div>
-        <Button
-          disabled={!isModified}
-          onClick={() => {
-            updateUserDetails(userData)
-              .then(() => {
-                toast.success('User details updated successfully')
-              })
-              .catch(() => {
-                toast.error('Failed to update user details')
-              })
-            setIsModified(false)
-          }}
-          variant="secondary"
-        >
+        <Button disabled={!isModified} onClick={updateSelf} variant="secondary">
           Save Changes
         </Button>
       </div>
diff --git a/apps/platform/src/components/shared/sidebar/index.tsx b/apps/platform/src/components/shared/sidebar/index.tsx
index ee7cd9b..7da768b 100644
--- a/apps/platform/src/components/shared/sidebar/index.tsx
+++ b/apps/platform/src/components/shared/sidebar/index.tsx
@@ -6,8 +6,8 @@ import {
   SettingsSVG,
   TeamSVG
 } from '@public/svg/shared'
-import { Combobox } from '@/components/ui/combobox'
 import SidebarTab from './sidebarTab'
+import { Combobox } from '@/components/ui/combobox'
 
 function Sidebar(): JSX.Element {
   const sidebarTabData = [
diff --git a/apps/platform/src/components/ui/combobox.tsx b/apps/platform/src/components/ui/combobox.tsx
index b3107dc..8414098 100644
--- a/apps/platform/src/components/ui/combobox.tsx
+++ b/apps/platform/src/components/ui/combobox.tsx
@@ -5,27 +5,6 @@ import { useEffect, useState } from 'react'
 import { useRouter } from 'next/navigation'
 import { toast } from 'sonner'
 import { AddSVG } from '@public/svg/shared'
-import { cn } from '@/lib/utils'
-import {
-  Command,
-  CommandEmpty,
-  CommandInput,
-  CommandItem,
-  CommandList
-} from '@/components/ui/command'
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger
-} from '@/components/ui/popover'
-import { apiClient } from '@/lib/api-client'
-// import type { Workspace } from '@/types'
-import { zWorkspace } from '@/types'
-import {
-  getCurrentWorkspace,
-  setCurrentWorkspace,
-  setWorkspace
-} from '@/lib/workspace-storage'
 import type { Workspace } from '@keyshade/schema'
 import { Input } from './input'
 import { Label } from './label'
@@ -38,39 +17,43 @@ import {
   DialogTrigger
 } from './dialog'
 import { Button } from './button'
-import { WorkspaceSchema } from '@keyshade/schema/schemas'
-
-interface WorkspaceResponse {
-  items: Workspace[]
-  metadata: {
-    page: number
-    perPage: number
-    pageCount: number
-    totalCount: number
-    links: {
-      self: string
-      first: string
-      previous: string | null
-      next: string | null
-      last: string
-    }
-  }
-}
+import {
+  getCurrentWorkspace,
+  setCurrentWorkspace,
+  setWorkspace
+} from '@/lib/workspace-storage'
+import { cn } from '@/lib/utils'
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger
+} from '@/components/ui/popover'
+import {
+  Command,
+  CommandEmpty,
+  CommandInput,
+  CommandItem,
+  CommandList
+} from '@/components/ui/command'
+import ControllerInstance from '@/lib/controller-instance'
 
 async function getAllWorkspace(): Promise<Workspace[] | undefined> {
   try {
-    const workspaceData: WorkspaceResponse =
-      await apiClient.get<WorkspaceResponse>('/workspace')
+    const { data, success, error } =
+      await ControllerInstance.getInstance().workspaceController.getWorkspacesOfUser(
+        {},
+        {}
+      )
 
-    // TODO: We are getting error here from the success flag, need to see this again
-    // const { success, data } = WorkspaceSchema.array().safeParse(workspaceData.items)
-    // if (!success) {
-    //   throw new Error('Invalid data')
-    // }
+    if (error) {
+      // eslint-disable-next-line no-console -- we need to log the error
+      console.error(error)
+      return undefined
+    }
 
-    return workspaceData.items
-    // return data
-    // return workspaceData;
+    if (success && data) {
+      return data.items
+    }
   } catch (error) {
     // eslint-disable-next-line no-console -- we need to log the error
     console.error(error)
@@ -92,9 +75,13 @@ export function Combobox(): React.JSX.Element {
     }
     setIsNameEmpty(false)
     try {
-      const response = await apiClient.post<Workspace>('/workspace', {
-        name
-      })
+      const response =
+        await ControllerInstance.getInstance().workspaceController.createWorkspace(
+          {
+            name
+          },
+          {}
+        )
       setCurrentWorkspace(response)
       setOpen(false)
     } catch (error) {
diff --git a/apps/platform/src/lib/controller-instance.ts b/apps/platform/src/lib/controller-instance.ts
index fe432b7..a766038 100644
--- a/apps/platform/src/lib/controller-instance.ts
+++ b/apps/platform/src/lib/controller-instance.ts
@@ -1,30 +1,90 @@
-import { AuthController } from '@keyshade/api-client'
+import {
+  AuthController,
+  EnvironmentController,
+  ProjectController,
+  SecretController,
+  UserController,
+  VariableController,
+  WorkspaceController,
+  WorkspaceMembershipController,
+  WorkspaceRoleController
+} from '@keyshade/api-client'
 
 export default class ControllerInstance {
   private static instance: ControllerInstance | null
 
-  private _authController: AuthController | null = null
+  private _authController: AuthController
+  private _userController: UserController
+  private _workspaceController: WorkspaceController
+  private _workspaceMembershipController: WorkspaceMembershipController
+  private _workspaceRoleController: WorkspaceRoleController
+  private _projectController: ProjectController
+  private _environmentController: EnvironmentController
+  private _secretController: SecretController
+  private _variableController: VariableController
 
   get authController(): AuthController {
-    if (!this._authController) {
-      throw new Error('ControllerInstance not initialized')
-    }
     return this._authController
   }
 
-  static initialize(baseUrl: string): void {
-    if (!ControllerInstance.instance) {
-      const instance = new ControllerInstance()
+  get workspaceController(): WorkspaceController {
+    return this._workspaceController
+  }
+
+  get workspaceMembershipController(): WorkspaceMembershipController {
+    return this._workspaceMembershipController
+  }
 
-      instance._authController = new AuthController(baseUrl)
+  get workspaceRoleController(): WorkspaceRoleController {
+    return this._workspaceRoleController
+  }
 
-      ControllerInstance.instance = instance
-    }
+  get projectController(): ProjectController {
+    return this._projectController
+  }
+
+  get environmentController(): EnvironmentController {
+    return this._environmentController
+  }
+
+  get secretController(): SecretController {
+    return this._secretController
+  }
+
+  get variableController(): VariableController {
+    return this._variableController
+  }
+
+  get userController(): UserController {
+    return this._userController
   }
 
   static getInstance(): ControllerInstance {
     if (!ControllerInstance.instance) {
-      throw new Error('ControllerInstance not initialized')
+      ControllerInstance.instance = new ControllerInstance()
+      ControllerInstance.instance._authController = new AuthController(
+        process.env.NEXT_PUBLIC_BACKEND_URL
+      )
+      ControllerInstance.instance._userController = new UserController(
+        process.env.NEXT_PUBLIC_BACKEND_URL
+      )
+      ControllerInstance.instance._workspaceController =
+        new WorkspaceController(process.env.NEXT_PUBLIC_BACKEND_URL)
+      ControllerInstance.instance._workspaceMembershipController =
+        new WorkspaceMembershipController(process.env.NEXT_PUBLIC_BACKEND_URL)
+      ControllerInstance.instance._workspaceRoleController =
+        new WorkspaceRoleController(process.env.NEXT_PUBLIC_BACKEND_URL)
+      ControllerInstance.instance._projectController = new ProjectController(
+        process.env.NEXT_PUBLIC_BACKEND_URL
+      )
+      ControllerInstance.instance._environmentController =
+        new EnvironmentController(process.env.NEXT_PUBLIC_BACKEND_URL)
+      ControllerInstance.instance._secretController = new SecretController(
+        process.env.NEXT_PUBLIC_BACKEND_URL
+      )
+      ControllerInstance.instance._variableController = new VariableController(
+        process.env.NEXT_PUBLIC_BACKEND_URL
+      )
     }
     return ControllerInstance.instance
   }
diff --git a/packages/api-client/src/index.ts b/packages/api-client/src/index.ts
index 79ab5f6..edd344f 100644
--- a/packages/api-client/src/index.ts
+++ b/packages/api-client/src/index.ts
@@ -8,6 +8,7 @@ import WorkspaceController from '@api-client/controllers/workspace'
 import WorkspaceRoleController from '@api-client/controllers/workspace-role'
 import WorkspaceMembershipController from '@api-client/controllers/workspace-membership'
 import AuthController from '@api-client/controllers/auth'
+import UserController from '@api-client/controllers/user'
 export {
   EnvironmentController,
   SecretController,
@@ -18,5 +19,6 @@ export {
   WorkspaceController,
   WorkspaceRoleController,
   WorkspaceMembershipController,
-  AuthController
+  AuthController,
+  UserController
 }
diff --git a/packages/schema/src/secret/index.ts b/packages/schema/src/secret/index.ts
index ff5b499..4277679 100644
--- a/packages/schema/src/secret/index.ts
+++ b/packages/schema/src/secret/index.ts
@@ -100,15 +100,17 @@ export const GetAllSecretsOfProjectResponseSchema = PageResponseSchema(
         name: z.string()
       })
     }),
-    values: z.object({
-      environment: z.object({
-        id: z.string(),
-        name: z.string(),
-        slug: z.string()
-      }),
-      value: z.string(),
-      version: z.number()
-    })
+    values: z.array(
+      z.object({
+        environment: z.object({
+          id: z.string(),
+          name: z.string(),
+          slug: z.string()
+        }),
+        value: z.string(),
+        version: z.number()
+      })
+    )
   })
 )