diff --git a/src/api/endpoints.ts b/src/api/endpoints.ts
deleted file mode 100644
index 51512e22..00000000
--- a/src/api/endpoints.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-import { type EndpointBuilder as _EndpointBuilder } from "@reduxjs/toolkit/query/react"
-
-import {
-  buildUrl,
-  tagData,
-  type ListArg,
-  type ListResult,
-  type RetrieveArg,
-  type RetrieveResult,
-} from "../utils/api"
-import type { AuthFactor, Class, School, User } from "./models"
-import { type TagTypes } from "./tagTypes"
-import urls from "./urls"
-
-type EndpointBuilder = _EndpointBuilder<any, any, any>
-
-export function getReadUserEndpoints(build: EndpointBuilder) {
-  const tagType: TagTypes = "User"
-
-  return {
-    retrieveUser: build.query<
-      RetrieveResult<
-        User,
-        | "first_name"
-        | "last_name"
-        | "email"
-        | "is_active"
-        | "date_joined"
-        | "requesting_to_join_class"
-        | "student"
-        | "teacher"
-      >,
-      RetrieveArg<User>
-    >({
-      query: id => ({
-        url: buildUrl(urls.user.detail, { url: { id } }),
-        method: "GET",
-      }),
-      providesTags: tagData(tagType),
-    }),
-    listUsers: build.query<
-      ListResult<
-        User,
-        | "first_name"
-        | "last_name"
-        | "email"
-        | "is_active"
-        | "date_joined"
-        | "requesting_to_join_class"
-        | "student"
-        | "teacher"
-      >,
-      ListArg<{ students_in_class: string }>
-    >({
-      query: search => ({
-        url: buildUrl(urls.user.list, { search }),
-        method: "GET",
-      }),
-      providesTags: tagData(tagType),
-    }),
-  }
-}
-
-export function getReadSchoolEndpoints(build: EndpointBuilder) {
-  const tagType: TagTypes = "School"
-
-  return {
-    retrieveSchool: build.query<
-      RetrieveResult<School, "name" | "country" | "uk_county">,
-      RetrieveArg<School>
-    >({
-      query: id => ({
-        url: buildUrl(urls.school.detail, { url: { id } }),
-        method: "GET",
-      }),
-      providesTags: tagData(tagType),
-    }),
-  }
-}
-
-export function getReadClassEndpoints(build: EndpointBuilder) {
-  const tagType: TagTypes = "Class"
-
-  return {
-    retrieveClass: build.query<
-      RetrieveResult<
-        Class,
-        | "name"
-        | "read_classmates_data"
-        | "receive_requests_until"
-        | "school"
-        | "teacher"
-      >,
-      RetrieveArg<Class>
-    >({
-      query: id => ({
-        url: buildUrl(urls.class.detail, { url: { id } }),
-        method: "GET",
-      }),
-      providesTags: tagData(tagType),
-    }),
-    listClasses: build.query<
-      ListResult<
-        Class,
-        | "name"
-        | "read_classmates_data"
-        | "receive_requests_until"
-        | "school"
-        | "teacher"
-      >,
-      ListArg
-    >({
-      query: search => ({
-        url: buildUrl(urls.class.list, { search }),
-        method: "GET",
-      }),
-      providesTags: tagData(tagType),
-    }),
-  }
-}
-
-export function getReadAuthFactorEndpoints(build: EndpointBuilder) {
-  const tagType: TagTypes = "AuthFactor"
-
-  return {
-    listAuthFactors: build.query<ListResult<AuthFactor, "type">, ListArg>({
-      query: search => ({
-        url: buildUrl(urls.authFactor.list, { search }),
-        method: "GET",
-      }),
-      providesTags: tagData(tagType),
-    }),
-  }
-}
diff --git a/src/api/endpoints/authFactor.ts b/src/api/endpoints/authFactor.ts
new file mode 100644
index 00000000..4712baaa
--- /dev/null
+++ b/src/api/endpoints/authFactor.ts
@@ -0,0 +1,30 @@
+import { type EndpointBuilder } from "@reduxjs/toolkit/query/react"
+
+import {
+  buildUrl,
+  tagData,
+  type ListArg,
+  type ListResult,
+} from "../../utils/api"
+import type { AuthFactor } from "../models"
+import { type TagTypes } from "../tagTypes"
+import urls from "../urls"
+
+export const AUTH_FACTOR_TAG: TagTypes = "AuthFactor"
+
+export type ListAuthFactorsResult = ListResult<AuthFactor, "type">
+export type ListAuthFactorsArg = ListArg
+
+export default function getReadAuthFactorEndpoints(
+  build: EndpointBuilder<any, any, any>,
+) {
+  return {
+    listAuthFactors: build.query<ListAuthFactorsResult, ListAuthFactorsArg>({
+      query: search => ({
+        url: buildUrl(urls.authFactor.list, { search }),
+        method: "GET",
+      }),
+      providesTags: tagData(AUTH_FACTOR_TAG),
+    }),
+  }
+}
diff --git a/src/api/endpoints/index.ts b/src/api/endpoints/index.ts
new file mode 100644
index 00000000..3f8ebfe2
--- /dev/null
+++ b/src/api/endpoints/index.ts
@@ -0,0 +1,47 @@
+import getReadAuthFactorEndpoints, {
+  type ListAuthFactorsArg,
+  type ListAuthFactorsResult,
+  AUTH_FACTOR_TAG,
+} from "./authFactor"
+import getReadClassEndpoints, {
+  type ListClassesArg,
+  type ListClassesResult,
+  type RetrieveClassArg,
+  type RetrieveClassResult,
+  CLASS_TAG,
+} from "./klass"
+import getReadSchoolEndpoints, {
+  type RetrieveSchoolArg,
+  type RetrieveSchoolResult,
+  SCHOOL_TAG,
+} from "./school"
+import getReadUserEndpoints, {
+  type ListUsersArg,
+  type ListUsersResult,
+  type RetrieveUserArg,
+  type RetrieveUserResult,
+  USER_TAG,
+} from "./user"
+
+export {
+  AUTH_FACTOR_TAG,
+  CLASS_TAG,
+  getReadAuthFactorEndpoints,
+  getReadClassEndpoints,
+  getReadSchoolEndpoints,
+  getReadUserEndpoints,
+  SCHOOL_TAG,
+  USER_TAG,
+  type ListAuthFactorsArg,
+  type ListAuthFactorsResult,
+  type ListClassesArg,
+  type ListClassesResult,
+  type ListUsersArg,
+  type ListUsersResult,
+  type RetrieveClassArg,
+  type RetrieveClassResult,
+  type RetrieveSchoolArg,
+  type RetrieveSchoolResult,
+  type RetrieveUserArg,
+  type RetrieveUserResult,
+}
diff --git a/src/api/endpoints/klass.ts b/src/api/endpoints/klass.ts
new file mode 100644
index 00000000..92627306
--- /dev/null
+++ b/src/api/endpoints/klass.ts
@@ -0,0 +1,56 @@
+import { type EndpointBuilder } from "@reduxjs/toolkit/query/react"
+
+import {
+  buildUrl,
+  tagData,
+  type ListArg,
+  type ListResult,
+  type RetrieveArg,
+  type RetrieveResult,
+} from "../../utils/api"
+import type { Class } from "../models"
+import { type TagTypes } from "../tagTypes"
+import urls from "../urls"
+
+export const CLASS_TAG: TagTypes = "Class"
+
+export type RetrieveClassResult = RetrieveResult<
+  Class,
+  | "name"
+  | "read_classmates_data"
+  | "receive_requests_until"
+  | "school"
+  | "teacher"
+>
+export type RetrieveClassArg = RetrieveArg<Class>
+
+export type ListClassesResult = ListResult<
+  Class,
+  | "name"
+  | "read_classmates_data"
+  | "receive_requests_until"
+  | "school"
+  | "teacher"
+>
+export type ListClassesArg = ListArg
+
+export default function getReadClassEndpoints(
+  build: EndpointBuilder<any, any, any>,
+) {
+  return {
+    retrieveClass: build.query<RetrieveClassResult, RetrieveClassArg>({
+      query: id => ({
+        url: buildUrl(urls.class.detail, { url: { id } }),
+        method: "GET",
+      }),
+      providesTags: tagData(CLASS_TAG),
+    }),
+    listClasses: build.query<ListClassesResult, ListClassesArg>({
+      query: search => ({
+        url: buildUrl(urls.class.list, { search }),
+        method: "GET",
+      }),
+      providesTags: tagData(CLASS_TAG),
+    }),
+  }
+}
diff --git a/src/api/endpoints/school.ts b/src/api/endpoints/school.ts
new file mode 100644
index 00000000..75f0dd4e
--- /dev/null
+++ b/src/api/endpoints/school.ts
@@ -0,0 +1,33 @@
+import { type EndpointBuilder } from "@reduxjs/toolkit/query/react"
+
+import {
+  buildUrl,
+  tagData,
+  type RetrieveArg,
+  type RetrieveResult,
+} from "../../utils/api"
+import type { School } from "../models"
+import { type TagTypes } from "../tagTypes"
+import urls from "../urls"
+
+export const SCHOOL_TAG: TagTypes = "School"
+
+export type RetrieveSchoolResult = RetrieveResult<
+  School,
+  "name" | "country" | "uk_county"
+>
+export type RetrieveSchoolArg = RetrieveArg<School>
+
+export default function getReadSchoolEndpoints(
+  build: EndpointBuilder<any, any, any>,
+) {
+  return {
+    retrieveSchool: build.query<RetrieveSchoolResult, RetrieveSchoolArg>({
+      query: id => ({
+        url: buildUrl(urls.school.detail, { url: { id } }),
+        method: "GET",
+      }),
+      providesTags: tagData(SCHOOL_TAG),
+    }),
+  }
+}
diff --git a/src/api/endpoints/user.ts b/src/api/endpoints/user.ts
new file mode 100644
index 00000000..fd70554a
--- /dev/null
+++ b/src/api/endpoints/user.ts
@@ -0,0 +1,62 @@
+import { type EndpointBuilder } from "@reduxjs/toolkit/query/react"
+
+import {
+  buildUrl,
+  tagData,
+  type ListArg,
+  type ListResult,
+  type RetrieveArg,
+  type RetrieveResult,
+} from "../../utils/api"
+import type { User } from "../models"
+import { type TagTypes } from "../tagTypes"
+import urls from "../urls"
+
+export const USER_TAG: TagTypes = "User"
+
+export type RetrieveUserResult = RetrieveResult<
+  User,
+  | "first_name"
+  | "last_name"
+  | "email"
+  | "is_active"
+  | "date_joined"
+  | "requesting_to_join_class"
+  | "student"
+  | "teacher"
+>
+export type RetrieveUserArg = RetrieveArg<User>
+
+export type ListUsersResult = ListResult<
+  User,
+  | "first_name"
+  | "last_name"
+  | "email"
+  | "is_active"
+  | "date_joined"
+  | "requesting_to_join_class"
+  | "student"
+  | "teacher"
+>
+export type ListUsersArg = ListArg<{ students_in_class: string }>
+
+export default function getReadUserEndpoints(
+  build: EndpointBuilder<any, any, any>,
+) {
+  return {
+    retrieveUser: build.query<RetrieveUserResult, RetrieveUserArg>({
+      query: id => ({
+        url: buildUrl(urls.user.detail, { url: { id } }),
+        method: "GET",
+      }),
+      providesTags: tagData(USER_TAG),
+    }),
+    listUsers: build.query<ListUsersResult, ListUsersArg>({
+      query: search => ({
+        url: buildUrl(urls.user.list, { search }),
+        method: "GET",
+      }),
+      providesTags: tagData(USER_TAG),
+    }),
+  }
+}
diff --git a/src/api/index.ts b/src/api/index.ts
index bfe66870..4afd96a0 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1,10 +1,4 @@
 import baseQuery from "./baseQuery"
-import {
-  getReadAuthFactorEndpoints,
-  getReadClassEndpoints,
-  getReadSchoolEndpoints,
-  getReadUserEndpoints,
-} from "./endpoints"
 import type {
   AdminSchoolTeacher,
   AdminSchoolTeacherUser,
@@ -30,10 +24,6 @@ import urls from "./urls"
 
 export {
   baseQuery,
-  getReadAuthFactorEndpoints,
-  getReadClassEndpoints,
-  getReadSchoolEndpoints,
-  getReadUserEndpoints,
   tagTypes,
   urls,
   type AdminSchoolTeacher,