diff --git a/frontend/app/admin/DataIngestion.tsx b/frontend/app/admin/DataIngestion.tsx
new file mode 100644
index 0000000..a184198
--- /dev/null
+++ b/frontend/app/admin/DataIngestion.tsx
@@ -0,0 +1,129 @@
+'use client';
+import React, { useState } from 'react';
+import { useAuth } from '@/app/authProvider';
+import {
+  Card,
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle,
+} from '@/components/ui/card';
+import { Button } from '@/components/ui/button';
+import { Label } from '@/components/ui/label';
+import { Input } from '@/components/ui/input';
+import { LoaderIcon, Upload } from 'lucide-react';
+import { FileUpload } from '@/components/ui/file-upload';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@/components/ui/select';
+
+export default function DataIngestion() {
+  const { axiosInstance } = useAuth();
+  const [file, setFile] = useState<File | null>(null);
+  const [isUploading, setIsUploading] = useState(false);
+  const [uploadResult, setUploadResult] = useState<string | null>(null);
+
+  const handleFileUpload = (files: File[]) => {
+    if (files.length > 0) {
+      setFile(files[0]);
+    }
+  };
+
+  const uploadFile = async () => {
+    if (!file) return;
+
+    setIsUploading(true);
+    setUploadResult(null);
+
+    const formData = new FormData();
+    formData.append('file', file);
+
+    try {
+      const response = await axiosInstance.post(
+        '/api/admin/upload_data',
+        formData,
+        {
+          headers: {
+            'Content-Type': 'multipart/form-data',
+          },
+        }
+      );
+
+      setUploadResult(`File uploaded successfully. ${response.data.message}`);
+    } catch (error) {
+      console.error('Error uploading file:', error);
+      setUploadResult('Error uploading file. Please try again.');
+    } finally {
+      setIsUploading(false);
+      setFile(null);
+    }
+  };
+
+  return (
+    <Card>
+      <CardHeader>
+        <CardTitle>Data Ingestion</CardTitle>
+        <CardDescription>Manage data ingestion processes.</CardDescription>
+      </CardHeader>
+      <CardContent>
+        <div className="space-y-4">
+          <div className="w-full mx-auto min-h-96 border border-dashed bg-white dark:bg-black border-neutral-200 dark:border-neutral-800 rounded-lg">
+            <FileUpload onChange={handleFileUpload} />
+          </div>
+          {file && (
+            <div className="flex items-center space-x-2">
+              <Button
+                onClick={uploadFile}
+                disabled={isUploading}
+                variant="default"
+                className="flex items-center w-full"
+              >
+                {isUploading ? (
+                  <LoaderIcon className="mr-2 h-4 w-4 animate-spin" />
+                ) : (
+                  <Upload className="mr-2 h-4 w-4" />
+                )}
+                {isUploading ? 'Uploading and Ingesting...' : 'Ingest File'}
+              </Button>
+            </div>
+          )}
+          {uploadResult && (
+            <div className="mt-2 text-sm text-gray-600 dark:text-gray-400">
+              {uploadResult}
+            </div>
+          )}
+          <div>
+            <Label htmlFor="ingestionStrategy">
+              Ingestion Strategy (Coming Soon)
+            </Label>
+            <Select disabled>
+              <SelectTrigger>
+                <SelectValue placeholder="Select a strategy" />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectItem value="fixed">Fixed Size Chunking</SelectItem>
+                <SelectItem value="semantic">Semantic Chunking</SelectItem>
+              </SelectContent>
+            </Select>
+          </div>
+          <div>
+            <Label htmlFor="parser">Parser (Coming Soon)</Label>
+            <Select disabled>
+              <SelectTrigger>
+                <SelectValue placeholder="Select a parser" />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectItem value="llama">Llama Parse</SelectItem>
+                <SelectItem value="omni">Omniparse</SelectItem>
+              </SelectContent>
+            </Select>
+          </div>
+        </div>
+      </CardContent>
+    </Card>
+  );
+}
diff --git a/frontend/app/admin/RAGConfiguration.tsx b/frontend/app/admin/RAGConfiguration.tsx
new file mode 100644
index 0000000..a89f8de
--- /dev/null
+++ b/frontend/app/admin/RAGConfiguration.tsx
@@ -0,0 +1,184 @@
+'use client';
+import React, { useEffect, useState } from 'react';
+import { useAuth } from '@/app/authProvider';
+import {
+  Card,
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle,
+} from '@/components/ui/card';
+import { Button } from '@/components/ui/button';
+import { Label } from '@/components/ui/label';
+import { Input } from '@/components/ui/input';
+import { Textarea } from '@/components/ui/textarea';
+import { Separator } from '@/components/ui/separator';
+import { PlusCircle, Trash2 } from 'lucide-react';
+
+export default function RAGConfiguration() {
+  const { axiosInstance } = useAuth();
+  const [systemPrompt, setSystemPrompt] = useState<string>('');
+  const [suggestedQuestions, setSuggestedQuestions] = useState<string[]>([]);
+  const [configLoading, setConfigLoading] = useState<boolean>(true);
+  const [configError, setConfigError] = useState<string | null>(null);
+  const [systemPromptLoading, setSystemPromptLoading] = useState(false);
+  const [startersLoading, setStartersLoading] = useState(false);
+  const [initialSystemPrompt, setInitialSystemPrompt] = useState<string>('');
+  const [initialSuggestedQuestions, setInitialSuggestedQuestions] = useState<
+    string[]
+  >([]);
+
+  useEffect(() => {
+    fetchConfig();
+  }, [axiosInstance]);
+
+  const fetchConfig = async () => {
+    setConfigLoading(true);
+    setConfigError(null);
+    try {
+      const [configResponse, systemPromptResponse] = await Promise.all([
+        axiosInstance.get('/api/chat/config'),
+        axiosInstance.get('/api/admin/system-prompt'),
+      ]);
+
+      const config = configResponse.data;
+      const systemPromptData = systemPromptResponse.data;
+
+      setSystemPrompt(systemPromptData.system_prompt || '');
+      setInitialSystemPrompt(systemPromptData.system_prompt || '');
+      setSuggestedQuestions(config.starterQuestions || []);
+      setInitialSuggestedQuestions(config.starterQuestions || []);
+      setConfigLoading(false);
+    } catch (err: any) {
+      setConfigError(err.message || 'Failed to fetch configuration');
+      setConfigLoading(false);
+    }
+  };
+
+  const updateSystemPrompt = async () => {
+    setSystemPromptLoading(true);
+    try {
+      const response = await axiosInstance.put('/api/admin/system-prompt', {
+        new_prompt: systemPrompt,
+      });
+      if (response.status === 200) {
+        console.log('System prompt updated successfully');
+        setInitialSystemPrompt(systemPrompt);
+      }
+    } catch (error) {
+      console.error('Failed to update system prompt:', error);
+    } finally {
+      setSystemPromptLoading(false);
+    }
+  };
+
+  const updateConversationStarters = async () => {
+    setStartersLoading(true);
+    try {
+      const newStarters = suggestedQuestions.filter((q) => q.trim() !== '');
+      const response = await axiosInstance.put(
+        '/api/admin/conversation-starters',
+        { new_starters: newStarters }
+      );
+      if (response.status === 200) {
+        console.log('Conversation starters updated successfully');
+        setInitialSuggestedQuestions(newStarters);
+      }
+    } catch (error) {
+      console.error('Failed to update conversation starters:', error);
+    } finally {
+      setStartersLoading(false);
+    }
+  };
+
+  const addSuggestedQuestion = () => {
+    setSuggestedQuestions([...suggestedQuestions, '']);
+  };
+
+  const updateSuggestedQuestion = (index: number, value: string) => {
+    const updatedQuestions = [...suggestedQuestions];
+    updatedQuestions[index] = value;
+    setSuggestedQuestions(updatedQuestions);
+  };
+
+  const deleteSuggestedQuestion = (index: number) => {
+    const updatedQuestions = suggestedQuestions.filter((_, i) => i !== index);
+    setSuggestedQuestions(updatedQuestions);
+  };
+
+  const isSystemPromptChanged = systemPrompt !== initialSystemPrompt;
+  const areSuggestedQuestionsChanged =
+    JSON.stringify(suggestedQuestions) !==
+    JSON.stringify(initialSuggestedQuestions);
+
+  if (configLoading) return <div>Loading configuration...</div>;
+  if (configError) return <div>Error: {configError}</div>;
+
+  return (
+    <Card>
+      <CardHeader>
+        <CardTitle>RAG Configuration</CardTitle>
+        <CardDescription>
+          Configure Retrieval-Augmented Generation settings.
+        </CardDescription>
+      </CardHeader>
+      <CardContent className="space-y-4">
+        <div>
+          <Label htmlFor="systemPrompt">System Prompt</Label>
+          <Textarea
+            id="systemPrompt"
+            value={systemPrompt}
+            onChange={(e) => setSystemPrompt(e.target.value)}
+            placeholder="Enter system prompt here..."
+          />
+          <Button
+            onClick={updateSystemPrompt}
+            className="mt-2 w-full"
+            variant={isSystemPromptChanged ? 'default' : 'secondary'}
+            disabled={systemPromptLoading || !isSystemPromptChanged}
+          >
+            {systemPromptLoading ? 'Updating...' : 'Update System Prompt'}
+          </Button>
+        </div>
+        <Separator />
+        <div>
+          <Label>Suggested Questions</Label>
+          {suggestedQuestions.map((question, index) => (
+            <div key={index} className="flex items-center space-x-2 mt-2">
+              <Input
+                value={question}
+                onChange={(e) => updateSuggestedQuestion(index, e.target.value)}
+                placeholder="Enter a suggested question..."
+              />
+              <Button
+                variant="outline"
+                size="icon"
+                onClick={() => deleteSuggestedQuestion(index)}
+              >
+                <Trash2 className="h-4 w-4" />
+              </Button>
+            </div>
+          ))}
+          <div className="w-full flex justify-between items-center mt-2">
+            <Button
+              variant="outline"
+              className="mt-2"
+              onClick={addSuggestedQuestion}
+            >
+              <PlusCircle className="h-4 w-4 mr-2" />
+              Add Question
+            </Button>
+            <Button
+              variant={areSuggestedQuestionsChanged ? 'default' : 'secondary'}
+              onClick={updateConversationStarters}
+              className="mt-2 ml-2"
+              disabled={startersLoading || !areSuggestedQuestionsChanged}
+            >
+              {startersLoading ? 'Updating...' : 'Update Conversation Starters'}
+            </Button>
+          </div>
+        </div>
+      </CardContent>
+    </Card>
+  );
+}
diff --git a/frontend/app/admin/UsersManagement.tsx b/frontend/app/admin/UsersManagement.tsx
new file mode 100644
index 0000000..96969f2
--- /dev/null
+++ b/frontend/app/admin/UsersManagement.tsx
@@ -0,0 +1,166 @@
+'use client';
+import React, { useEffect, useState } from 'react';
+import { useAuth } from '@/app/authProvider';
+import {
+  Card,
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle,
+} from '@/components/ui/card';
+import { Button } from '@/components/ui/button';
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeader,
+  TableRow,
+} from '@/components/ui/table';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@/components/ui/select';
+import { Switch } from '@/components/ui/switch';
+import { Trash2 } from 'lucide-react';
+import { AxiosError } from 'axios';
+
+interface User {
+  user_id: string;
+  email: string;
+  first_name: string | null;
+  last_name: string | null;
+  role: string;
+  disabled?: boolean;
+}
+
+interface UsersManagementProps {
+  adminEmail: string | undefined;
+}
+
+export default function UsersManagement({ adminEmail }: UsersManagementProps) {
+  const { axiosInstance } = useAuth();
+  const [users, setUsers] = useState<User[]>([]);
+  const [loading, setLoading] = useState<boolean>(true);
+  const [error, setError] = useState<string | null>(null);
+
+  useEffect(() => {
+    fetchUsers();
+  }, [axiosInstance]);
+
+  const fetchUsers = async () => {
+    try {
+      const response = await axiosInstance.get<{ users: User[] }>(
+        '/api/admin/users'
+      );
+      setUsers(response.data.users);
+      setLoading(false);
+    } catch (err) {
+      const axiosError = err as AxiosError;
+      setError(axiosError.message || 'Failed to fetch users');
+      setLoading(false);
+    }
+  };
+
+  const deleteUser = async (userId: string) => {
+    try {
+      await axiosInstance.delete(`/api/admin/users/${userId}`);
+      setUsers(users.filter((user) => user.user_id !== userId));
+    } catch (err) {
+      const axiosError = err as AxiosError;
+      setError(axiosError.message || 'Failed to delete user');
+    }
+  };
+
+  const updateUser = async (userId: string, updatedData: Partial<User>) => {
+    try {
+      await axiosInstance.put(`/api/admin/users/${userId}`, updatedData);
+      setUsers(
+        users.map((user) =>
+          user.user_id === userId ? { ...user, ...updatedData } : user
+        )
+      );
+    } catch (err) {
+      const axiosError = err as AxiosError;
+      setError(axiosError.message || 'Failed to update user');
+    }
+  };
+
+  if (loading) return <div>Loading...</div>;
+  if (error) return <div>Error: {error}</div>;
+
+  return (
+    <Card>
+      <CardHeader>
+        <CardTitle>Users Management</CardTitle>
+        <CardDescription>Manage user accounts</CardDescription>
+      </CardHeader>
+      <CardContent>
+        <Table>
+          <TableHeader>
+            <TableRow>
+              <TableHead>Name</TableHead>
+              <TableHead>Email</TableHead>
+              <TableHead>Role</TableHead>
+              <TableHead>Status</TableHead>
+              <TableHead>Actions</TableHead>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            {users
+              .filter((user) => user.email !== adminEmail)
+              .map((user) => (
+                <TableRow key={user.user_id}>
+                  <TableCell>
+                    {`${user.first_name || ''} ${user.last_name || ''}`.trim()}
+                  </TableCell>
+                  <TableCell>{user.email}</TableCell>
+                  <TableCell>
+                    <Select
+                      onValueChange={(value) =>
+                        updateUser(user.user_id, { role: value })
+                      }
+                      defaultValue={user.role}
+                      disabled={
+                        user.role === 'admin' &&
+                        users.filter((u) => u.role === 'admin').length === 1
+                      }
+                    >
+                      <SelectTrigger>
+                        <SelectValue placeholder="Select role" />
+                      </SelectTrigger>
+                      <SelectContent>
+                        <SelectItem value="user">User</SelectItem>
+                        <SelectItem value="admin">Admin</SelectItem>
+                      </SelectContent>
+                    </Select>
+                  </TableCell>
+                  <TableCell>
+                    <Switch
+                      checked={!user.disabled}
+                      onCheckedChange={(checked) =>
+                        updateUser(user.user_id, { disabled: !checked })
+                      }
+                      disabled={user.role === 'admin'}
+                    />
+                  </TableCell>
+                  <TableCell>
+                    <Button
+                      variant="destructive"
+                      onClick={() => deleteUser(user.user_id)}
+                      disabled={user.role === 'admin'}
+                    >
+                      <Trash2 className="h-4 w-4" />
+                    </Button>
+                  </TableCell>
+                </TableRow>
+              ))}
+          </TableBody>
+        </Table>
+      </CardContent>
+    </Card>
+  );
+}
diff --git a/frontend/app/admin/page.tsx b/frontend/app/admin/page.tsx
index 605524f..4e5fc66 100644
--- a/frontend/app/admin/page.tsx
+++ b/frontend/app/admin/page.tsx
@@ -12,248 +12,19 @@ import {
   CardHeader,
   CardTitle,
 } from '@/components/ui/card';
-import { Button } from '@/components/ui/button';
-import {
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableHeader,
-  TableRow,
-} from '@/components/ui/table';
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from '@/components/ui/select';
-import { Textarea } from '@/components/ui/textarea';
-import { Switch } from '@/components/ui/switch';
-import { Label } from '@/components/ui/label';
-import { Input } from '@/components/ui/input';
-import {
-  LoaderCircle,
-  LoaderIcon,
-  PlusCircle,
-  Trash2,
-  Upload,
-} from 'lucide-react';
-import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar';
-import { AxiosError } from 'axios';
-import { FileUpload } from '@/components/ui/file-upload';
-import { Separator } from '@/components/ui/separator';
-
-interface User {
-  user_id: string;
-  email: string;
-  first_name: string | null;
-  last_name: string | null;
-  role: string;
-  disabled?: boolean;
-}
-
-interface UsersResponse {
-  users: User[];
-}
-
-interface UserUpdateData {
-  first_name?: string;
-  last_name?: string;
-  role?: string;
-  disabled?: boolean;
-}
+import { Avatar, AvatarFallback } from '@/components/ui/avatar';
+import UsersManagement from '@/app/admin/UsersManagement';
+import DataIngestion from '@/app/admin/DataIngestion';
+import RAGConfiguration from '@/app/admin/RAGConfiguration';
 
 export default function AdminPage() {
   const { isAdminAuthenticated, adminData } = useAdminAuth();
-  const { isAuthenticated, axiosInstance } = useAuth();
-
-  const [enableTools, setEnableTools] = useState<boolean>(false);
-  const [users, setUsers] = useState<User[]>([]);
-  const [loading, setLoading] = useState<boolean>(true);
-  const [error, setError] = useState<string | null>(null);
-  const [file, setFile] = useState<File | null>(null);
-  const [isUploading, setIsUploading] = useState(false);
-  const [uploadResult, setUploadResult] = useState<string | null>(null);
-
-  const [systemPrompt, setSystemPrompt] = useState<string>('');
-  const [suggestedQuestions, setSuggestedQuestions] = useState<string[]>([]);
-  const [configLoading, setConfigLoading] = useState<boolean>(true);
-  const [configError, setConfigError] = useState<string | null>(null);
-  const [systemPromptLoading, setSystemPromptLoading] = useState(false);
-  const [startersLoading, setStartersLoading] = useState(false);
-  const [initialSystemPrompt, setInitialSystemPrompt] = useState<string>('');
-  const [initialSuggestedQuestions, setInitialSuggestedQuestions] = useState<
-    string[]
-  >([]);
-
-  useEffect(() => {
-    if (isAuthenticated) {
-      fetchUsers();
-      fetchConfig();
-    }
-  }, [isAuthenticated, axiosInstance]);
-
-  const fetchConfig = async () => {
-    setConfigLoading(true);
-    setConfigError(null);
-    try {
-      const [configResponse, systemPromptResponse] = await Promise.all([
-        axiosInstance.get('/api/chat/config'),
-        axiosInstance.get('/api/admin/system-prompt'),
-      ]);
-
-      const config = configResponse.data;
-      const systemPromptData = systemPromptResponse.data;
-
-      setSystemPrompt(systemPromptData.system_prompt || '');
-      setInitialSystemPrompt(systemPromptData.system_prompt || '');
-      setSuggestedQuestions(config.starterQuestions || []);
-      setInitialSuggestedQuestions(config.starterQuestions || []);
-      setConfigLoading(false);
-    } catch (err) {
-      const axiosError = err as AxiosError;
-      setConfigError(axiosError.message || 'Failed to fetch configuration');
-      setConfigLoading(false);
-    }
-  };
-
-  const fetchUsers = async () => {
-    try {
-      const response = await axiosInstance.get<UsersResponse>(
-        '/api/admin/users'
-      );
-      setUsers(response.data.users);
-      setLoading(false);
-    } catch (err) {
-      const axiosError = err as AxiosError;
-      setError(axiosError.message || 'Failed to fetch users');
-      setLoading(false);
-    }
-  };
-
-  const deleteUser = async (userId: string) => {
-    try {
-      await axiosInstance.delete(`/api/admin/users/${userId}`);
-      setUsers(users.filter((user) => user.user_id !== userId));
-    } catch (err) {
-      const axiosError = err as AxiosError;
-      setError(axiosError.message || 'Failed to delete user');
-    }
-  };
-
-  const updateUser = async (userId: string, updatedData: UserUpdateData) => {
-    try {
-      await axiosInstance.put(`/api/admin/users/${userId}`, updatedData);
-      setUsers(
-        users.map((user) =>
-          user.user_id === userId ? { ...user, ...updatedData } : user
-        )
-      );
-    } catch (err) {
-      const axiosError = err as AxiosError;
-      setError(axiosError.message || 'Failed to update user');
-    }
-  };
-
-  const updateSystemPrompt = async () => {
-    setSystemPromptLoading(true);
-    try {
-      const response = await axiosInstance.put('/api/admin/system-prompt', {
-        new_prompt: systemPrompt,
-      });
-      if (response.status === 200) {
-        console.log('System prompt updated successfully');
-        setInitialSystemPrompt(systemPrompt);
-      }
-    } catch (error) {
-      console.error('Failed to update system prompt:', error);
-    } finally {
-      setSystemPromptLoading(false);
-    }
-  };
-
-  const updateConversationStarters = async () => {
-    setStartersLoading(true);
-    try {
-      const newStarters = suggestedQuestions.filter((q) => q.trim() !== '');
-      const response = await axiosInstance.put(
-        '/api/admin/conversation-starters',
-        { new_starters: newStarters }
-      );
-      if (response.status === 200) {
-        console.log('Conversation starters updated successfully');
-        setInitialSuggestedQuestions(newStarters);
-      }
-    } catch (error) {
-      console.error('Failed to update conversation starters:', error);
-    } finally {
-      setStartersLoading(false);
-    }
-  };
-
-  const isSystemPromptChanged = systemPrompt !== initialSystemPrompt;
-  const areSuggestedQuestionsChanged =
-    JSON.stringify(suggestedQuestions) !==
-    JSON.stringify(initialSuggestedQuestions);
-
-  const handleFileUpload = (files: File[]) => {
-    if (files.length > 0) {
-      setFile(files[0]);
-    }
-  };
-
-  const uploadFile = async () => {
-    if (!file) return;
-
-    setIsUploading(true);
-    setUploadResult(null);
-
-    const formData = new FormData();
-    formData.append('file', file);
-
-    try {
-      const response = await axiosInstance.post(
-        '/api/admin/upload_data',
-        formData,
-        {
-          headers: {
-            'Content-Type': 'multipart/form-data',
-          },
-        }
-      );
-
-      setUploadResult(`File uploaded successfully. ${response.data.message}`);
-    } catch (error) {
-      console.error('Error uploading file:', error);
-      setUploadResult('Error uploading file. Please try again.');
-    } finally {
-      setIsUploading(false);
-      setFile(null); // Reset file state after upload attempt
-    }
-  };
-
-  const addSuggestedQuestion = () => {
-    setSuggestedQuestions([...suggestedQuestions, '']);
-  };
-
-  const updateSuggestedQuestion = (index: number, value: string) => {
-    const updatedQuestions = [...suggestedQuestions];
-    updatedQuestions[index] = value;
-    setSuggestedQuestions(updatedQuestions);
-  };
-
-  const deleteSuggestedQuestion = (index: number) => {
-    const updatedQuestions = suggestedQuestions.filter((_, i) => i !== index);
-    setSuggestedQuestions(updatedQuestions);
-  };
+  const { isAuthenticated } = useAuth();
 
   if (!isAdminAuthenticated) {
     return <Loading />;
   }
 
-  if (loading) return <Loading />;
-  if (error) return <div>Error: {error}</div>;
   if (!isAuthenticated) return <div>Unauthorized</div>;
 
   return (
@@ -297,224 +68,13 @@ export default function AdminPage() {
           <TabsTrigger value="rag">RAG Configuration</TabsTrigger>
         </TabsList>
         <TabsContent value="users">
-          <Card>
-            <CardHeader>
-              <CardTitle>Users Management</CardTitle>
-              <CardDescription>Manage user accounts</CardDescription>
-            </CardHeader>
-            <CardContent>
-              <Table>
-                <TableHeader>
-                  <TableRow>
-                    <TableHead>Name</TableHead>
-                    <TableHead>Email</TableHead>
-                    <TableHead>Role</TableHead>
-                    <TableHead>Status</TableHead>
-                    <TableHead>Actions</TableHead>
-                  </TableRow>
-                </TableHeader>
-                <TableBody>
-                  {users
-                    .filter((user) => user.email !== adminData?.email)
-                    .map((user) => (
-                      <TableRow key={user.user_id}>
-                        <TableCell>
-                          {`${user.first_name || ''} ${
-                            user.last_name || ''
-                          }`.trim()}
-                        </TableCell>
-                        <TableCell>{user.email}</TableCell>
-                        <TableCell>
-                          <Select
-                            onValueChange={(value) =>
-                              updateUser(user.user_id, {
-                                role: value as string,
-                              })
-                            }
-                            defaultValue={user.role}
-                            disabled={
-                              user.role === 'admin' &&
-                              users.filter((u) => u.role === 'admin').length ===
-                                1
-                            }
-                          >
-                            <SelectTrigger>
-                              <SelectValue placeholder="Select role" />
-                            </SelectTrigger>
-                            <SelectContent>
-                              <SelectItem value="user">User</SelectItem>
-                              <SelectItem value="admin">Admin</SelectItem>
-                            </SelectContent>
-                          </Select>
-                        </TableCell>
-                        <TableCell>
-                          <Switch
-                            checked={!user.disabled}
-                            onCheckedChange={(checked) =>
-                              updateUser(user.user_id, { disabled: !checked })
-                            }
-                            disabled={user.role === 'admin'}
-                          />
-                        </TableCell>
-                        <TableCell>
-                          <Button
-                            variant="destructive"
-                            onClick={() => deleteUser(user.user_id)}
-                            disabled={user.role === 'admin'}
-                          >
-                            <Trash2 className="h-4 w-4" />
-                          </Button>
-                        </TableCell>
-                      </TableRow>
-                    ))}
-                </TableBody>
-              </Table>
-            </CardContent>
-          </Card>
+          <UsersManagement adminEmail={adminData?.email} />
         </TabsContent>
         <TabsContent value="ingestion">
-          <Card>
-            <CardHeader>
-              <CardTitle>Data Ingestion</CardTitle>
-              <CardDescription>
-                Manage data ingestion processes.
-              </CardDescription>
-            </CardHeader>
-            <CardContent>
-              <div className="space-y-4">
-                <div className="w-full mx-auto min-h-96 border border-dashed bg-white dark:bg-black border-neutral-200 dark:border-neutral-800 rounded-lg">
-                  <FileUpload onChange={handleFileUpload} />
-                </div>
-                {file && (
-                  <>
-                    <div className="flex items-center space-x-2">
-                      <Button
-                        onClick={uploadFile}
-                        disabled={isUploading}
-                        variant="default"
-                        className="flex items-center w-full"
-                      >
-                        {isUploading ? (
-                          <LoaderIcon className="mr-2 h-4 w-4 animate-spin" />
-                        ) : (
-                          <Upload className="mr-2 h-4 w-4" />
-                        )}
-                        {isUploading
-                          ? 'Uploading and Ingesting...'
-                          : 'Ingest File'}
-                      </Button>
-                    </div>
-                  </>
-                )}
-                {uploadResult && (
-                  <div className="mt-2 text-sm text-gray-600 dark:text-gray-400">
-                    {uploadResult}
-                  </div>
-                )}
-                <div>
-                  <Label htmlFor="ingestionStrategy">
-                    Ingestion Strategy (Coming Soon)
-                  </Label>
-                  <Select disabled>
-                    <SelectTrigger>
-                      <SelectValue placeholder="Select a strategy" />
-                    </SelectTrigger>
-                    <SelectContent>
-                      <SelectItem value="fixed">Fixed Size Chunking</SelectItem>
-                      <SelectItem value="semantic">
-                        Semantic Chunking
-                      </SelectItem>
-                    </SelectContent>
-                  </Select>
-                </div>
-                <div>
-                  <Label htmlFor="parser">Parser (Coming Soon)</Label>
-                  <Select disabled>
-                    <SelectTrigger>
-                      <SelectValue placeholder="Select a parser" />
-                    </SelectTrigger>
-                    <SelectContent>
-                      <SelectItem value="llama">Llama Parse</SelectItem>
-                      <SelectItem value="omni">Omniparse</SelectItem>
-                    </SelectContent>
-                  </Select>
-                </div>
-              </div>
-            </CardContent>
-          </Card>
+          <DataIngestion />
         </TabsContent>
         <TabsContent value="rag">
-          <Card>
-            <CardHeader>
-              <CardTitle>RAG Configuration</CardTitle>
-              <CardDescription>
-                Configure Retrieval-Augmented Generation settings.
-              </CardDescription>
-            </CardHeader>
-            <CardContent className="space-y-4">
-              <div>
-                <Label htmlFor="systemPrompt">System Prompt</Label>
-                <Textarea
-                  id="systemPrompt"
-                  value={systemPrompt}
-                  onChange={(e) => setSystemPrompt(e.target.value)}
-                  placeholder="Enter system prompt here..."
-                />
-                <Button
-                  onClick={updateSystemPrompt}
-                  className="mt-2 w-full"
-                  variant={isSystemPromptChanged ? 'default' : 'secondary'}
-                  disabled={systemPromptLoading || !isSystemPromptChanged}
-                >
-                  {systemPromptLoading ? 'Updating...' : 'Update System Prompt'}
-                </Button>
-              </div>
-              <Separator />
-              <div>
-                <Label>Suggested Questions</Label>
-                {suggestedQuestions.map((question, index) => (
-                  <div key={index} className="flex items-center space-x-2 mt-2">
-                    <Input
-                      value={question}
-                      onChange={(e) =>
-                        updateSuggestedQuestion(index, e.target.value)
-                      }
-                      placeholder="Enter a suggested question..."
-                    />
-                    <Button
-                      variant="outline"
-                      size="icon"
-                      onClick={() => deleteSuggestedQuestion(index)}
-                    >
-                      <Trash2 className="h-4 w-4" />
-                    </Button>
-                  </div>
-                ))}
-                <div className="w-full flex justify-between items-center mt-2">
-                  <Button
-                    variant="outline"
-                    className="mt-2"
-                    onClick={addSuggestedQuestion}
-                  >
-                    <PlusCircle className="h-4 w-4 mr-2" />
-                    Add Question
-                  </Button>
-                  <Button
-                    variant={
-                      areSuggestedQuestionsChanged ? 'default' : 'secondary'
-                    }
-                    onClick={updateConversationStarters}
-                    className="mt-2 ml-2"
-                    disabled={startersLoading || !areSuggestedQuestionsChanged}
-                  >
-                    {startersLoading
-                      ? 'Updating...'
-                      : 'Update Conversation Starters'}
-                  </Button>
-                </div>
-              </div>
-            </CardContent>
-          </Card>
+          <RAGConfiguration />
         </TabsContent>
       </Tabs>
     </div>