diff --git a/src/interface/web/app/components/modelPicker/modelPicker.tsx b/src/interface/web/app/components/modelPicker/modelPicker.tsx
index 3691cf6a..40854d93 100644
--- a/src/interface/web/app/components/modelPicker/modelPicker.tsx
+++ b/src/interface/web/app/components/modelPicker/modelPicker.tsx
@@ -68,8 +68,8 @@ interface ModelPickerProps {
 }
 
 export const ModelPicker: React.FC<any> = (props: ModelPickerProps) => {
-    const { data: models } = useOptionsRequest('/api/config/data/conversation/model/options');
-    const { data: selectedModel } = useSelectedModel('/api/config/data/conversation/model');
+    const { data: models } = useOptionsRequest('/api/config/chat/model/options');
+    const { data: selectedModel } = useSelectedModel('/api/config/chat/model');
     const [openLoginDialog, setOpenLoginDialog] = React.useState(false);
 
     let userData = useAuthenticatedData();
@@ -94,7 +94,7 @@ export const ModelPicker: React.FC<any> = (props: ModelPickerProps) => {
             props.setModelUsed(model);
         }
 
-        fetch('/api/config/data/conversation/model' + '?id=' + String(model.id), { method: 'POST', body: JSON.stringify(model) })
+        fetch('/api/config/chat/model' + '?id=' + String(model.id), { method: 'POST', body: JSON.stringify(model) })
             .then((response) => {
                 if (!response.ok) {
                     throw new Error('Failed to select model');
diff --git a/src/interface/web/app/components/sidePanel/chatHistorySidePanel.tsx b/src/interface/web/app/components/sidePanel/chatHistorySidePanel.tsx
index ced5c4e4..7232089f 100644
--- a/src/interface/web/app/components/sidePanel/chatHistorySidePanel.tsx
+++ b/src/interface/web/app/components/sidePanel/chatHistorySidePanel.tsx
@@ -148,7 +148,7 @@ interface FilesMenuProps {
 
 function FilesMenu(props: FilesMenuProps) {
     // Use SWR to fetch files
-    const { data: files, error } = useSWR<string[]>(props.conversationId ? '/api/config/data/computer' : null, fetcher);
+    const { data: files, error } = useSWR<string[]>(props.conversationId ? '/api/config/content/computer' : null, fetcher);
     const { data: selectedFiles, error: selectedFilesError } = useSWR(props.conversationId ? `/api/chat/conversation/file-filters/${props.conversationId}` : null, fetcher);
     const [isOpen, setIsOpen] = useState(false);
     const [unfilteredFiles, setUnfilteredFiles] = useState<string[]>([]);
diff --git a/src/khoj/interface/web/chat.html b/src/khoj/interface/web/chat.html
index ad8ced27..7a819633 100644
--- a/src/khoj/interface/web/chat.html
+++ b/src/khoj/interface/web/chat.html
@@ -1954,7 +1954,7 @@ To get started, just start typing below. You can also type / to see a list of co
         }
         var allFiles;
         function renderAllFiles() {
-            fetch('/api/config/data/computer')
+            fetch('/api/config/content/computer')
             .then(response => response.json())
             .then(data => {
                 var indexedFiles = document.getElementsByClassName("indexed-files")[0];
diff --git a/src/khoj/interface/web/config.html b/src/khoj/interface/web/config.html
index be47660f..b21fa3ac 100644
--- a/src/khoj/interface/web/config.html
+++ b/src/khoj/interface/web/config.html
@@ -421,7 +421,7 @@
         saveVoiceModelButton.disabled = true;
         saveVoiceModelButton.textContent = "Saving...";
 
-        fetch('/api/config/data/voice/model?id=' + voiceModel, {
+        fetch('/api/config/voice/model?id=' + voiceModel, {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',
@@ -455,7 +455,7 @@
         saveModelButton.innerHTML = "";
         saveModelButton.textContent = "Saving...";
 
-        fetch('/api/config/data/conversation/model?id=' + chatModel, {
+        fetch('/api/config/chat/model?id=' + chatModel, {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',
@@ -494,7 +494,7 @@
         saveSearchModelButton.disabled = true;
         saveSearchModelButton.textContent = "Saving...";
 
-        fetch('/api/config/data/search/model?id=' + searchModel, {
+        fetch('/api/config/search/model?id=' + searchModel, {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',
@@ -526,7 +526,7 @@
         saveModelButton.disabled = true;
         saveModelButton.innerHTML = "Saving...";
 
-        fetch('/api/config/data/paint/model?id=' + paintModel, {
+        fetch('/api/config/paint/model?id=' + paintModel, {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',
@@ -553,7 +553,7 @@
     };
 
     function clearContentType(content_source) {
-        fetch('/api/config/data/content-source/' + content_source, {
+        fetch('/api/config/content/' + content_source, {
             method: 'DELETE',
             headers: {
                 'Content-Type': 'application/json',
@@ -676,7 +676,7 @@
 
         content_sources = ["computer", "github", "notion"];
         content_sources.forEach(content_source => {
-            fetch(`/api/config/data/${content_source}`, {
+            fetch(`/api/config/content/${content_source}`, {
                 method: 'GET',
                 headers: {
                     'Content-Type': 'application/json',
@@ -807,7 +807,7 @@
 
     function getIndexedDataSize() {
         document.getElementById("indexed-data-size").textContent = "Calculating...";
-        fetch('/api/config/index/size')
+        fetch('/api/config/content/size')
             .then(response => response.json())
             .then(data => {
                 document.getElementById("indexed-data-size").textContent = data.indexed_data_size_in_mb + " MB used";
@@ -815,7 +815,7 @@
     }
 
     function removeFile(path) {
-        fetch('/api/config/data/file?filename=' + path, {
+        fetch('/api/config/content/file?filename=' + path, {
             method: 'DELETE',
             headers: {
                 'Content-Type': 'application/json',
diff --git a/src/khoj/interface/web/content_source_computer_input.html b/src/khoj/interface/web/content_source_computer_input.html
index ac3209c3..f9b02d57 100644
--- a/src/khoj/interface/web/content_source_computer_input.html
+++ b/src/khoj/interface/web/content_source_computer_input.html
@@ -32,7 +32,7 @@
 </style>
 <script>
     function removeFile(path) {
-        fetch('/api/config/data/file?filename=' + path, {
+        fetch('/api/config/content/file?filename=' + path, {
             method: 'DELETE',
             headers: {
                 'Content-Type': 'application/json',
@@ -48,7 +48,7 @@
 
     // Get all currently indexed files
     function getAllComputerFilenames() {
-        fetch('/api/config/data/computer')
+        fetch('/api/config/content/computer')
             .then(response => response.json())
             .then(data => {
                 var indexedFiles = document.getElementsByClassName("indexed-files")[0];
@@ -122,7 +122,7 @@
         deleteAllComputerFilesButton.textContent = "🗑️ Deleting...";
         deleteAllComputerFilesButton.disabled = true;
 
-        fetch('/api/config/data/content-source/computer', {
+        fetch('/api/config/content/computer', {
             method: 'DELETE',
             headers: {
                 'Content-Type': 'application/json',
diff --git a/src/khoj/interface/web/content_source_github_input.html b/src/khoj/interface/web/content_source_github_input.html
index 875ad5e3..088b035c 100644
--- a/src/khoj/interface/web/content_source_github_input.html
+++ b/src/khoj/interface/web/content_source_github_input.html
@@ -165,7 +165,7 @@
 
         // Save Github config on server
         const csrfToken = document.cookie.split('; ').find(row => row.startsWith('csrftoken'))?.split('=')[1];
-        fetch('/api/config/data/content-source/github', {
+        fetch('/api/config/content/github', {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',
diff --git a/src/khoj/interface/web/content_source_notion_input.html b/src/khoj/interface/web/content_source_notion_input.html
index d03d4b67..5ab6b8e4 100644
--- a/src/khoj/interface/web/content_source_notion_input.html
+++ b/src/khoj/interface/web/content_source_notion_input.html
@@ -45,7 +45,7 @@
 
         // Save Notion config on server
         const csrfToken = document.cookie.split('; ').find(row => row.startsWith('csrftoken'))?.split('=')[1];
-        fetch('/api/config/data/content-source/notion', {
+        fetch('/api/config/content/notion', {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',
diff --git a/src/khoj/routers/api_config.py b/src/khoj/routers/api_config.py
index 58a8abae..edf2a648 100644
--- a/src/khoj/routers/api_config.py
+++ b/src/khoj/routers/api_config.py
@@ -98,9 +98,9 @@ def _initialize_config():
         state.config.search_type = SearchConfig.model_validate(constants.default_config["search-type"])
 
 
-@api_config.post("/data/content-source/github", status_code=200)
+@api_config.post("/content/github", status_code=200)
 @requires(["authenticated"])
-async def set_content_config_github_data(
+async def set_content_github(
     request: Request,
     updated_config: Union[GithubContentConfig, None],
     client: Optional[str] = None,
@@ -130,9 +130,9 @@ async def set_content_config_github_data(
     return {"status": "ok"}
 
 
-@api_config.post("/data/content-source/notion", status_code=200)
+@api_config.post("/content/notion", status_code=200)
 @requires(["authenticated"])
-async def set_content_config_notion_data(
+async def set_content_notion(
     request: Request,
     updated_config: Union[NotionContentConfig, None],
     client: Optional[str] = None,
@@ -161,9 +161,9 @@ async def set_content_config_notion_data(
     return {"status": "ok"}
 
 
-@api_config.delete("/data/content-source/{content_source}", status_code=200)
+@api_config.delete("/content/{content_source}", status_code=200)
 @requires(["authenticated"])
-async def remove_content_source_data(
+async def delete_content_source(
     request: Request,
     content_source: str,
     client: Optional[str] = None,
@@ -189,9 +189,9 @@ async def remove_content_source_data(
     return {"status": "ok"}
 
 
-@api_config.delete("/data/file", status_code=200)
+@api_config.delete("/content/file", status_code=201)
 @requires(["authenticated"])
-async def remove_file_data(
+async def delete_content_file(
     request: Request,
     filename: str,
     client: Optional[str] = None,
@@ -210,9 +210,9 @@ async def remove_file_data(
     return {"status": "ok"}
 
 
-@api_config.get("/data/{content_source}", response_model=List[str])
+@api_config.get("/content/{content_source}", response_model=List[str])
 @requires(["authenticated"])
-async def get_all_filenames(
+async def get_content_source(
     request: Request,
     content_source: str,
     client: Optional[str] = None,
@@ -229,7 +229,7 @@ async def get_all_filenames(
     return await sync_to_async(list)(EntryAdapters.get_all_filenames_by_source(user, content_source))  # type: ignore[call-arg]
 
 
-@api_config.get("/data/conversation/model/options", response_model=Dict[str, Union[str, int]])
+@api_config.get("/chat/model/options", response_model=Dict[str, Union[str, int]])
 def get_chat_model_options(
     request: Request,
     client: Optional[str] = None,
@@ -243,7 +243,7 @@ def get_chat_model_options(
     return Response(content=json.dumps(all_conversation_options), media_type="application/json", status_code=200)
 
 
-@api_config.get("/data/conversation/model")
+@api_config.get("/chat/model")
 @requires(["authenticated"])
 def get_user_chat_model(
     request: Request,
@@ -259,7 +259,7 @@ def get_user_chat_model(
     return Response(status_code=200, content=json.dumps({"id": chat_model.id, "chat_model": chat_model.chat_model}))
 
 
-@api_config.post("/data/conversation/model", status_code=200)
+@api_config.post("/chat/model", status_code=200)
 @requires(["authenticated", "premium"])
 async def update_chat_model(
     request: Request,
@@ -284,7 +284,7 @@ async def update_chat_model(
     return {"status": "ok"}
 
 
-@api_config.post("/data/voice/model", status_code=200)
+@api_config.post("/voice/model", status_code=200)
 @requires(["authenticated", "premium"])
 async def update_voice_model(
     request: Request,
@@ -308,7 +308,7 @@ async def update_voice_model(
     return Response(status_code=202, content=json.dumps({"status": "ok"}))
 
 
-@api_config.post("/data/search/model", status_code=200)
+@api_config.post("/search/model", status_code=200)
 @requires(["authenticated"])
 async def update_search_model(
     request: Request,
@@ -341,7 +341,7 @@ async def update_search_model(
     return {"status": "ok"}
 
 
-@api_config.post("/data/paint/model", status_code=200)
+@api_config.post("/paint/model", status_code=200)
 @requires(["authenticated"])
 async def update_paint_model(
     request: Request,
@@ -370,9 +370,9 @@ async def update_paint_model(
     return {"status": "ok"}
 
 
-@api_config.get("/index/size", response_model=Dict[str, int])
+@api_config.get("/content/size", response_model=Dict[str, int])
 @requires(["authenticated"])
-async def get_indexed_data_size(request: Request, common: CommonQueryParams):
+async def get_content_size(request: Request, common: CommonQueryParams):
     user = request.user.object
     indexed_data_size_in_mb = await sync_to_async(EntryAdapters.get_size_of_indexed_data_in_mb)(user)
     return Response(