diff --git a/public/script.js b/public/script.js
index 98e31e8ad..eabcbdd59 100644
--- a/public/script.js
+++ b/public/script.js
@@ -928,7 +928,7 @@ async function getStatusKobold() {
 }
 
 async function getStatusTextgen() {
-    const url = '/api/textgenerationwebui/status';
+    const url = '/api/backends/text-completions/status';
 
     let endpoint = textgen_settings.type === MANCER ?
         MANCER_SERVER :
@@ -4434,7 +4434,7 @@ function getGenerateUrl(api) {
     if (api == 'kobold') {
         generate_url = '/generate';
     } else if (api == 'textgenerationwebui') {
-        generate_url = '/api/textgenerationwebui/generate';
+        generate_url = '/api/backends/text-completions/generate';
     } else if (api == 'novel') {
         generate_url = '/api/novelai/generate';
     }
diff --git a/public/scripts/textgen-settings.js b/public/scripts/textgen-settings.js
index 9c938f701..58a3aba62 100644
--- a/public/scripts/textgen-settings.js
+++ b/public/scripts/textgen-settings.js
@@ -468,7 +468,7 @@ function setSettingByName(setting, value, trigger) {
 async function generateTextGenWithStreaming(generate_data, signal) {
     generate_data.stream = true;
 
-    const response = await fetch('/api/textgenerationwebui/generate', {
+    const response = await fetch('/api/backends/text-completions/generate', {
         headers: {
             ...getRequestHeaders(),
         },
diff --git a/server.js b/server.js
index ec9fb03aa..31718e577 100644
--- a/server.js
+++ b/server.js
@@ -133,7 +133,7 @@ const API_OPENAI = 'https://api.openai.com/v1';
 const API_CLAUDE = 'https://api.anthropic.com/v1';
 
 const SETTINGS_FILE = './public/settings.json';
-const { DIRECTORIES, UPLOADS_PATH, PALM_SAFETY, TEXTGEN_TYPES, CHAT_COMPLETION_SOURCES, AVATAR_WIDTH, AVATAR_HEIGHT } = require('./src/constants');
+const { DIRECTORIES, UPLOADS_PATH, PALM_SAFETY, CHAT_COMPLETION_SOURCES, AVATAR_WIDTH, AVATAR_HEIGHT } = require('./src/constants');
 
 // CORS Settings //
 const CORS = cors({
@@ -446,203 +446,6 @@ app.post('/generate', jsonParser, async function (request, response_generate) {
     return response_generate.send({ error: true });
 });
 
-//************** Text generation web UI
-app.post('/api/textgenerationwebui/status', jsonParser, async function (request, response) {
-    if (!request.body) return response.sendStatus(400);
-
-    try {
-        if (request.body.api_server.indexOf('localhost') !== -1) {
-            request.body.api_server = request.body.api_server.replace('localhost', '127.0.0.1');
-        }
-
-        console.log('Trying to connect to API:', request.body);
-
-        // Convert to string + remove trailing slash + /v1 suffix
-        const baseUrl = String(request.body.api_server).replace(/\/$/, '').replace(/\/v1$/, '');
-
-        const args = {
-            headers: { 'Content-Type': 'application/json' },
-        };
-
-        setAdditionalHeaders(request, args, baseUrl);
-
-        let url = baseUrl;
-        let result = '';
-
-        if (request.body.legacy_api) {
-            url += '/v1/model';
-        } else {
-            switch (request.body.api_type) {
-                case TEXTGEN_TYPES.OOBA:
-                case TEXTGEN_TYPES.APHRODITE:
-                case TEXTGEN_TYPES.KOBOLDCPP:
-                    url += '/v1/models';
-                    break;
-                case TEXTGEN_TYPES.MANCER:
-                    url += '/oai/v1/models';
-                    break;
-                case TEXTGEN_TYPES.TABBY:
-                    url += '/v1/model/list';
-                    break;
-            }
-        }
-
-        const modelsReply = await fetch(url, args);
-
-        if (!modelsReply.ok) {
-            console.log('Models endpoint is offline.');
-            return response.status(400);
-        }
-
-        const data = await modelsReply.json();
-
-        if (request.body.legacy_api) {
-            console.log('Legacy API response:', data);
-            return response.send({ result: data?.result });
-        }
-
-        if (!Array.isArray(data.data)) {
-            console.log('Models response is not an array.');
-            return response.status(400);
-        }
-
-        const modelIds = data.data.map(x => x.id);
-        console.log('Models available:', modelIds);
-
-        // Set result to the first model ID
-        result = modelIds[0] || 'Valid';
-
-        if (request.body.api_type === TEXTGEN_TYPES.OOBA) {
-            try {
-                const modelInfoUrl = baseUrl + '/v1/internal/model/info';
-                const modelInfoReply = await fetch(modelInfoUrl, args);
-
-                if (modelInfoReply.ok) {
-                    const modelInfo = await modelInfoReply.json();
-                    console.log('Ooba model info:', modelInfo);
-
-                    const modelName = modelInfo?.model_name;
-                    result = modelName || result;
-                }
-            } catch (error) {
-                console.error(`Failed to get Ooba model info: ${error}`);
-            }
-        } else if (request.body.api_type === TEXTGEN_TYPES.TABBY) {
-            try {
-                const modelInfoUrl = baseUrl + '/v1/model';
-                const modelInfoReply = await fetch(modelInfoUrl, args);
-
-                if (modelInfoReply.ok) {
-                    const modelInfo = await modelInfoReply.json();
-                    console.log('Tabby model info:', modelInfo);
-
-                    const modelName = modelInfo?.id;
-                    result = modelName || result;
-                } else {
-                    // TabbyAPI returns an error 400 if a model isn't loaded
-
-                    result = 'None';
-                }
-            } catch (error) {
-                console.error(`Failed to get TabbyAPI model info: ${error}`);
-            }
-        }
-
-        return response.send({ result, data: data.data });
-    } catch (error) {
-        console.error(error);
-        return response.status(500);
-    }
-});
-
-app.post('/api/textgenerationwebui/generate', jsonParser, async function (request, response_generate) {
-    if (!request.body) return response_generate.sendStatus(400);
-
-    try {
-        if (request.body.api_server.indexOf('localhost') !== -1) {
-            request.body.api_server = request.body.api_server.replace('localhost', '127.0.0.1');
-        }
-
-        const baseUrl = request.body.api_server;
-        console.log(request.body);
-
-        const controller = new AbortController();
-        request.socket.removeAllListeners('close');
-        request.socket.on('close', function () {
-            controller.abort();
-        });
-
-        // Convert to string + remove trailing slash + /v1 suffix
-        let url = String(baseUrl).replace(/\/$/, '').replace(/\/v1$/, '');
-
-        if (request.body.legacy_api) {
-            url += '/v1/generate';
-        } else {
-            switch (request.body.api_type) {
-                case TEXTGEN_TYPES.APHRODITE:
-                case TEXTGEN_TYPES.OOBA:
-                case TEXTGEN_TYPES.TABBY:
-                case TEXTGEN_TYPES.KOBOLDCPP:
-                    url += '/v1/completions';
-                    break;
-                case TEXTGEN_TYPES.MANCER:
-                    url += '/oai/v1/completions';
-                    break;
-            }
-        }
-
-        const args = {
-            method: 'POST',
-            body: JSON.stringify(request.body),
-            headers: { 'Content-Type': 'application/json' },
-            signal: controller.signal,
-            timeout: 0,
-        };
-
-        setAdditionalHeaders(request, args, baseUrl);
-
-        if (request.body.stream) {
-            const completionsStream = await fetch(url, args);
-            // Pipe remote SSE stream to Express response
-            forwardFetchResponse(completionsStream, response_generate);
-        }
-        else {
-            const completionsReply = await fetch(url, args);
-
-            if (completionsReply.ok) {
-                const data = await completionsReply.json();
-                console.log('Endpoint response:', data);
-
-                // Wrap legacy response to OAI completions format
-                if (request.body.legacy_api) {
-                    const text = data?.results[0]?.text;
-                    data['choices'] = [{ text }];
-                }
-
-                return response_generate.send(data);
-            } else {
-                const text = await completionsReply.text();
-                const errorBody = { error: true, status: completionsReply.status, response: text };
-
-                if (!response_generate.headersSent) {
-                    return response_generate.send(errorBody);
-                }
-
-                return response_generate.end();
-            }
-        }
-    } catch (error) {
-        let value = { error: true, status: error?.status, response: error?.statusText };
-        console.log('Endpoint error:', error);
-
-        if (!response_generate.headersSent) {
-            return response_generate.send(value);
-        }
-
-        return response_generate.end();
-    }
-});
-
 // Only called for kobold
 app.post('/getstatus', jsonParser, async function (request, response) {
     if (!request.body) return response.sendStatus(400);
@@ -1816,6 +1619,11 @@ app.use('/api/extra/caption', require('./src/endpoints/caption').router);
 // Web search extension
 app.use('/api/serpapi', require('./src/endpoints/serpapi').router);
 
+// The different text generation APIs
+
+// Ooba/OpenAI text completions
+app.use('/api/backends/text-completions', require('./src/endpoints/backends/text-completions').router);
+
 const tavernUrl = new URL(
     (cliArguments.ssl ? 'https://' : 'http://') +
     (listen ? '0.0.0.0' : '127.0.0.1') +
diff --git a/src/endpoints/backends/text-completions.js b/src/endpoints/backends/text-completions.js
new file mode 100644
index 000000000..71387eefd
--- /dev/null
+++ b/src/endpoints/backends/text-completions.js
@@ -0,0 +1,208 @@
+const express = require('express');
+const fetch = require('node-fetch').default;
+
+const { jsonParser } = require('../../express-common');
+const { TEXTGEN_TYPES } = require('../../constants');
+const { forwardFetchResponse } = require('../../util');
+const { setAdditionalHeaders } = require('../../additional-headers');
+
+const router = express.Router();
+
+//************** Ooba/OpenAI text completions API
+router.post('/status', jsonParser, async function (request, response) {
+    if (!request.body) return response.sendStatus(400);
+
+    try {
+        if (request.body.api_server.indexOf('localhost') !== -1) {
+            request.body.api_server = request.body.api_server.replace('localhost', '127.0.0.1');
+        }
+
+        console.log('Trying to connect to API:', request.body);
+
+        // Convert to string + remove trailing slash + /v1 suffix
+        const baseUrl = String(request.body.api_server).replace(/\/$/, '').replace(/\/v1$/, '');
+
+        const args = {
+            headers: { 'Content-Type': 'application/json' },
+        };
+
+        setAdditionalHeaders(request, args, baseUrl);
+
+        let url = baseUrl;
+        let result = '';
+
+        if (request.body.legacy_api) {
+            url += '/v1/model';
+        } else {
+            switch (request.body.api_type) {
+                case TEXTGEN_TYPES.OOBA:
+                case TEXTGEN_TYPES.APHRODITE:
+                case TEXTGEN_TYPES.KOBOLDCPP:
+                    url += '/v1/models';
+                    break;
+                case TEXTGEN_TYPES.MANCER:
+                    url += '/oai/v1/models';
+                    break;
+                case TEXTGEN_TYPES.TABBY:
+                    url += '/v1/model/list';
+                    break;
+            }
+        }
+
+        const modelsReply = await fetch(url, args);
+
+        if (!modelsReply.ok) {
+            console.log('Models endpoint is offline.');
+            return response.status(400);
+        }
+
+        const data = await modelsReply.json();
+
+        if (request.body.legacy_api) {
+            console.log('Legacy API response:', data);
+            return response.send({ result: data?.result });
+        }
+
+        if (!Array.isArray(data.data)) {
+            console.log('Models response is not an array.');
+            return response.status(400);
+        }
+
+        const modelIds = data.data.map(x => x.id);
+        console.log('Models available:', modelIds);
+
+        // Set result to the first model ID
+        result = modelIds[0] || 'Valid';
+
+        if (request.body.api_type === TEXTGEN_TYPES.OOBA) {
+            try {
+                const modelInfoUrl = baseUrl + '/v1/internal/model/info';
+                const modelInfoReply = await fetch(modelInfoUrl, args);
+
+                if (modelInfoReply.ok) {
+                    const modelInfo = await modelInfoReply.json();
+                    console.log('Ooba model info:', modelInfo);
+
+                    const modelName = modelInfo?.model_name;
+                    result = modelName || result;
+                }
+            } catch (error) {
+                console.error(`Failed to get Ooba model info: ${error}`);
+            }
+        } else if (request.body.api_type === TEXTGEN_TYPES.TABBY) {
+            try {
+                const modelInfoUrl = baseUrl + '/v1/model';
+                const modelInfoReply = await fetch(modelInfoUrl, args);
+
+                if (modelInfoReply.ok) {
+                    const modelInfo = await modelInfoReply.json();
+                    console.log('Tabby model info:', modelInfo);
+
+                    const modelName = modelInfo?.id;
+                    result = modelName || result;
+                } else {
+                    // TabbyAPI returns an error 400 if a model isn't loaded
+
+                    result = 'None';
+                }
+            } catch (error) {
+                console.error(`Failed to get TabbyAPI model info: ${error}`);
+            }
+        }
+
+        return response.send({ result, data: data.data });
+    } catch (error) {
+        console.error(error);
+        return response.status(500);
+    }
+});
+
+router.post('/generate', jsonParser, async function (request, response_generate) {
+    if (!request.body) return response_generate.sendStatus(400);
+
+    try {
+        if (request.body.api_server.indexOf('localhost') !== -1) {
+            request.body.api_server = request.body.api_server.replace('localhost', '127.0.0.1');
+        }
+
+        const baseUrl = request.body.api_server;
+        console.log(request.body);
+
+        const controller = new AbortController();
+        request.socket.removeAllListeners('close');
+        request.socket.on('close', function () {
+            controller.abort();
+        });
+
+        // Convert to string + remove trailing slash + /v1 suffix
+        let url = String(baseUrl).replace(/\/$/, '').replace(/\/v1$/, '');
+
+        if (request.body.legacy_api) {
+            url += '/v1/generate';
+        } else {
+            switch (request.body.api_type) {
+                case TEXTGEN_TYPES.APHRODITE:
+                case TEXTGEN_TYPES.OOBA:
+                case TEXTGEN_TYPES.TABBY:
+                case TEXTGEN_TYPES.KOBOLDCPP:
+                    url += '/v1/completions';
+                    break;
+                case TEXTGEN_TYPES.MANCER:
+                    url += '/oai/v1/completions';
+                    break;
+            }
+        }
+
+        const args = {
+            method: 'POST',
+            body: JSON.stringify(request.body),
+            headers: { 'Content-Type': 'application/json' },
+            signal: controller.signal,
+            timeout: 0,
+        };
+
+        setAdditionalHeaders(request, args, baseUrl);
+
+        if (request.body.stream) {
+            const completionsStream = await fetch(url, args);
+            // Pipe remote SSE stream to Express response
+            forwardFetchResponse(completionsStream, response_generate);
+        }
+        else {
+            const completionsReply = await fetch(url, args);
+
+            if (completionsReply.ok) {
+                const data = await completionsReply.json();
+                console.log('Endpoint response:', data);
+
+                // Wrap legacy response to OAI completions format
+                if (request.body.legacy_api) {
+                    const text = data?.results[0]?.text;
+                    data['choices'] = [{ text }];
+                }
+
+                return response_generate.send(data);
+            } else {
+                const text = await completionsReply.text();
+                const errorBody = { error: true, status: completionsReply.status, response: text };
+
+                if (!response_generate.headersSent) {
+                    return response_generate.send(errorBody);
+                }
+
+                return response_generate.end();
+            }
+        }
+    } catch (error) {
+        let value = { error: true, status: error?.status, response: error?.statusText };
+        console.log('Endpoint error:', error);
+
+        if (!response_generate.headersSent) {
+            return response_generate.send(value);
+        }
+
+        return response_generate.end();
+    }
+});
+
+module.exports = { router };
diff --git a/src/util.js b/src/util.js
index 11b864092..be8d5135f 100644
--- a/src/util.js
+++ b/src/util.js
@@ -349,7 +349,7 @@ function getImages(path) {
 
 /**
  * Pipe a fetch() response to an Express.js Response, including status code.
- * @param {Response} from The Fetch API response to pipe from.
+ * @param {import('node-fetch').Response} from The Fetch API response to pipe from.
  * @param {Express.Response} to The Express response to pipe to.
  */
 function forwardFetchResponse(from, to) {