diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 040e3452..75a32bd3 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -2,7 +2,6 @@ import { Route, BrowserRouter as Router, Routes } from "react-router-dom";
 
 import "@/App.css";
 
-import Container from "@/components/Container";
 import NotFoundRedirect from "@/components/NotFoundRedirect";
 import PendoInitializer from "@/components/PendoInitializer";
 import { ScrollToTop } from "@/components/ScrollToTop";
@@ -17,10 +16,10 @@ import Account from "@/components/pages/Account";
 import Browse from "@/components/pages/Browse";
 import Create from "@/components/pages/Create";
 import DeleteConnect from "@/components/pages/DeleteConnect";
-import DownloadsPage from "@/components/pages/Download";
 import EmailSignup from "@/components/pages/EmailSignup";
 import FileBrowser from "@/components/pages/FileBrowser";
 import Home from "@/components/pages/Home";
+import LinkRobot from "@/components/pages/LinkRobot";
 import Listing from "@/components/pages/Listing";
 import Login from "@/components/pages/Login";
 import Logout from "@/components/pages/Logout";
@@ -54,7 +53,7 @@ const App = () => {
                   <PendoInitializer />
                   <SprigInitializer />
                   <div className="flex-grow">
-                    <Container>
+                    <div className="mt-20 mb-6 mx-4 sm:mx-6 md:mx-10 xl:mx-16 2xl:mx-28 max-full">
                       <Routes>
                         <Route path={ROUTES.HOME.path} element={<Home />} />
 
@@ -66,10 +65,6 @@ const App = () => {
 
                         {/* General pages */}
                         <Route path={ROUTES.ABOUT.path} element={<About />} />
-                        <Route
-                          path={ROUTES.DOWNLOADS.path}
-                          element={<DownloadsPage />}
-                        />
                         <Route
                           path={ROUTES.RESEARCH.path}
                           element={<ResearchPage />}
@@ -102,20 +97,17 @@ const App = () => {
                         />
 
                         {/* Listings */}
-                        <Route path={ROUTES.LISTINGS.path}>
+                        <Route path={ROUTES.BOTS.path}>
                           <Route
-                            path={ROUTES.LISTINGS.$.BROWSE.relativePath}
+                            path={ROUTES.BOTS.$.BROWSE.relativePath}
                             element={<Browse />}
                           />
                           <Route
-                            path={ROUTES.LISTINGS.$.CREATE.relativePath}
+                            path={ROUTES.BOTS.$.CREATE.relativePath}
                             element={<Create />}
                           />
                         </Route>
-                        <Route
-                          path={ROUTES.LISTING.path}
-                          element={<Listing />}
-                        />
+                        <Route path={ROUTES.BOT.path} element={<Listing />} />
                         <Route
                           path={ROUTES.FILE.path}
                           element={<FileBrowser />}
@@ -158,6 +150,11 @@ const App = () => {
                           element={<Terminal />}
                         />
 
+                        <Route
+                          path={ROUTES.LINK.path}
+                          element={<LinkRobot />}
+                        />
+
                         {/* Not found */}
                         <Route
                           path={ROUTES.NOT_FOUND.path}
@@ -165,7 +162,7 @@ const App = () => {
                         />
                         <Route path="*" element={<NotFoundRedirect />} />
                       </Routes>
-                    </Container>
+                    </div>
                   </div>
                   <Footer />
                 </div>
diff --git a/frontend/src/components/Container.tsx b/frontend/src/components/Container.tsx
deleted file mode 100644
index 76cd2889..00000000
--- a/frontend/src/components/Container.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { ReactNode } from "react";
-
-interface ContainerProps {
-  children: ReactNode;
-}
-
-const Container = (props: ContainerProps) => {
-  const { children } = props;
-
-  return (
-    <div className="mt-20 mb-6 mx-4 sm:mx-6 md:mx-10 xl:mx-16 2xl:mx-28 max-full">
-      {children}
-    </div>
-  );
-};
-
-export default Container;
diff --git a/frontend/src/components/DownloadKernelImage.tsx b/frontend/src/components/DownloadKernelImage.tsx
deleted file mode 100644
index 5073739f..00000000
--- a/frontend/src/components/DownloadKernelImage.tsx
+++ /dev/null
@@ -1,176 +0,0 @@
-import { useState } from "react";
-
-import { DeleteKernelImageModal } from "@/components/modals/DeleteKernelImageModal";
-import { EditKernelImageModal } from "@/components/modals/EditKernelImageModal";
-import {
-  Card,
-  CardContent,
-  CardFooter,
-  CardHeader,
-  CardTitle,
-} from "@/components/ui/Card";
-import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
-import { components } from "@/gen/api";
-import { useAlertQueue } from "@/hooks/useAlertQueue";
-import { useAuthentication } from "@/hooks/useAuth";
-import axios from "axios";
-import { Download, Edit, MoreVertical, Trash2 } from "lucide-react";
-
-type KernelImageResponse = components["schemas"]["KernelImageResponse"];
-
-interface Props {
-  kernelImage: KernelImageResponse;
-  onEdit: (
-    kernelImageId: string,
-    updatedData: Partial<KernelImageResponse>,
-  ) => Promise<void>;
-  onDelete: (kernelImageId: string) => Promise<void>;
-}
-
-const DownloadKernelImage = ({ kernelImage, onEdit, onDelete }: Props) => {
-  const { addErrorAlert } = useAlertQueue();
-  const auth = useAuthentication();
-  const [isDownloading, setIsDownloading] = useState(false);
-  const [isEditModalOpen, setIsEditModalOpen] = useState(false);
-  const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
-
-  const handleDownload = async () => {
-    if (!auth.isAuthenticated) {
-      addErrorAlert("Please log in to download kernel images");
-      return;
-    }
-
-    setIsDownloading(true);
-    try {
-      const response = await axios.get(
-        `/api/kernel-images/download/${kernelImage.id}`,
-      );
-
-      const presignedUrl = response.data;
-
-      // Open the URL in a new tab
-      window.open(presignedUrl, "_blank");
-    } catch (error) {
-      console.error("Error downloading kernel image:", error);
-      addErrorAlert("Error downloading kernel image");
-    } finally {
-      setIsDownloading(false);
-    }
-  };
-
-  const canModify = auth.currentUser?.permissions?.some(
-    (permission) => permission === "is_admin" || permission === "is_mod",
-  );
-
-  const handleEdit = async (updatedData: Partial<KernelImageResponse>) => {
-    try {
-      await onEdit(kernelImage.id, updatedData);
-    } catch (error) {
-      console.error("Error editing kernel image:", error);
-      addErrorAlert("Error editing kernel image");
-    }
-  };
-
-  const handleDelete = async () => {
-    try {
-      await onDelete(kernelImage.id);
-    } catch (error) {
-      console.error("Error deleting kernel image:", error);
-      addErrorAlert("Error deleting kernel image");
-    } finally {
-      setIsDeleteModalOpen(false);
-    }
-  };
-
-  return (
-    <Card key={kernelImage.id}>
-      <CardHeader className="space-y-2">
-        <CardTitle className="flex justify-between items-center">
-          {kernelImage.name}
-          <div className="flex gap-1 items-center">
-            <Badge variant="outline" className="bg-blue-100 text-blue-800">
-              Kernel
-            </Badge>
-            {kernelImage.is_official && (
-              <Badge variant="primary">Official</Badge>
-            )}
-            {canModify && (
-              <DropdownMenu>
-                <DropdownMenuTrigger asChild>
-                  <Button variant="ghost" size="sm">
-                    <MoreVertical className="h-4 w-4" />
-                  </Button>
-                </DropdownMenuTrigger>
-                <DropdownMenuContent className="flex flex-col gap-1 bg-gray-1">
-                  <DropdownMenuItem
-                    onClick={() => setIsEditModalOpen(true)}
-                    className="cursor-pointer"
-                  >
-                    <Edit className="mr-2 h-4 w-4" />
-                    Edit
-                  </DropdownMenuItem>
-                  <DropdownMenuItem
-                    onClick={() => setIsDeleteModalOpen(true)}
-                    className="cursor-pointer bg-red-500 text-gray-1"
-                  >
-                    <Trash2 className="mr-2 h-4 w-4" />
-                    Delete
-                  </DropdownMenuItem>
-                </DropdownMenuContent>
-              </DropdownMenu>
-            )}
-          </div>
-        </CardTitle>
-        {kernelImage.description ? (
-          <p className="text-sm text-muted-foreground">
-            {kernelImage.description}
-          </p>
-        ) : (
-          <div className="h-5" /> // Placeholder to maintain spacing
-        )}
-      </CardHeader>
-      <CardContent>
-        <div className="flex flex-col justify-between text-sm text-gray-11">
-          <span>Size: {(kernelImage.size / 1024 / 1024).toFixed(2)} MB</span>
-          <span>Downloads: {kernelImage.downloads}</span>
-        </div>
-      </CardContent>
-      <CardFooter>
-        <Button
-          className="w-full"
-          onClick={handleDownload}
-          disabled={isDownloading || !auth.isAuthenticated}
-        >
-          <Download className="mr-2 h-4 w-4" />
-          {isDownloading
-            ? "Downloading..."
-            : auth.isAuthenticated
-              ? "Download"
-              : "Sign In to Download"}
-        </Button>
-      </CardFooter>
-
-      <EditKernelImageModal
-        isOpen={isEditModalOpen}
-        onOpenChange={setIsEditModalOpen}
-        onEdit={handleEdit}
-        kernelImage={kernelImage}
-      />
-      <DeleteKernelImageModal
-        isOpen={isDeleteModalOpen}
-        onOpenChange={setIsDeleteModalOpen}
-        onDelete={handleDelete}
-        kernelImageName={kernelImage.name}
-      />
-    </Card>
-  );
-};
-
-export default DownloadKernelImage;
diff --git a/frontend/src/components/listing/ListingDeleteButton.tsx b/frontend/src/components/listing/ListingDeleteButton.tsx
index 8919c43a..dbb77c96 100644
--- a/frontend/src/components/listing/ListingDeleteButton.tsx
+++ b/frontend/src/components/listing/ListingDeleteButton.tsx
@@ -38,7 +38,7 @@ const ListingDeleteButton = (props: Props) => {
       setDeleting(false);
     } else {
       addAlert("Listing was deleted successfully", "success");
-      navigate(ROUTES.LISTINGS.BROWSE.path);
+      navigate(ROUTES.BOTS.BROWSE.path);
     }
   };
 
diff --git a/frontend/src/components/listings/ListingGrid.tsx b/frontend/src/components/listings/ListingGrid.tsx
index b8b0a6d1..fd183d3e 100644
--- a/frontend/src/components/listings/ListingGrid.tsx
+++ b/frontend/src/components/listings/ListingGrid.tsx
@@ -63,10 +63,10 @@ const ListingGrid = (props: ListingGridProps) => {
       <Spinner />
     </div>
   ) : (
-    <div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-4 max-w-7xl mx-auto">
+    <div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-4">
       {listingInfos.map((info) => (
         <Link
-          to={ROUTES.LISTING.buildPath({
+          to={ROUTES.BOT.buildPath({
             username: info.username,
             slug: info.slug || info.id,
           })}
diff --git a/frontend/src/components/listings/MyListingGrid.tsx b/frontend/src/components/listings/MyListingGrid.tsx
index cb628b60..5fc1b065 100644
--- a/frontend/src/components/listings/MyListingGrid.tsx
+++ b/frontend/src/components/listings/MyListingGrid.tsx
@@ -82,7 +82,7 @@ const MyListingGrid = ({ userId }: MyListingGridProps) => {
     <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-4 sm:gap-6">
       {listingInfos.map((info) => (
         <Link
-          to={ROUTES.LISTING.buildPath({
+          to={ROUTES.BOT.buildPath({
             username: info.username,
             slug: info.slug || info.id,
           })}
diff --git a/frontend/src/components/listings/UpvotedGrid.tsx b/frontend/src/components/listings/UpvotedGrid.tsx
index e69a8426..08f51532 100644
--- a/frontend/src/components/listings/UpvotedGrid.tsx
+++ b/frontend/src/components/listings/UpvotedGrid.tsx
@@ -92,7 +92,7 @@ const UpvotedGrid = ({ page, setPage }: UpvotedGridProps) => {
       <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-4 sm:gap-6">
         {listingInfos.map((info) => (
           <Link
-            to={ROUTES.LISTING.buildPath({
+            to={ROUTES.BOT.buildPath({
               username: info.username || "unknown",
               slug: info.slug || info.id,
             })}
diff --git a/frontend/src/components/modals/DeleteKernelImageModal.tsx b/frontend/src/components/modals/DeleteKernelImageModal.tsx
deleted file mode 100644
index e227ebc1..00000000
--- a/frontend/src/components/modals/DeleteKernelImageModal.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import { Button } from "@/components/ui/button";
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from "@/components/ui/dialog";
-import { Trash2 } from "lucide-react";
-
-interface Props {
-  isOpen: boolean;
-  onOpenChange: (open: boolean) => void;
-  onDelete: () => Promise<void>;
-  kernelImageName: string;
-}
-
-export const DeleteKernelImageModal = ({
-  isOpen,
-  onOpenChange,
-  onDelete,
-  kernelImageName,
-}: Props) => {
-  const handleDelete = async () => {
-    await onDelete();
-    onOpenChange(false);
-  };
-
-  return (
-    <Dialog open={isOpen} onOpenChange={onOpenChange}>
-      <DialogContent className="sm:max-w-[425px] bg-gray-1 text-gray-12 border bodrder-gray-3 rounded-lg shadow-lg">
-        <DialogHeader>
-          <DialogTitle>Delete Kernel Image</DialogTitle>
-          <DialogDescription>
-            Are you sure you want to delete the kernel image &quot;
-            {kernelImageName}&quot;? This action cannot be undone.
-          </DialogDescription>
-        </DialogHeader>
-        <DialogFooter>
-          <Button variant="outline" onClick={() => onOpenChange(false)}>
-            Cancel
-          </Button>
-          <Button variant="destructive" onClick={handleDelete}>
-            <Trash2 className="mr-2 h-4 w-4" /> Delete
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  );
-};
-
-export default DeleteKernelImageModal;
diff --git a/frontend/src/components/modals/EditKernelImageModal.tsx b/frontend/src/components/modals/EditKernelImageModal.tsx
deleted file mode 100644
index b01f4be3..00000000
--- a/frontend/src/components/modals/EditKernelImageModal.tsx
+++ /dev/null
@@ -1,143 +0,0 @@
-import { useState } from "react";
-
-import { Button } from "@/components/ui/button";
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from "@/components/ui/dialog";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import { Textarea } from "@/components/ui/textarea";
-import { components } from "@/gen/api";
-import { Save } from "lucide-react";
-
-type KernelImageResponse = components["schemas"]["KernelImageResponse"];
-
-interface Props {
-  isOpen: boolean;
-  onOpenChange: (open: boolean) => void;
-  onEdit: (updatedData: Partial<KernelImageResponse>) => Promise<void>;
-  kernelImage: KernelImageResponse;
-}
-
-export const EditKernelImageModal = ({
-  isOpen,
-  onOpenChange,
-  onEdit,
-  kernelImage,
-}: Props) => {
-  const [name, setName] = useState(kernelImage.name);
-  const [description, setDescription] = useState(kernelImage.description || "");
-  const [isPublic, setIsPublic] = useState(kernelImage.is_public);
-  const [isOfficial, setIsOfficial] = useState(kernelImage.is_official);
-
-  const handleSubmit = async (e: React.FormEvent) => {
-    e.preventDefault();
-    const updatedData: Partial<KernelImageResponse> = {
-      name,
-      description,
-      is_public: isPublic,
-      is_official: isOfficial,
-    };
-    await onEdit(updatedData);
-    onOpenChange(false);
-  };
-
-  return (
-    <Dialog open={isOpen} onOpenChange={onOpenChange}>
-      <DialogContent className="sm:max-w-[425px] bg-gray-1 text-gray-12 border border-gray-3 rounded-lg shadow-lg">
-        <DialogHeader>
-          <DialogTitle>Edit Kernel Image</DialogTitle>
-          <DialogDescription className="text-gray-11">
-            You can not edit the kernel image file itself (only the below
-            details). Delete and re-upload to change file.
-          </DialogDescription>
-        </DialogHeader>
-        <form onSubmit={handleSubmit}>
-          <div className="grid gap-4 py-4">
-            <div className="grid gap-2">
-              <Label
-                htmlFor="name"
-                className="text-sm font-medium text-gray-12"
-              >
-                Name
-              </Label>
-              <Input
-                id="name"
-                value={name}
-                onChange={(e) => setName(e.target.value)}
-                className="bg-gray-2 border-gray-3 text-gray-12"
-              />
-            </div>
-            <div className="grid gap-2">
-              <Label
-                htmlFor="description"
-                className="text-sm font-medium text-gray-12"
-              >
-                Description
-              </Label>
-              <Textarea
-                id="description"
-                value={description}
-                onChange={(e) => setDescription(e.target.value)}
-                className="bg-gray-2 border-gray-3 text-gray-12"
-                rows={3}
-              />
-            </div>
-            <div className="flex items-center">
-              <input
-                type="checkbox"
-                id="isPublic"
-                checked={isPublic}
-                onChange={(e) => setIsPublic(e.target.checked)}
-                className="mr-2"
-              />
-              <Label
-                htmlFor="isPublic"
-                className="text-sm font-medium text-gray-12"
-              >
-                Make this kernel image public
-              </Label>
-            </div>
-            <div className="flex items-center">
-              <input
-                type="checkbox"
-                id="isOfficial"
-                checked={isOfficial}
-                onChange={(e) => setIsOfficial(e.target.checked)}
-                className="mr-2"
-              />
-              <Label
-                htmlFor="isOfficial"
-                className="text-sm font-medium text-gray-12"
-              >
-                Mark as official kernel image
-              </Label>
-            </div>
-          </div>
-          <DialogFooter>
-            <Button
-              type="button"
-              variant="outline"
-              onClick={() => onOpenChange(false)}
-            >
-              Cancel
-            </Button>
-            <Button
-              type="submit"
-              className="bg-primary-9 text-gray-1 hover:bg-gray-12"
-            >
-              <Save className="mr-2 h-4 w-4" /> Save Changes
-            </Button>
-          </DialogFooter>
-        </form>
-      </DialogContent>
-    </Dialog>
-  );
-};
-
-export default EditKernelImageModal;
diff --git a/frontend/src/components/modals/UploadKerenlImageModal.tsx b/frontend/src/components/modals/UploadKerenlImageModal.tsx
deleted file mode 100644
index 64ffcbd4..00000000
--- a/frontend/src/components/modals/UploadKerenlImageModal.tsx
+++ /dev/null
@@ -1,188 +0,0 @@
-import { useCallback, useState } from "react";
-import { useDropzone } from "react-dropzone";
-
-import { Button } from "@/components/ui/button";
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-} from "@/components/ui/dialog";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import { Textarea } from "@/components/ui/textarea";
-import { Upload, X } from "lucide-react";
-
-interface UploadKernelImageModalProps {
-  isOpen: boolean;
-  onClose: () => void;
-  onUpload: (
-    file: File,
-    name: string,
-    description: string,
-    isPublic: boolean,
-    isOfficial: boolean,
-  ) => Promise<void>;
-}
-
-export function UploadKernelImageModal({
-  isOpen,
-  onClose,
-  onUpload,
-}: UploadKernelImageModalProps) {
-  const [file, setFile] = useState<File | null>(null);
-  const [name, setName] = useState("");
-  const [description, setDescription] = useState("");
-  const [isPublic, setIsPublic] = useState(false);
-  const [isOfficial, setIsOfficial] = useState(false);
-  const [isLoading, setIsLoading] = useState(false);
-
-  const resetModalData = useCallback(() => {
-    setFile(null);
-    setName("");
-    setDescription("");
-    setIsPublic(false);
-    setIsOfficial(false);
-  }, []);
-
-  const onDrop = useCallback((acceptedFiles: File[]) => {
-    if (acceptedFiles.length > 0) {
-      setFile(acceptedFiles[0]);
-      setName(acceptedFiles[0].name);
-    }
-  }, []);
-
-  const { getRootProps, getInputProps, isDragActive } = useDropzone({
-    onDrop,
-  });
-
-  const handleUpload = useCallback(async () => {
-    if (file) {
-      setIsLoading(true);
-      try {
-        await onUpload(file, name, description, isPublic, isOfficial);
-        resetModalData();
-        onClose();
-      } catch (error) {
-        console.error("Error uploading kernel image:", error);
-      } finally {
-        setIsLoading(false);
-      }
-    }
-  }, [
-    file,
-    name,
-    description,
-    isPublic,
-    isOfficial,
-    onUpload,
-    onClose,
-    resetModalData,
-  ]);
-
-  return (
-    <Dialog
-      open={isOpen}
-      onOpenChange={(open) => {
-        if (!open) {
-          resetModalData();
-        }
-        onClose();
-      }}
-    >
-      <DialogContent className="sm:max-w-[425px] bg-gray-1 text-gray-12 border border-gray-3 rounded-lg shadow-lg">
-        <DialogHeader>
-          <DialogTitle>Upload Kernel Image</DialogTitle>
-        </DialogHeader>
-        <div className="grid gap-4 py-4">
-          <div
-            {...getRootProps()}
-            className="border-2 border-dashed border-gray-8 hover:border-gray-12 hover:bg-gray-3 rounded-md px-4 py-6 text-center cursor-pointer"
-          >
-            <input {...getInputProps()} />
-            {file ? (
-              <div className="flex items-center justify-between">
-                <span>{file.name}</span>
-                <Button variant="ghost" size="sm" onClick={() => setFile(null)}>
-                  <X className="h-4 w-4" />
-                </Button>
-              </div>
-            ) : (
-              <p>
-                {isDragActive
-                  ? "Drop the file here"
-                  : "Click to select file or drag and drop it here"}
-              </p>
-            )}
-          </div>
-          <div className="grid gap-2">
-            <Label htmlFor="name" className="text-sm font-medium text-gray-12">
-              Name
-            </Label>
-            <Input
-              id="name"
-              value={name}
-              onChange={(e) => setName(e.target.value)}
-              className="bg-gray-2 border-gray-3 text-gray-12"
-            />
-          </div>
-          <div className="grid gap-2">
-            <Label
-              htmlFor="description"
-              className="text-sm font-medium text-gray-12"
-            >
-              Description
-            </Label>
-            <Textarea
-              id="description"
-              value={description}
-              onChange={(e) => setDescription(e.target.value)}
-              className="bg-gray-2 border-gray-3 text-gray-12"
-              rows={3}
-            />
-          </div>
-          <div className="flex items-center">
-            <input
-              type="checkbox"
-              id="isPublic"
-              checked={isPublic}
-              onChange={(e) => setIsPublic(e.target.checked)}
-              className="mr-2"
-            />
-            <Label
-              htmlFor="isPublic"
-              className="text-sm font-medium text-gray-12"
-            >
-              Make this kernel image public
-            </Label>
-          </div>
-          <div className="flex items-center">
-            <input
-              type="checkbox"
-              id="isOfficial"
-              checked={isOfficial}
-              onChange={(e) => setIsOfficial(e.target.checked)}
-              className="mr-2"
-            />
-            <Label
-              htmlFor="isOfficial"
-              className="text-sm font-medium text-gray-12"
-            >
-              Mark as official kernel image
-            </Label>
-          </div>
-        </div>
-        <div className="flex justify-end">
-          <Button
-            onClick={handleUpload}
-            disabled={!file || isLoading}
-            className="w-full sm:w-auto bg-primary-9 text-gray-1 hover:bg-gray-12"
-          >
-            <Upload className="mr-2 h-4 w-4" />
-            {isLoading ? "Uploading..." : "Upload Kernel Image"}
-          </Button>
-        </div>
-      </DialogContent>
-    </Dialog>
-  );
-}
diff --git a/frontend/src/components/nav/Navbar.tsx b/frontend/src/components/nav/Navbar.tsx
index 6bca68a4..fec38d87 100644
--- a/frontend/src/components/nav/Navbar.tsx
+++ b/frontend/src/components/nav/Navbar.tsx
@@ -16,7 +16,6 @@ import ROUTES from "@/lib/types/routes";
 import {
   ChevronDownIcon,
   ChevronUpIcon,
-  DownloadIcon,
   ExternalLinkIcon,
   MagnifyingGlassIcon,
 } from "@radix-ui/react-icons";
@@ -46,17 +45,11 @@ const Navbar = () => {
 
   const technicalItems = [
     {
-      name: "Builds",
-      path: ROUTES.LISTINGS.BROWSE.path,
+      name: "Bots",
+      path: ROUTES.BOTS.BROWSE.path,
       icon: <MagnifyingGlassIcon className="h-5 w-5" />,
       isExternal: false,
     },
-    {
-      name: "Downloads",
-      path: ROUTES.DOWNLOADS.path,
-      icon: <DownloadIcon className="h-5 w-5" />,
-      isExternal: false,
-    },
     {
       name: "Playground",
       path: ROUTES.PLAYGROUND.path,
@@ -127,7 +120,7 @@ const Navbar = () => {
   };
 
   const handleFeaturedClick = (username: string, slug: string | null) => {
-    const path = ROUTES.LISTING.buildPath({
+    const path = ROUTES.BOT.buildPath({
       username,
       slug: slug || "",
     });
diff --git a/frontend/src/components/pages/Browse.tsx b/frontend/src/components/pages/Browse.tsx
index 0a979bda..6035b388 100644
--- a/frontend/src/components/pages/Browse.tsx
+++ b/frontend/src/components/pages/Browse.tsx
@@ -6,6 +6,7 @@ import ListingGrid from "@/components/listings/ListingGrid";
 import { Input } from "@/components/ui/Input/Input";
 import Spinner from "@/components/ui/Spinner";
 import { Button } from "@/components/ui/button";
+import Container from "@/components/ui/container";
 import {
   DropdownMenu,
   DropdownMenuCheckboxItem,
@@ -113,7 +114,7 @@ const Browse = () => {
   ];
 
   return (
-    <>
+    <Container>
       <div className="py-8">
         <div className="flex flex-col md:flex-row justify-center items-center gap-2">
           <div className="relative w-full md:w-auto">
@@ -165,7 +166,7 @@ const Browse = () => {
               </DropdownMenuContent>
             </DropdownMenu>
             <Button
-              onClick={() => navigate(ROUTES.LISTINGS.CREATE.path)}
+              onClick={() => navigate(ROUTES.BOTS.CREATE.path)}
               variant="primary"
               size="lg"
               className="w-full md:w-auto"
@@ -185,7 +186,7 @@ const Browse = () => {
           </div>
         )}
       </div>
-    </>
+    </Container>
   );
 };
 
diff --git a/frontend/src/components/pages/Create.tsx b/frontend/src/components/pages/Create.tsx
index 6104bc40..f7c3c0e6 100644
--- a/frontend/src/components/pages/Create.tsx
+++ b/frontend/src/components/pages/Create.tsx
@@ -138,7 +138,7 @@ const Create = () => {
       if (responseData && responseData.username && responseData.slug) {
         addAlert("New listing was created successfully", "success");
         navigate(
-          ROUTES.LISTING.buildPath({
+          ROUTES.BOT.buildPath({
             username: responseData.username,
             slug: responseData.slug,
           }),
diff --git a/frontend/src/components/pages/Download.tsx b/frontend/src/components/pages/Download.tsx
deleted file mode 100644
index 6359611a..00000000
--- a/frontend/src/components/pages/Download.tsx
+++ /dev/null
@@ -1,235 +0,0 @@
-import { useCallback, useEffect, useState } from "react";
-
-import Container from "@/components/Container";
-import DownloadKernelImage from "@/components/DownloadKernelImage";
-import LoadingArtifactCard from "@/components/listing/artifacts/LoadingArtifactCard";
-import { UploadKernelImageModal } from "@/components/modals/UploadKerenlImageModal";
-import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
-import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
-import { components } from "@/gen/api";
-import { useAlertQueue } from "@/hooks/useAlertQueue";
-import { useAuthentication } from "@/hooks/useAuth";
-import { Search, Upload } from "lucide-react";
-
-type KernelImageResponse = components["schemas"]["KernelImageResponse"];
-
-export default function DownloadsPage() {
-  const auth = useAuthentication();
-  const { addErrorAlert, addAlert } = useAlertQueue();
-  const [kernelImages, setKernelImages] = useState<KernelImageResponse[]>([]);
-  const [isLoading, setIsLoading] = useState(false);
-  const [searchTerm, setSearchTerm] = useState("");
-  const [activeTab, setActiveTab] = useState("kernel");
-  const [isUploadModalOpen, setIsUploadModalOpen] = useState(false);
-
-  const fetchKernelImages = async () => {
-    if (isLoading) return;
-    setIsLoading(true);
-    try {
-      const response = await auth.client.GET("/kernel-images/public", {});
-      if (response.data) {
-        setKernelImages(response.data);
-      }
-    } catch (error) {
-      console.error("Failed to fetch kernel images:", error);
-      addErrorAlert("Failed to fetch kernel images");
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  useEffect(() => {
-    fetchKernelImages();
-  }, []);
-
-  const handleUpload = async (
-    file: File,
-    name: string,
-    description: string,
-    isPublic: boolean,
-    isOfficial: boolean,
-  ) => {
-    try {
-      // Convert File to base64 string
-      const fileBase64 = await fileToBase64(file);
-
-      // Remove the data URL prefix if present
-      const base64Content = fileBase64.split(",")[1] || fileBase64;
-
-      // Create the request body object with the correct types
-      const requestBody = {
-        name,
-        file: base64Content,
-        is_public: isPublic,
-        is_official: isOfficial,
-        description: description || null, // Handle empty description
-      };
-
-      const response = await auth.client.POST("/kernel-images/upload", {
-        body: requestBody,
-        headers: {
-          "Content-Type": "application/json", // Changed to JSON
-        },
-      });
-
-      if (response.error) {
-        console.error("Upload failed:", response.error);
-        addErrorAlert(
-          `Upload failed: ${response.error instanceof Error ? response.error.message : String(response.error)}`,
-        );
-      } else {
-        addAlert("Kernel image uploaded successfully", "success");
-        setKernelImages((prevKernelImages) => [
-          response.data as KernelImageResponse,
-          ...prevKernelImages,
-        ]);
-        setIsUploadModalOpen(false);
-      }
-    } catch (error) {
-      console.error("Upload failed:", error);
-      addErrorAlert("Upload failed");
-    }
-  };
-
-  const handleEdit = useCallback(
-    async (
-      kernelImageId: string,
-      updatedData: Partial<KernelImageResponse>,
-    ) => {
-      try {
-        const response = await auth.client.PUT(
-          "/kernel-images/edit/{kernel_image_id}",
-          {
-            params: {
-              path: { kernel_image_id: kernelImageId },
-            },
-            body: updatedData as Record<string, never>,
-          },
-        );
-        if (response.error) {
-          addErrorAlert(`Failed to update kernel image: ${response.error}`);
-        } else {
-          addAlert("Kernel image updated successfully", "success");
-          setKernelImages((prevImages) =>
-            prevImages.map((img) =>
-              img.id === kernelImageId ? { ...img, ...updatedData } : img,
-            ),
-          );
-        }
-      } catch (error) {
-        console.error("Error updating kernel image:", error);
-        addErrorAlert("Error updating kernel image");
-      }
-    },
-    [auth.client, addErrorAlert, addAlert],
-  );
-
-  const handleDelete = useCallback(
-    async (kernelImageId: string) => {
-      try {
-        const response = await auth.client.DELETE(
-          "/kernel-images/delete/{kernel_image_id}",
-          {
-            params: {
-              path: { kernel_image_id: kernelImageId },
-            },
-          },
-        );
-        if (response.error) {
-          addErrorAlert(`Failed to delete kernel image: ${response.error}`);
-        } else {
-          addAlert("Kernel image deleted successfully", "success");
-          setKernelImages((prevImages) =>
-            prevImages.filter((img) => img.id !== kernelImageId),
-          );
-        }
-      } catch (error) {
-        console.error("Error deleting kernel image:", error);
-        addErrorAlert("Error deleting kernel image");
-      }
-    },
-    [auth.client, addErrorAlert, addAlert],
-  );
-
-  const filteredKernelImages = kernelImages.filter(
-    (ki) =>
-      ki.name.toLowerCase().includes(searchTerm.toLowerCase()) &&
-      activeTab === "kernel",
-  );
-
-  // Check if the user has admin or moderator permissions
-  const canUpload =
-    auth.currentUser?.permissions?.some(
-      (permission) => permission === "is_admin" || permission === "is_mod",
-    ) || false;
-
-  return (
-    <Container>
-      <h1 className="text-3xl font-bold mb-2">K-Scale Downloads</h1>
-      <p className="text-muted-foreground mb-6">
-        View and download official K-Scale and community uploaded kernel images
-      </p>
-
-      <div className="flex justify-between items-center mb-6">
-        <div className="relative w-64">
-          <Search className="absolute left-2 top-2.5 h-4 w-4 text-muted-foreground" />
-          <Input
-            placeholder="Search"
-            value={searchTerm}
-            onChange={(e) => setSearchTerm(e.target.value)}
-            className="pl-8"
-          />
-        </div>
-        {canUpload && (
-          <Button onClick={() => setIsUploadModalOpen(true)}>
-            <Upload className="mr-2 h-4 w-4" /> Upload
-          </Button>
-        )}
-      </div>
-
-      <Tabs defaultValue="kernel" className="mb-6" onValueChange={setActiveTab}>
-        <TabsList>
-          <TabsTrigger value="kernel">Kernel Images</TabsTrigger>
-          <TabsTrigger value="ml">ML Weights</TabsTrigger>
-        </TabsList>
-      </Tabs>
-
-      <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
-        {filteredKernelImages.map((kernelImage) => (
-          <DownloadKernelImage
-            key={kernelImage.id}
-            kernelImage={kernelImage}
-            onEdit={handleEdit}
-            onDelete={handleDelete}
-          />
-        ))}
-        {isLoading && (
-          <>
-            <LoadingArtifactCard />
-            <LoadingArtifactCard />
-            <LoadingArtifactCard />
-          </>
-        )}
-      </div>
-
-      {canUpload && (
-        <UploadKernelImageModal
-          isOpen={isUploadModalOpen}
-          onClose={() => setIsUploadModalOpen(false)}
-          onUpload={handleUpload}
-        />
-      )}
-    </Container>
-  );
-}
-
-// Helper function to convert File to base64
-const fileToBase64 = (file: File): Promise<string> => {
-  return new Promise((resolve, reject) => {
-    const reader = new FileReader();
-    reader.readAsDataURL(file);
-    reader.onload = () => resolve(reader.result as string);
-    reader.onerror = (error) => reject(error);
-  });
-};
diff --git a/frontend/src/components/pages/FileBrowser.tsx b/frontend/src/components/pages/FileBrowser.tsx
index 37434cee..7565d5e2 100644
--- a/frontend/src/components/pages/FileBrowser.tsx
+++ b/frontend/src/components/pages/FileBrowser.tsx
@@ -218,7 +218,7 @@ const FileBrowser = () => {
                 <Button
                   onClick={() =>
                     navigate(
-                      ROUTES.LISTING.buildPath({
+                      ROUTES.BOT.buildPath({
                         username: artifact.username,
                         slug: artifact.slug,
                       }),
diff --git a/frontend/src/components/pages/Home.tsx b/frontend/src/components/pages/Home.tsx
index 98bc6717..23e1a8f5 100644
--- a/frontend/src/components/pages/Home.tsx
+++ b/frontend/src/components/pages/Home.tsx
@@ -14,7 +14,6 @@ import ROUTES from "@/lib/types/routes";
 import {
   ChevronRightIcon,
   CodeIcon,
-  DownloadIcon,
   ExternalLinkIcon,
   MagnifyingGlassIcon,
 } from "@radix-ui/react-icons";
@@ -82,25 +81,18 @@ const OptionsSection: React.FC = () => {
     <section className="w-full py-24 sm:py-36">
       <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6">
         {[
-          {
-            title: "Downloads",
-            description: "Kernel images, URDFs, ML models, and more.",
-            icon: DownloadIcon,
-            path: ROUTES.DOWNLOADS.path,
-            buttonText: "Browse Downloads",
-          },
           {
             title: "Browse Builds",
             description:
-              "Browse robot builds with linked CAD files, part lists, and various related downloads.",
+              "Browse robot builds with linked CAD files, part lists, and related downloads.",
             icon: MagnifyingGlassIcon,
-            path: ROUTES.LISTINGS.BROWSE.path,
+            path: ROUTES.BOTS.BROWSE.path,
             buttonText: "View Builds",
           },
           {
             title: "Code",
             description:
-              "Explore or contribute to dozens of open-source repositories from robot builds to edge vision-language-action models, kernel images, simulations, and more.",
+              "Explore or contribute to dozens of open-source repositories from robot builds to edge vision-language-action models, simulations, and more.",
             icon: CodeIcon,
             path: "https://github.com/kscalelabs",
             buttonText: "Visit our Github",
diff --git a/frontend/src/components/pages/LinkRobot.tsx b/frontend/src/components/pages/LinkRobot.tsx
new file mode 100644
index 00000000..37d89957
--- /dev/null
+++ b/frontend/src/components/pages/LinkRobot.tsx
@@ -0,0 +1,103 @@
+import React, { useRef, useState } from "react";
+
+import Container from "@/components/ui/container";
+import { useAlertQueue } from "@/hooks/useAlertQueue";
+
+const LinkRobot = () => {
+  const [code, setCode] = useState(Array(6).fill(""));
+  const [isLoading, setIsLoading] = useState(false);
+  const inputRefs = useRef<(HTMLInputElement | null)[]>([]);
+
+  const { addAlert } = useAlertQueue();
+
+  const isSubmitDisabled = code.some((digit) => digit === "") || isLoading;
+
+  const handleCodeChange = (index: number, value: string) => {
+    if (!/^\d*$/.test(value)) return;
+
+    const newCode = [...code];
+    newCode[index] = value;
+    setCode(newCode);
+
+    // Move to next input if value is entered
+    if (value !== "" && index < 5) {
+      inputRefs.current[index + 1]?.focus();
+    } else if (value !== "" && index === 5) {
+      // Auto-submit when the last digit is entered
+      handleSubmit();
+    }
+  };
+
+  const handleKeyDown = (
+    index: number,
+    e: React.KeyboardEvent<HTMLInputElement>,
+  ) => {
+    if (e.key === "Backspace" && !code[index] && index > 0) {
+      inputRefs.current[index - 1]?.focus();
+    } else if (e.key === "Enter" && !isSubmitDisabled) {
+      handleSubmit();
+    }
+  };
+
+  const handleSubmit = async () => {
+    if (code.some((digit) => digit === "")) return;
+
+    setIsLoading(true);
+    addAlert("Linking is not yet implemented", "error");
+    setIsLoading(false);
+  };
+
+  return (
+    <Container>
+      <div className="max-w-md mx-auto mt-12 p-8 bg-white rounded-2xl shadow-lg">
+        <div className="text-center mb-8">
+          <h1 className="text-3xl font-bold text-gray-800 mb-3">
+            Link Your Robot
+          </h1>
+          <p className="text-gray-600">
+            Enter the 6-digit code displayed on your robot
+          </p>
+        </div>
+
+        <div className="flex flex-col gap-6 items-center">
+          <div className="grid grid-cols-6 gap-3 w-full">
+            {Array(6)
+              .fill(null)
+              .map((_, index) => (
+                <input
+                  key={index}
+                  ref={(el) => (inputRefs.current[index] = el)}
+                  type="text"
+                  inputMode="numeric"
+                  maxLength={1}
+                  value={code[index]}
+                  onChange={(e) => handleCodeChange(index, e.target.value)}
+                  onKeyDown={(e) => handleKeyDown(index, e)}
+                  className="w-full h-16 text-center text-2xl font-semibold border-2 border-gray-200 rounded-xl
+                    focus:outline-none focus:border-blue-500 focus:ring-2 focus:ring-blue-200
+                    transition-all duration-200
+                    disabled:bg-gray-50 disabled:cursor-not-allowed
+                    placeholder-gray-300"
+                  placeholder="0"
+                  disabled={isLoading}
+                />
+              ))}
+          </div>
+
+          <button
+            onClick={handleSubmit}
+            disabled={isSubmitDisabled}
+            className="w-full py-4 px-6 mt-4 bg-blue-600 hover:bg-blue-700
+              text-white font-semibold rounded-xl transition-colors duration-200
+              disabled:bg-gray-300 disabled:cursor-not-allowed
+              focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2"
+          >
+            {isLoading ? "Linking..." : "Link Robot"}
+          </button>
+        </div>
+      </div>
+    </Container>
+  );
+};
+
+export default LinkRobot;
diff --git a/frontend/src/components/pages/Listing.tsx b/frontend/src/components/pages/Listing.tsx
index 175d693c..56adfe51 100644
--- a/frontend/src/components/pages/Listing.tsx
+++ b/frontend/src/components/pages/Listing.tsx
@@ -4,6 +4,7 @@ import { useTypedParams } from "react-router-typesafe-routes/dom";
 import ListingLoadingSkeleton from "@/components/listing/ListingLoadingSkeleton";
 import ListingRenderer from "@/components/listing/ListingRenderer";
 import { ListingResponse } from "@/components/listing/types";
+import Container from "@/components/ui/container";
 import { useAlertQueue } from "@/hooks/useAlertQueue";
 import { useAuthentication } from "@/hooks/useAuth";
 import ROUTES from "@/lib/types/routes";
@@ -11,7 +12,7 @@ import ROUTES from "@/lib/types/routes";
 const Listing = () => {
   const { addErrorAlert } = useAlertQueue();
   const auth = useAuthentication();
-  const { username, slug } = useTypedParams(ROUTES.LISTING);
+  const { username, slug } = useTypedParams(ROUTES.BOT);
   const [listing, setListing] = useState<ListingResponse | null>(null);
   const [isFetched, setIsFetched] = useState(false);
 
@@ -55,7 +56,7 @@ const Listing = () => {
   }, [username, slug]);
 
   return (
-    <div className="max-w-7xl mx-auto px-4">
+    <Container>
       <div className="flex-grow">
         {isFetched && listing !== null ? (
           <ListingRenderer listing={listing} />
@@ -63,7 +64,7 @@ const Listing = () => {
           <ListingLoadingSkeleton />
         )}
       </div>
-    </div>
+    </Container>
   );
 };
 
diff --git a/frontend/src/components/pages/Orders.tsx b/frontend/src/components/pages/Orders.tsx
index b99ce81f..b28c6339 100644
--- a/frontend/src/components/pages/Orders.tsx
+++ b/frontend/src/components/pages/Orders.tsx
@@ -74,7 +74,7 @@ const OrdersPage: React.FC = () => {
         <div className="flex flex-col gap-4 justify-center items-center bg-gray-4 p-10 rounded-lg max-w-3xl mx-auto">
           <p className="text-gray-12 font-medium sm:text-lg">No orders yet.</p>
           <Button
-            onClick={() => navigate(ROUTES.LISTINGS.BROWSE.path)}
+            onClick={() => navigate(ROUTES.BOTS.BROWSE.path)}
             variant="primary"
           >
             Browse Robots
diff --git a/frontend/src/components/terminal/RobotCard.tsx b/frontend/src/components/terminal/RobotCard.tsx
index 7a74a9b9..c60a2798 100644
--- a/frontend/src/components/terminal/RobotCard.tsx
+++ b/frontend/src/components/terminal/RobotCard.tsx
@@ -61,7 +61,7 @@ export default function RobotCard({ robot, onDeleteRobot }: RobotCardProps) {
               position="bottom"
             >
               <Link
-                to={ROUTES.LISTING.buildPath({
+                to={ROUTES.BOT.buildPath({
                   username: robot.username,
                   slug: robot.slug,
                 })}
diff --git a/frontend/src/components/terminal/TerminalAllRobots.tsx b/frontend/src/components/terminal/TerminalAllRobots.tsx
index 783bc4ad..deea7bc6 100644
--- a/frontend/src/components/terminal/TerminalAllRobots.tsx
+++ b/frontend/src/components/terminal/TerminalAllRobots.tsx
@@ -3,6 +3,7 @@ import { useNavigate } from "react-router-dom";
 import RobotCard from "@/components/terminal/RobotCard";
 import { SingleRobotResponse } from "@/components/terminal/types";
 import { Button } from "@/components/ui/button";
+import Container from "@/components/ui/container";
 import ROUTES from "@/lib/types/routes";
 
 interface Props {
@@ -14,7 +15,7 @@ const TerminalAllRobots = ({ robots, onDeleteRobot }: Props) => {
   const navigate = useNavigate();
 
   return (
-    <div className="p-6 rounded-xl max-w-7xl mx-auto">
+    <Container>
       {robots && robots.length > 0 ? (
         <div className="grid gap-2 md:gap-6 md:grid-cols-1 lg:grid-cols-2">
           {robots.map((robot) => (
@@ -32,14 +33,14 @@ const TerminalAllRobots = ({ robots, onDeleteRobot }: Props) => {
           </p>
           <Button
             variant="primary"
-            onClick={() => navigate(ROUTES.LISTINGS.BROWSE.path)}
+            onClick={() => navigate(ROUTES.BOTS.BROWSE.path)}
             className="flex items-center"
           >
             <span className="mr-2">Browse Listings</span>
           </Button>
         </div>
       )}
-    </div>
+    </Container>
   );
 };
 
diff --git a/frontend/src/components/terminal/TerminalSingleRobot.tsx b/frontend/src/components/terminal/TerminalSingleRobot.tsx
index b1b8b477..be06ee23 100644
--- a/frontend/src/components/terminal/TerminalSingleRobot.tsx
+++ b/frontend/src/components/terminal/TerminalSingleRobot.tsx
@@ -96,7 +96,7 @@ const TerminalSingleRobot = ({ robot, onUpdateRobot }: Props) => {
         <button
           onClick={() =>
             navigate(
-              ROUTES.LISTING.buildPath({
+              ROUTES.BOT.buildPath({
                 username: robot.username,
                 slug: robot.slug,
               }),
diff --git a/frontend/src/components/ui/container.tsx b/frontend/src/components/ui/container.tsx
new file mode 100644
index 00000000..e09b1e43
--- /dev/null
+++ b/frontend/src/components/ui/container.tsx
@@ -0,0 +1,9 @@
+interface ContainerProps {
+  children: React.ReactNode;
+}
+
+const Container = (props: ContainerProps) => {
+  return <div className="pt-6 max-w-7xl mx-auto">{props.children}</div>;
+};
+
+export default Container;
diff --git a/frontend/src/gen/api.ts b/frontend/src/gen/api.ts
index 2c154514..b476f5a9 100644
--- a/frontend/src/gen/api.ts
+++ b/frontend/src/gen/api.ts
@@ -324,108 +324,6 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
-    "/kernel-images/upload": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        get?: never;
-        put?: never;
-        /** Upload Kernel Image */
-        post: operations["upload_kernel_image_kernel_images_upload_post"];
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/kernel-images/info/{kernel_image_id}": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /** Get Kernel Image Info */
-        get: operations["get_kernel_image_info_kernel_images_info__kernel_image_id__get"];
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/kernel-images/edit/{kernel_image_id}": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        get?: never;
-        /** Edit Kernel Image */
-        put: operations["edit_kernel_image_kernel_images_edit__kernel_image_id__put"];
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/kernel-images/delete/{kernel_image_id}": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        get?: never;
-        put?: never;
-        post?: never;
-        /** Delete Kernel Image */
-        delete: operations["delete_kernel_image_kernel_images_delete__kernel_image_id__delete"];
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/kernel-images/public": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /** List Public Kernel Images */
-        get: operations["list_public_kernel_images_kernel_images_public_get"];
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/kernel-images/download/{kernel_image_id}": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /** Download Kernel Image */
-        get: operations["download_kernel_image_kernel_images_download__kernel_image_id__get"];
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
     "/keys/new": {
         parameters: {
             query?: never;
@@ -1542,40 +1440,6 @@ export interface components {
             /** Detail */
             detail?: components["schemas"]["ValidationError"][];
         };
-        /** KernelImageResponse */
-        KernelImageResponse: {
-            /** Id */
-            id: string;
-            /** User Id */
-            user_id: string;
-            /** Name */
-            name: string;
-            /** Description */
-            description: string | null;
-            /** Size */
-            size: number;
-            /** Timestamp */
-            timestamp: number;
-            /** Is Public */
-            is_public: boolean;
-            /** Is Official */
-            is_official: boolean;
-            /** Downloads */
-            downloads: number;
-        };
-        /** KernelImageUploadRequest */
-        KernelImageUploadRequest: {
-            /** Name */
-            name: string;
-            /** File */
-            file: string;
-            /** Is Public */
-            is_public: boolean;
-            /** Is Official */
-            is_official: boolean;
-            /** Description */
-            description?: string | null;
-        };
         /** KeysResponseItem */
         KeysResponseItem: {
             /** Token */
@@ -2632,187 +2496,6 @@ export interface operations {
             };
         };
     };
-    upload_kernel_image_kernel_images_upload_post: {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        requestBody: {
-            content: {
-                "application/json": components["schemas"]["KernelImageUploadRequest"];
-            };
-        };
-        responses: {
-            /** @description Successful Response */
-            200: {
-                headers: {
-                    [name: string]: unknown;
-                };
-                content: {
-                    "application/json": components["schemas"]["KernelImageResponse"];
-                };
-            };
-            /** @description Validation Error */
-            422: {
-                headers: {
-                    [name: string]: unknown;
-                };
-                content: {
-                    "application/json": components["schemas"]["HTTPValidationError"];
-                };
-            };
-        };
-    };
-    get_kernel_image_info_kernel_images_info__kernel_image_id__get: {
-        parameters: {
-            query?: never;
-            header?: never;
-            path: {
-                kernel_image_id: string;
-            };
-            cookie?: never;
-        };
-        requestBody?: never;
-        responses: {
-            /** @description Successful Response */
-            200: {
-                headers: {
-                    [name: string]: unknown;
-                };
-                content: {
-                    "application/json": components["schemas"]["KernelImageResponse"];
-                };
-            };
-            /** @description Validation Error */
-            422: {
-                headers: {
-                    [name: string]: unknown;
-                };
-                content: {
-                    "application/json": components["schemas"]["HTTPValidationError"];
-                };
-            };
-        };
-    };
-    edit_kernel_image_kernel_images_edit__kernel_image_id__put: {
-        parameters: {
-            query?: never;
-            header?: never;
-            path: {
-                kernel_image_id: string;
-            };
-            cookie?: never;
-        };
-        requestBody: {
-            content: {
-                "application/json": Record<string, never>;
-            };
-        };
-        responses: {
-            /** @description Successful Response */
-            200: {
-                headers: {
-                    [name: string]: unknown;
-                };
-                content: {
-                    "application/json": components["schemas"]["KernelImageResponse"];
-                };
-            };
-            /** @description Validation Error */
-            422: {
-                headers: {
-                    [name: string]: unknown;
-                };
-                content: {
-                    "application/json": components["schemas"]["HTTPValidationError"];
-                };
-            };
-        };
-    };
-    delete_kernel_image_kernel_images_delete__kernel_image_id__delete: {
-        parameters: {
-            query?: never;
-            header?: never;
-            path: {
-                kernel_image_id: string;
-            };
-            cookie?: never;
-        };
-        requestBody?: never;
-        responses: {
-            /** @description Successful Response */
-            200: {
-                headers: {
-                    [name: string]: unknown;
-                };
-                content: {
-                    "application/json": boolean;
-                };
-            };
-            /** @description Validation Error */
-            422: {
-                headers: {
-                    [name: string]: unknown;
-                };
-                content: {
-                    "application/json": components["schemas"]["HTTPValidationError"];
-                };
-            };
-        };
-    };
-    list_public_kernel_images_kernel_images_public_get: {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        requestBody?: never;
-        responses: {
-            /** @description Successful Response */
-            200: {
-                headers: {
-                    [name: string]: unknown;
-                };
-                content: {
-                    "application/json": components["schemas"]["KernelImageResponse"][];
-                };
-            };
-        };
-    };
-    download_kernel_image_kernel_images_download__kernel_image_id__get: {
-        parameters: {
-            query?: never;
-            header?: never;
-            path: {
-                kernel_image_id: string;
-            };
-            cookie?: never;
-        };
-        requestBody?: never;
-        responses: {
-            /** @description Successful Response */
-            200: {
-                headers: {
-                    [name: string]: unknown;
-                };
-                content: {
-                    "application/json": string;
-                };
-            };
-            /** @description Validation Error */
-            422: {
-                headers: {
-                    [name: string]: unknown;
-                };
-                content: {
-                    "application/json": components["schemas"]["HTTPValidationError"];
-                };
-            };
-        };
-    };
     new_key_keys_new_post: {
         parameters: {
             query?: never;
diff --git a/frontend/src/lib/types/routes.ts b/frontend/src/lib/types/routes.ts
index 93332067..2d4d61e9 100644
--- a/frontend/src/lib/types/routes.ts
+++ b/frontend/src/lib/types/routes.ts
@@ -6,7 +6,6 @@ const ROUTES = {
 
   // General pages
   ABOUT: route("about"),
-  DOWNLOADS: route("downloads"),
   RESEARCH: route("research"),
   TOS: route("tos"),
   PRIVACY: route("privacy"),
@@ -25,15 +24,15 @@ const ROUTES = {
   KEYS: route("keys"),
 
   // Listings
-  LISTINGS: route(
-    "listings",
+  BOTS: route(
+    "bots",
     {},
     {
       CREATE: route("create"),
       BROWSE: route("browse"),
     },
   ),
-  LISTING: route("item/:username/:slug", {
+  BOT: route("bot/:username/:slug", {
     params: {
       username: string().defined(),
       slug: string().defined(),
@@ -46,7 +45,7 @@ const ROUTES = {
     params: { artifactId: string().defined() },
   }),
 
-  // Seller routes
+  // Sell.
   SELL: route(
     "sell",
     {},
@@ -77,6 +76,9 @@ const ROUTES = {
     },
   ),
 
+  // Link robot
+  LINK: route("link"),
+
   // Not found
   NOT_FOUND: route("404"),
 };
diff --git a/store/app/crud/kernel_images.py b/store/app/crud/kernel_images.py
deleted file mode 100644
index d516e04b..00000000
--- a/store/app/crud/kernel_images.py
+++ /dev/null
@@ -1,180 +0,0 @@
-"""Defines CRUD interface for handling kernel images."""
-
-import io
-import logging
-from typing import IO, TypedDict
-
-from botocore.exceptions import ClientError
-from fastapi import UploadFile
-
-from store.app.crud.base import TABLE_NAME, BaseCrud
-from store.app.model import KernelImage, User
-from store.settings import settings
-
-logger = logging.getLogger(__name__)
-
-
-class KernelImageUpdates(TypedDict, total=False):
-    name: str
-    description: str | None
-    is_public: bool
-    is_official: bool
-
-
-class KernelImagesCrud(BaseCrud):
-    async def upload_kernel_image(
-        self,
-        name: str,
-        file: UploadFile,
-        user: User,
-        description: str | None = None,
-        is_public: bool = False,
-        is_official: bool = False,
-    ) -> KernelImage:
-        if not user.permissions or not ({"is_mod", "is_admin"} & user.permissions):
-            raise ValueError("Only moderators or admins can upload kernel images")
-
-        file_data = await file.read()
-        size = len(file_data)
-
-        kernel_image = KernelImage.create(
-            user_id=user.id,
-            name=name,
-            size=size,
-            description=description,
-            is_public=is_public,
-            is_official=is_official,
-        )
-
-        s3_filename = f"{kernel_image.id}/{name}"
-
-        await self._upload_to_s3(
-            data=io.BytesIO(file_data),
-            name=name,
-            filename=s3_filename,
-            content_type="application/octet-stream",
-        )
-        await self._add_item(kernel_image)
-        return kernel_image
-
-    async def get_kernel_image(self, kernel_image_id: str) -> KernelImage | None:
-        return await self._get_item(kernel_image_id, KernelImage)
-
-    async def update_kernel_image(self, kernel_image_id: str, user: User, **updates: KernelImageUpdates) -> None:
-        if not user.permissions or not ({"is_mod", "is_admin"} & user.permissions):
-            raise ValueError("Only moderators or admins can update kernel images")
-
-        valid_fields = {"name", "description", "is_public", "is_official"}
-        valid_updates = {k: v for k, v in updates.items() if k in valid_fields}
-
-        if valid_updates:
-            kernel_image = await self.get_kernel_image(kernel_image_id)
-            if kernel_image is None:
-                raise ValueError("Kernel image not found")
-
-            # If the name is being updated, we need to rename the S3 object
-            if (
-                "name" in valid_updates
-                and isinstance(valid_updates["name"], str)
-                and valid_updates["name"] != kernel_image.name
-            ):
-                old_s3_filename = f"{kernel_image.id}/{kernel_image.name}"
-                new_s3_filename = f"{kernel_image.id}/{valid_updates['name']}"
-                await self._rename_s3_object(old_s3_filename, new_s3_filename)
-
-            await self._update_item(kernel_image_id, KernelImage, valid_updates)
-
-    async def _rename_s3_object(self, old_filename: str, new_filename: str) -> None:
-        try:
-            # Use self.s3 instead of aioboto3.client
-            await self.s3.meta.client.copy_object(
-                Bucket=settings.s3.bucket,
-                CopySource=f"{settings.s3.bucket}/{settings.s3.prefix}{old_filename}",
-                Key=f"{settings.s3.prefix}{new_filename}",
-            )
-            await self.s3.meta.client.delete_object(
-                Bucket=settings.s3.bucket, Key=f"{settings.s3.prefix}{old_filename}"
-            )
-        except ClientError as e:
-            logger.error(f"Error renaming object in S3: {e}")
-            raise
-
-    async def delete_kernel_image(self, kernel_image: KernelImage, user: User) -> None:
-        if not user.permissions or not ({"is_mod", "is_admin"} & user.permissions):
-            raise ValueError("Only moderators or admins can delete kernel images")
-
-        # Delete the file from S3
-        s3_filename = f"{kernel_image.id}/{kernel_image.name}"
-        await self._delete_from_s3(s3_filename)
-
-        # Delete the item from the database
-        await self._delete_item(kernel_image)
-
-    async def get_public_kernel_images(self) -> list[KernelImage]:
-        table = await self.db.Table(TABLE_NAME)
-        response = await table.scan(
-            FilterExpression="is_public = :is_public", ExpressionAttributeValues={":is_public": True}
-        )
-        return [KernelImage.model_validate(item) for item in response.get("Items", [])]
-
-    async def increment_downloads(self, kernel_image_id: str) -> None:
-        kernel_image = await self.get_kernel_image(kernel_image_id)
-        if kernel_image:
-            await self._update_item(kernel_image_id, KernelImage, {"downloads": kernel_image.downloads + 1})
-
-    async def get_kernel_image_download_url(self, kernel_image: KernelImage) -> str:
-        s3_filename = f"{kernel_image.id}/{kernel_image.name}"
-        logger.info(f"Generating presigned URL for S3 filename: {s3_filename}")
-
-        # Check if the object exists in S3
-        try:
-            await self.s3.meta.client.head_object(Bucket=settings.s3.bucket, Key=f"{settings.s3.prefix}{s3_filename}")
-        except ClientError as e:
-            if e.response["Error"]["Code"] == "404":
-                logger.error(f"S3 object not found: {s3_filename}")
-                raise ValueError(f"S3 object not found: {s3_filename}")
-            else:
-                logger.error(f"Error checking S3 object: {str(e)}")
-                raise
-
-        return await self._get_presigned_url(s3_filename)
-
-    async def _get_presigned_url(self, s3_filename: str) -> str:
-        try:
-            logger.info(
-                f"Generating presigned URL for S3 bucket: {settings.s3.bucket}, key: {settings.s3.prefix}{s3_filename}"
-            )
-            presigned_url = await self.s3.meta.client.generate_presigned_url(
-                "get_object",
-                Params={
-                    "Bucket": settings.s3.bucket,
-                    "Key": f"{settings.s3.prefix}{s3_filename}",
-                },
-                ExpiresIn=3600,  # URL expires in 1 hour
-            )
-            logger.info(f"Generated presigned URL: {presigned_url}")
-            return presigned_url
-        except ClientError as e:
-            logger.error(f"Error generating presigned URL: {e}")
-            raise
-
-    async def _delete_from_s3(self, s3_filename: str) -> None:
-        try:
-            # Use self.s3 instead of aioboto3.client
-            await self.s3.meta.client.delete_object(Bucket=settings.s3.bucket, Key=f"{settings.s3.prefix}{s3_filename}")
-        except ClientError as e:
-            logger.error(f"Error deleting object from S3: {e}")
-            raise
-
-    async def _upload_to_s3(self, data: IO[bytes], name: str, filename: str, content_type: str) -> None:
-        try:
-            # Use self.s3 instead of aioboto3.client
-            await self.s3.meta.client.upload_fileobj(
-                data,
-                settings.s3.bucket,
-                f"{settings.s3.prefix}{filename}",
-                ExtraArgs={"ContentType": content_type},
-            )
-        except ClientError as e:
-            logger.error(f"Error uploading file to S3: {e}")
-            raise
diff --git a/store/app/db.py b/store/app/db.py
index 66079198..eecfa74b 100644
--- a/store/app/db.py
+++ b/store/app/db.py
@@ -8,7 +8,6 @@
 from store.app.crud.artifacts import ArtifactsCrud
 from store.app.crud.base import TABLE_NAME, BaseCrud
 from store.app.crud.email import EmailCrud
-from store.app.crud.kernel_images import KernelImagesCrud
 from store.app.crud.listings import ListingsCrud
 from store.app.crud.onshape import OnshapeCrud
 from store.app.crud.orders import OrdersCrud
@@ -23,7 +22,6 @@ class Crud(
     UserCrud,
     ListingsCrud,
     ArtifactsCrud,
-    KernelImagesCrud,
     OrdersCrud,
     RobotsCrud,
     TeleopCrud,
diff --git a/store/app/main.py b/store/app/main.py
index 0a9c0d11..728f7fb8 100644
--- a/store/app/main.py
+++ b/store/app/main.py
@@ -21,17 +21,16 @@
     NotAuthenticatedError,
     NotAuthorizedError,
 )
-from store.app.routers.artifacts import artifacts_router
-from store.app.routers.auth import router
-from store.app.routers.kernel_images import kernel_images_router
-from store.app.routers.keys import keys_router
-from store.app.routers.listings import listings_router
-from store.app.routers.onshape import onshape_router
-from store.app.routers.orders import orders_router
-from store.app.routers.robots import robots_router
-from store.app.routers.stripe import stripe_router
-from store.app.routers.teleop import teleop_router
-from store.app.routers.users import users_router
+from store.app.routers.artifacts import router as artifacts_router
+from store.app.routers.auth import router as auth_router
+from store.app.routers.keys import router as keys_router
+from store.app.routers.listings import router as listings_router
+from store.app.routers.onshape import router as onshape_router
+from store.app.routers.orders import router as orders_router
+from store.app.routers.robots import router as robots_router
+from store.app.routers.stripe import router as stripe_router
+from store.app.routers.teleop import router as teleop_router
+from store.app.routers.users import router as users_router
 from store.utils import get_cors_origins
 
 
@@ -144,7 +143,6 @@ async def get_open_api_endpoint() -> JSONResponse:
         "/auth/github/code",
         "/auth/google/client-id",
         "/auth/google/login",
-        "/kernel-images/public",
         "/listings/{id}",
         "/listings/dump",
         "/listings/search",
@@ -181,9 +179,8 @@ async def validate_auth_token(auth_token: str = Depends(api_key_header)) -> str:
     return auth_token
 
 
-app.include_router(router, prefix="/auth", tags=["auth"])
+app.include_router(auth_router, prefix="/auth", tags=["auth"])
 app.include_router(artifacts_router, prefix="/artifacts", tags=["artifacts"])
-app.include_router(kernel_images_router, prefix="/kernel-images", tags=["kernel-images"])
 app.include_router(keys_router, prefix="/keys", tags=["keys"])
 app.include_router(listings_router, prefix="/listings", tags=["listings"])
 app.include_router(onshape_router, prefix="/onshape", tags=["onshape"])
diff --git a/store/app/model.py b/store/app/model.py
index b09bd5cf..f05278ba 100644
--- a/store/app/model.py
+++ b/store/app/model.py
@@ -363,45 +363,6 @@ def create(
         )
 
 
-class KernelImage(StoreBaseModel):
-    """Defines a Kernel Image that a user uploads.
-
-    Kernel Images are stored in S3 and are accessible through CloudFront.
-    They are associated with a specific user and have metadata about the image.
-    """
-
-    user_id: str
-    name: str
-    description: str | None = None
-    size: int
-    is_public: bool = False
-    is_official: bool = False
-    timestamp: int
-    downloads: int = 0
-
-    @classmethod
-    def create(
-        cls,
-        user_id: str,
-        name: str,
-        size: int,
-        description: str | None = None,
-        is_public: bool = False,
-        is_official: bool = False,
-    ) -> Self:
-        return cls(
-            id=new_uuid(),
-            user_id=user_id,
-            name=name,
-            size=size,
-            description=description,
-            is_public=is_public,
-            is_official=is_official,
-            timestamp=int(time.time()),
-            downloads=0,
-        )
-
-
 class Listing(StoreBaseModel):
     """Defines a recursively-defined listing.
 
diff --git a/store/app/routers/artifacts.py b/store/app/routers/artifacts.py
index c00164e8..f9c5a540 100644
--- a/store/app/routers/artifacts.py
+++ b/store/app/routers/artifacts.py
@@ -27,12 +27,12 @@
 from store.app.security.user import get_session_user_with_write_permission, maybe_get_user_from_api_key
 from store.settings import settings
 
-artifacts_router = APIRouter()
+router = APIRouter()
 
 logger = logging.getLogger(__name__)
 
 
-@artifacts_router.get("/url/{artifact_type}/{listing_id}/{name}")
+@router.get("/url/{artifact_type}/{listing_id}/{name}")
 async def artifact_url(
     artifact_type: ArtifactType,
     listing_id: str,
@@ -165,7 +165,7 @@ class ListArtifactsResponse(BaseModel):
     artifacts: list[SingleArtifactResponse]
 
 
-@artifacts_router.get("/info/{artifact_id}")
+@router.get("/info/{artifact_id}")
 async def get_artifact_info(
     artifact_id: str,
     user: Annotated[User | None, Depends(maybe_get_user_from_api_key)],
@@ -180,7 +180,7 @@ async def get_artifact_info(
     return await SingleArtifactResponse.from_artifact(artifact=artifact, crud=crud, user=user)
 
 
-@artifacts_router.get("/list/{listing_id}", response_model=ListArtifactsResponse)
+@router.get("/list/{listing_id}", response_model=ListArtifactsResponse)
 async def list_artifacts(
     listing_id: str,
     crud: Annotated[Crud, Depends(Crud.get)],
@@ -242,7 +242,7 @@ class UploadArtifactResponse(BaseModel):
     artifacts: list[SingleArtifactResponse]
 
 
-@artifacts_router.post("/upload/{listing_id}", response_model=UploadArtifactResponse)
+@router.post("/upload/{listing_id}", response_model=UploadArtifactResponse)
 async def upload(
     listing_id: str,
     user: Annotated[User, Depends(get_session_user_with_write_permission)],
@@ -311,7 +311,7 @@ class UpdateArtifactRequest(BaseModel):
     description: str | None = None
 
 
-@artifacts_router.put("/edit/{artifact_id}", response_model=bool)
+@router.put("/edit/{artifact_id}", response_model=bool)
 async def edit_artifact(
     id: str,
     artifact: UpdateArtifactRequest,
@@ -330,7 +330,7 @@ async def edit_artifact(
     return True
 
 
-@artifacts_router.delete("/delete/{artifact_id}", response_model=bool)
+@router.delete("/delete/{artifact_id}", response_model=bool)
 async def delete_artifact(
     artifact_id: str,
     user: Annotated[User, Depends(get_session_user_with_write_permission)],
@@ -351,7 +351,7 @@ async def delete_artifact(
     return True
 
 
-@artifacts_router.put("/list/{listing_id}/main", response_model=bool)
+@router.put("/list/{listing_id}/main", response_model=bool)
 async def set_main_image(
     listing_id: str,
     artifact_id: str,
diff --git a/store/app/routers/kernel_images.py b/store/app/routers/kernel_images.py
deleted file mode 100644
index 885438f1..00000000
--- a/store/app/routers/kernel_images.py
+++ /dev/null
@@ -1,204 +0,0 @@
-"""Defines the router endpoints for handling kernel images."""
-
-import base64
-import logging
-import os
-from tempfile import NamedTemporaryFile
-from typing import Annotated, List, Optional
-
-from fastapi import APIRouter, Body, Depends, HTTPException, UploadFile, status
-from pydantic import BaseModel
-
-from store.app.db import Crud
-from store.app.model import User
-from store.app.security.user import (
-    get_session_user_with_read_permission,
-    get_session_user_with_write_permission,
-    maybe_get_user_from_api_key,
-)
-
-kernel_images_router = APIRouter()
-
-logger = logging.getLogger(__name__)
-
-
-class KernelImageResponse(BaseModel):
-    id: str
-    user_id: str
-    name: str
-    description: str | None
-    size: int
-    timestamp: int
-    is_public: bool
-    is_official: bool
-    downloads: int
-
-
-class KernelImageUploadRequest(BaseModel):
-    name: str
-    file: str  # Base64 encoded file content
-    is_public: bool
-    is_official: bool
-    description: Optional[str] = None
-
-
-@kernel_images_router.post("/upload", response_model=KernelImageResponse)
-async def upload_kernel_image(
-    user: Annotated[User, Depends(get_session_user_with_write_permission)],
-    crud: Annotated[Crud, Depends(Crud.get)],
-    request: KernelImageUploadRequest,
-) -> KernelImageResponse:
-    if not user.permissions or not ({"is_mod", "is_admin"} & user.permissions):
-        raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN, detail="Only moderators or admins can upload kernel images"
-        )
-
-    try:
-        # Add padding to the base64 string if necessary
-        padded_file = request.file + "=" * (-len(request.file) % 4)
-
-        # Decode the base64 string
-        try:
-            file_content = base64.b64decode(padded_file)
-        except Exception as e:
-            logger.error(f"Base64 decoding error: {str(e)}")
-            raise HTTPException(status_code=400, detail=f"Invalid file encoding: {str(e)}")
-
-        # Create a temporary file
-        with NamedTemporaryFile(delete=False) as temp_file:
-            temp_file.write(file_content)
-            temp_file_path = temp_file.name
-
-        # Create an UploadFile object
-        file = UploadFile(filename=request.name, file=open(temp_file_path, "rb"))
-
-        try:
-            kernel_image = await crud.upload_kernel_image(
-                name=request.name,
-                file=file,
-                user=user,
-                description=request.description,
-                is_public=request.is_public,
-                is_official=request.is_official,
-            )
-        finally:
-            file.file.close()
-            os.unlink(temp_file_path)  # Remove the temporary file
-
-        return KernelImageResponse(**kernel_image.dict())
-
-    except Exception as e:
-        logger.error(f"Unexpected error in upload_kernel_image: {str(e)}")
-        raise HTTPException(status_code=500, detail=f"Unexpected error: {str(e)}")
-
-
-@kernel_images_router.get("/info/{kernel_image_id}", response_model=KernelImageResponse)
-async def get_kernel_image_info(
-    kernel_image_id: str,
-    crud: Annotated[Crud, Depends(Crud.get)],
-    user: Annotated[User | None, Depends(maybe_get_user_from_api_key)],
-) -> KernelImageResponse:
-    kernel_image = await crud.get_kernel_image(kernel_image_id)
-    if kernel_image is None:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Kernel image not found")
-    if not kernel_image.is_public and (user is None or user.id != kernel_image.user_id):
-        raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN, detail="You do not have permission to view this kernel image"
-        )
-    return KernelImageResponse(**kernel_image.dict())
-
-
-@kernel_images_router.put("/edit/{kernel_image_id}", response_model=KernelImageResponse)
-async def edit_kernel_image(
-    kernel_image_id: str,
-    user: Annotated[User, Depends(get_session_user_with_write_permission)],
-    crud: Annotated[Crud, Depends(Crud.get)],
-    updates: dict = Body(...),
-) -> KernelImageResponse:
-    if not user.permissions or not ({"is_mod", "is_admin"} & user.permissions):
-        raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN, detail="Only moderators or admins can edit kernel images"
-        )
-
-    kernel_image = await crud.get_kernel_image(kernel_image_id)
-    if kernel_image is None:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Kernel image not found")
-    if user.id != kernel_image.user_id and "is_admin" not in (user.permissions or set()):
-        raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN, detail="You do not have permission to edit this kernel image"
-        )
-
-    # Update the kernel image
-    valid_updates = {k: v for k, v in updates.items() if k in ["name", "description", "is_public", "is_official"]}
-
-    if valid_updates:
-        await crud.update_kernel_image(kernel_image_id, user, **valid_updates)
-
-    # Fetch the updated kernel image
-    updated_kernel_image = await crud.get_kernel_image(kernel_image_id)
-    if updated_kernel_image is None:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Updated kernel image not found")
-
-    return KernelImageResponse(**updated_kernel_image.dict())
-
-
-@kernel_images_router.delete("/delete/{kernel_image_id}", response_model=bool)
-async def delete_kernel_image(
-    kernel_image_id: str,
-    user: Annotated[User, Depends(get_session_user_with_write_permission)],
-    crud: Annotated[Crud, Depends(Crud.get)],
-) -> bool:
-    if not user.permissions or not ({"is_mod", "is_admin"} & user.permissions):
-        raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN, detail="Only moderators or admins can delete kernel images"
-        )
-
-    kernel_image = await crud.get_kernel_image(kernel_image_id)
-    if kernel_image is None:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Kernel image not found")
-    if user.id != kernel_image.user_id and "is_admin" not in (user.permissions or set()):
-        raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN, detail="You do not have permission to delete this kernel image"
-        )
-    await crud.delete_kernel_image(kernel_image, user)
-    return True
-
-
-@kernel_images_router.get("/public", response_model=List[KernelImageResponse])
-async def list_public_kernel_images(
-    crud: Annotated[Crud, Depends(Crud.get)],
-) -> List[KernelImageResponse]:
-    kernel_images = await crud.get_public_kernel_images()
-    return [KernelImageResponse(**ki.model_dump()) for ki in kernel_images]
-
-
-@kernel_images_router.get("/download/{kernel_image_id}", response_model=str)
-async def download_kernel_image(
-    kernel_image_id: str,
-    crud: Annotated[Crud, Depends(Crud.get)],
-    user: Annotated[User, Depends(get_session_user_with_read_permission)],
-) -> str:
-    logger.info(f"Received download request for kernel image ID: {kernel_image_id}")
-
-    kernel_image = await crud.get_kernel_image(kernel_image_id)
-    if kernel_image is None:
-        logger.error(f"Kernel image not found: {kernel_image_id}")
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Kernel image not found")
-
-    if not kernel_image.is_public and user.id != kernel_image.user_id:
-        logger.error(f"Permission denied for user {user.id} to download kernel image {kernel_image_id}")
-        raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN, detail="You do not have permission to download this kernel image"
-        )
-
-    # Increment the download count
-    await crud.increment_downloads(kernel_image_id)
-
-    # Get the download URL
-    try:
-        download_url = await crud.get_kernel_image_download_url(kernel_image)
-        logger.info(f"Generated presigned URL for kernel image {kernel_image_id}: {download_url}")
-        return download_url
-    except Exception as e:
-        logger.error(f"Error generating presigned URL for kernel image {kernel_image_id}: {str(e)}")
-        raise HTTPException(status_code=500, detail="Error generating download URL")
diff --git a/store/app/routers/keys.py b/store/app/routers/keys.py
index ec8777ae..39e608f0 100644
--- a/store/app/routers/keys.py
+++ b/store/app/routers/keys.py
@@ -12,7 +12,7 @@
 
 logger = logging.getLogger(__name__)
 
-keys_router = APIRouter()
+router = APIRouter()
 
 TOKEN_TYPE = "Bearer"
 
@@ -31,7 +31,7 @@ class NewKeyResponse(BaseModel):
     key: KeysResponseItem
 
 
-@keys_router.post("/new", response_model=NewKeyResponse)
+@router.post("/new", response_model=NewKeyResponse)
 async def new_key(
     data: NewKeyRequest,
     user: Annotated[User, Depends(get_session_user_with_admin_permission)],
@@ -52,7 +52,7 @@ class ListKeysResponse(BaseModel):
     keys: list[KeysResponseItem]
 
 
-@keys_router.get("/list", response_model=ListKeysResponse)
+@router.get("/list", response_model=ListKeysResponse)
 async def list_keys(
     user: Annotated[User, Depends(get_session_user_with_admin_permission)],
     crud: Annotated[Crud, Depends(Crud.get)],
@@ -69,7 +69,7 @@ async def list_keys(
     )
 
 
-@keys_router.delete("/delete/{key}")
+@router.delete("/delete/{key}")
 async def delete_key(
     key: str,
     user: Annotated[User, Depends(get_session_user_with_admin_permission)],
diff --git a/store/app/routers/listings.py b/store/app/routers/listings.py
index bc28aa78..4168bf60 100644
--- a/store/app/routers/listings.py
+++ b/store/app/routers/listings.py
@@ -26,7 +26,7 @@
     maybe_get_user_from_api_key,
 )
 
-listings_router = APIRouter()
+router = APIRouter()
 
 logger = logging.getLogger(__name__)
 
@@ -35,7 +35,7 @@ class FeaturedListingsResponse(BaseModel):
     listing_ids: list[str]
 
 
-@listings_router.get("/featured", response_model=FeaturedListingsResponse)
+@router.get("/featured", response_model=FeaturedListingsResponse)
 async def get_featured_listings(
     crud: Annotated[Crud, Depends(Crud.get)],
 ) -> FeaturedListingsResponse:
@@ -44,7 +44,7 @@ async def get_featured_listings(
     return FeaturedListingsResponse(listing_ids=featured_ids)
 
 
-@listings_router.put("/featured/{listing_id}", response_model=bool)
+@router.put("/featured/{listing_id}", response_model=bool)
 async def toggle_featured_listing(
     listing_id: str,
     user: Annotated[User, Depends(get_session_user_with_write_permission)],
@@ -81,7 +81,7 @@ async def toggle_featured_listing(
     return featured
 
 
-@listings_router.delete("/featured/{listing_id}", response_model=bool)
+@router.delete("/featured/{listing_id}", response_model=bool)
 async def remove_featured_listing(
     listing_id: str,
     user: Annotated[User, Depends(get_session_user_with_write_permission)],
@@ -112,7 +112,7 @@ class ListListingsResponse(BaseModel):
     has_next: bool = False
 
 
-@listings_router.get("/search", response_model=ListListingsResponse)
+@router.get("/search", response_model=ListListingsResponse)
 async def list_listings(
     crud: Annotated[Crud, Depends(Crud.get)],
     page: int = Query(1, description="Page number for pagination"),
@@ -148,7 +148,7 @@ class GetBatchListingsResponse(BaseModel):
     listings: list[ListingInfoResponse]
 
 
-@listings_router.get("/batch", response_model=GetBatchListingsResponse)
+@router.get("/batch", response_model=GetBatchListingsResponse)
 async def get_batch_listing_info(
     crud: Annotated[Crud, Depends(Crud.get)],
     user: Annotated[User | None, Depends(maybe_get_user_from_api_key)],
@@ -214,14 +214,14 @@ class DumpListingsResponse(BaseModel):
     listings: list[Listing]
 
 
-@listings_router.get("/dump", response_model=DumpListingsResponse)
+@router.get("/dump", response_model=DumpListingsResponse)
 async def dump_listings(
     crud: Annotated[Crud, Depends(Crud.get)],
 ) -> DumpListingsResponse:
     return DumpListingsResponse(listings=await crud.dump_listings())
 
 
-@listings_router.get("/user/{user_id}", response_model=ListListingsResponse)
+@router.get("/user/{user_id}", response_model=ListListingsResponse)
 async def get_user_listings(
     user_id: str,
     crud: Annotated[Crud, Depends(Crud.get)],
@@ -240,7 +240,7 @@ async def get_user_listings(
     return ListListingsResponse(listings=listing_infos, has_next=has_next)
 
 
-@listings_router.get("/me", response_model=ListListingsResponse)
+@router.get("/me", response_model=ListListingsResponse)
 async def get_my_listings(
     user: Annotated[User, Depends(get_session_user_with_read_permission)],
     crud: Annotated[Crud, Depends(Crud.get)],
@@ -265,7 +265,7 @@ class NewListingResponse(BaseModel):
     slug: str
 
 
-@listings_router.post("/add", response_model=NewListingResponse)
+@router.post("/add", response_model=NewListingResponse)
 async def add_listing(
     user: Annotated[User, Depends(get_session_user_with_write_permission)],
     crud: Annotated[Crud, Depends(Crud.get)],
@@ -305,7 +305,7 @@ async def add_listing(
     return NewListingResponse(listing_id=listing.id, username=user.username, slug=slug)
 
 
-@listings_router.delete("/delete/{listing_id}", response_model=bool)
+@router.delete("/delete/{listing_id}", response_model=bool)
 async def delete_listing(
     listing_id: str,
     user: Annotated[User, Depends(get_session_user_with_write_permission)],
@@ -333,7 +333,7 @@ class UpdateListingRequest(BaseModel):
     slug: str | None = None
 
 
-@listings_router.put("/edit/{id}", response_model=bool)
+@router.put("/edit/{id}", response_model=bool)
 async def edit_listing(
     id: str,
     listing: UpdateListingRequest,
@@ -381,7 +381,7 @@ class UpvotedListingsResponse(BaseModel):
     has_more: bool
 
 
-@listings_router.get("/upvotes", response_model=ListListingsResponse)
+@router.get("/upvotes", response_model=ListListingsResponse)
 async def get_upvoted_listings(
     user: Annotated[User, Depends(get_session_user_with_read_permission)],
     crud: Annotated[Crud, Depends(Crud.get)],
@@ -466,7 +466,7 @@ async def get_listing_common(
     return response
 
 
-@listings_router.get("/{listing_id}", response_model=GetListingResponse)
+@router.get("/{listing_id}", response_model=GetListingResponse)
 async def get_listing(
     listing_id: str,
     user: Annotated[User | None, Depends(maybe_get_user_from_api_key)],
@@ -478,7 +478,7 @@ async def get_listing(
     return await get_listing_common(listing, user, crud)
 
 
-@listings_router.get("/{username}/{slug}", response_model=GetListingResponse)
+@router.get("/{username}/{slug}", response_model=GetListingResponse)
 async def get_listing_by_username_and_slug(
     username: str,
     slug: str,
@@ -496,7 +496,7 @@ class VoteListingResponse(BaseModel):
     user_vote: bool
 
 
-@listings_router.post("/{id}/vote")
+@router.post("/{id}/vote")
 async def vote_listing(
     id: str,
     crud: Annotated[Crud, Depends(Crud.get)],
@@ -506,7 +506,7 @@ async def vote_listing(
     await crud.handle_vote(user.id, id, upvote)
 
 
-@listings_router.delete("/{id}/vote")
+@router.delete("/{id}/vote")
 async def remove_vote(
     id: str,
     crud: Annotated[Crud, Depends(Crud.get)],
diff --git a/store/app/routers/onshape.py b/store/app/routers/onshape.py
index 6f8031d4..a338d05e 100644
--- a/store/app/routers/onshape.py
+++ b/store/app/routers/onshape.py
@@ -13,7 +13,7 @@
 from store.app.model import User, can_write_listing
 from store.app.security.user import get_session_user_with_write_permission
 
-onshape_router = APIRouter()
+router = APIRouter()
 
 logger = logging.getLogger(__name__)
 
@@ -22,7 +22,7 @@ class SetRequest(BaseModel):
     onshape_url: str | None
 
 
-@onshape_router.post("/set/{listing_id}")
+@router.post("/set/{listing_id}")
 async def set_onshape_document(
     listing_id: str,
     request: SetRequest,
@@ -61,7 +61,7 @@ async def pull_onshape_document_generator(
     yield "event: finish\ndata: finish\n\n"
 
 
-@onshape_router.get("/pull/{listing_id}", response_class=StreamingResponse)
+@router.get("/pull/{listing_id}", response_class=StreamingResponse)
 async def pull_onshape_document(
     listing_id: str,
     request: Request,
diff --git a/store/app/routers/orders.py b/store/app/routers/orders.py
index c55362de..b3cdf8e9 100644
--- a/store/app/routers/orders.py
+++ b/store/app/routers/orders.py
@@ -11,7 +11,7 @@
 from store.app.routers import stripe
 from store.app.routers.users import get_session_user_with_read_permission
 
-orders_router = APIRouter()
+router = APIRouter()
 
 
 class ProductInfo(BaseModel):
@@ -27,7 +27,7 @@ class OrderWithProduct(BaseModel):
     product: ProductInfo
 
 
-@orders_router.get("/user-orders", response_model=List[Order])
+@router.get("/user-orders", response_model=List[Order])
 async def get_user_orders(
     user: User = Depends(get_session_user_with_read_permission), crud: Crud = Depends(Crud.get)
 ) -> List[Order]:
@@ -38,7 +38,7 @@ async def get_user_orders(
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="No orders found for this user")
 
 
-@orders_router.get("/order/{order_id}", response_model=Order)
+@router.get("/order/{order_id}", response_model=Order)
 async def get_order(
     order_id: str,
     user: User = Depends(get_session_user_with_read_permission),
@@ -50,7 +50,7 @@ async def get_order(
     return order
 
 
-@orders_router.get("/order-with-product/{order_id}", response_model=OrderWithProduct)
+@router.get("/order-with-product/{order_id}", response_model=OrderWithProduct)
 async def get_order_with_product(
     order_id: str,
     user: User = Depends(get_session_user_with_read_permission),
@@ -67,7 +67,7 @@ async def get_order_with_product(
     return OrderWithProduct(order=order, product=ProductInfo(**product))
 
 
-@orders_router.get("/user-orders-with-products", response_model=List[OrderWithProduct])
+@router.get("/user-orders-with-products", response_model=List[OrderWithProduct])
 async def get_user_orders_with_products(
     user: User = Depends(get_session_user_with_read_permission),
     crud: Crud = Depends(Crud.get),
@@ -95,7 +95,7 @@ class UpdateOrderAddressRequest(BaseModel):
     shipping_country: str
 
 
-@orders_router.put("/update-order-address/{order_id}", response_model=Order)
+@router.put("/update-order-address/{order_id}", response_model=Order)
 async def update_order_address(
     order_id: str,
     address_update: UpdateOrderAddressRequest,
diff --git a/store/app/routers/robots.py b/store/app/routers/robots.py
index 173009af..91c85cc3 100644
--- a/store/app/routers/robots.py
+++ b/store/app/routers/robots.py
@@ -17,7 +17,7 @@
     get_session_user_with_write_permission,
 )
 
-robots_router = APIRouter()
+router = APIRouter()
 
 
 class CreateRobotRequest(BaseModel):
@@ -101,7 +101,7 @@ class RobotListResponse(BaseModel):
     robots: list[SingleRobotResponse]
 
 
-@robots_router.post("/create", response_model=Robot)
+@router.post("/create", response_model=Robot)
 async def create_robot(
     robot_data: CreateRobotRequest,
     user: User = Depends(get_session_user_with_write_permission),
@@ -119,7 +119,7 @@ async def create_robot(
         raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(e))
 
 
-@robots_router.get("/get/{robot_id}", response_model=Robot)
+@router.get("/get/{robot_id}", response_model=Robot)
 async def get_robot(
     robot_id: str,
     user: User = Depends(get_session_user_with_read_permission),
@@ -135,7 +135,7 @@ async def get_robot(
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Robot not found")
 
 
-@robots_router.get("/list", response_model=RobotListResponse)
+@router.get("/list", response_model=RobotListResponse)
 async def list_user_robots(
     user: User = Depends(get_session_user_with_read_permission),
     crud: Crud = Depends(Crud.get),
@@ -165,7 +165,7 @@ async def get_robot_response(robot: Robot) -> SingleRobotResponse:
     return RobotListResponse(robots=list(robot_responses))
 
 
-@robots_router.put("/update/{robot_id}", response_model=Robot)
+@router.put("/update/{robot_id}", response_model=Robot)
 async def update_robot(
     robot_id: str,
     update_data: UpdateRobotRequest,
@@ -184,7 +184,7 @@ async def update_robot(
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Robot not found")
 
 
-@robots_router.delete("/delete/{robot_id}", status_code=status.HTTP_204_NO_CONTENT)
+@router.delete("/delete/{robot_id}", status_code=status.HTTP_204_NO_CONTENT)
 async def delete_robot(
     robot_id: str,
     user: User = Depends(get_session_user_with_write_permission),
@@ -203,7 +203,7 @@ async def delete_robot(
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Robot not found")
 
 
-@robots_router.get("/check-order/{order_id}", response_model=Robot | None)
+@router.get("/check-order/{order_id}", response_model=Robot | None)
 async def check_order_robot(
     order_id: str,
     user: User = Depends(get_session_user_with_read_permission),
@@ -227,7 +227,7 @@ class RobotURDFResponse(BaseModel):
     urdf_url: str | None
 
 
-@robots_router.get("/urdf/{listing_id}", response_model=RobotURDFResponse)
+@router.get("/urdf/{listing_id}", response_model=RobotURDFResponse)
 async def get_robot_urdf(
     listing_id: str,
     crud: Crud = Depends(Crud.get),
diff --git a/store/app/routers/stripe.py b/store/app/routers/stripe.py
index abc549f7..16881e4f 100644
--- a/store/app/routers/stripe.py
+++ b/store/app/routers/stripe.py
@@ -15,7 +15,7 @@
 
 logger = logging.getLogger(__name__)
 
-stripe_router = APIRouter()
+router = APIRouter()
 stripe.api_key = settings.stripe.secret_key
 
 
@@ -25,7 +25,7 @@ class ConnectAccountStatus(str, Enum):
     COMPLETE = "complete"
 
 
-@stripe_router.post("/create-payment-intent")
+@router.post("/create-payment-intent")
 async def create_payment_intent(request: Request) -> Dict[str, Any]:
     try:
         data = await request.json()
@@ -56,7 +56,7 @@ class CreateRefundsRequest(BaseModel):
     amount: int
 
 
-@stripe_router.put("/refunds/{order_id}", response_model=Order)
+@router.put("/refunds/{order_id}", response_model=Order)
 async def refund_payment_intent(
     order_id: str,
     refund_request: CreateRefundsRequest,
@@ -105,7 +105,7 @@ async def refund_payment_intent(
             raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e))
 
 
-@stripe_router.post("/webhook")
+@router.post("/webhook")
 async def stripe_webhook(request: Request, crud: Crud = Depends(Crud.get)) -> Dict[str, str]:
     payload = await request.body()
     sig_header = request.headers.get("stripe-signature")
@@ -243,7 +243,7 @@ class CreateCheckoutSessionResponse(BaseModel):
     session_id: str
 
 
-@stripe_router.post("/create-checkout-session", response_model=CreateCheckoutSessionResponse)
+@router.post("/create-checkout-session", response_model=CreateCheckoutSessionResponse)
 async def create_checkout_session(
     request: CreateCheckoutSessionRequest,
     user: Annotated[User, Depends(get_session_user_with_read_permission)],
@@ -319,7 +319,7 @@ async def create_checkout_session(
         raise HTTPException(status_code=400, detail=str(e))
 
 
-@stripe_router.get("/get-product/{product_id}")
+@router.get("/get-product/{product_id}")
 async def get_product(product_id: str) -> Dict[str, Any]:
     try:
         product = stripe.Product.retrieve(product_id)
@@ -338,7 +338,7 @@ class CreateConnectAccountResponse(BaseModel):
     account_id: str
 
 
-@stripe_router.post("/connect/account", response_model=CreateConnectAccountResponse)
+@router.post("/connect/account", response_model=CreateConnectAccountResponse)
 async def create_connect_account(
     user: Annotated[User, Depends(get_session_user_with_read_permission)],
     crud: Annotated[Crud, Depends(Crud.get)],
@@ -376,7 +376,7 @@ async def create_connect_account(
         raise HTTPException(status_code=400, detail=str(e))
 
 
-@stripe_router.post("/connect/account/session")
+@router.post("/connect/account/session")
 async def create_connect_account_session(
     user: Annotated[User, Depends(get_session_user_with_read_permission)],
     account_id: str = Body(..., embed=True),
@@ -406,7 +406,7 @@ async def create_connect_account_session(
         raise
 
 
-@stripe_router.post("/connect/delete/accounts")
+@router.post("/connect/delete/accounts")
 async def delete_test_accounts(
     user: Annotated[User, Depends(get_session_user_with_read_permission)],
     crud: Annotated[Crud, Depends(Crud.get)],
diff --git a/store/app/routers/teleop/__init__.py b/store/app/routers/teleop/__init__.py
index 217eb297..f1c65791 100644
--- a/store/app/routers/teleop/__init__.py
+++ b/store/app/routers/teleop/__init__.py
@@ -4,6 +4,6 @@
 
 from store.app.routers.teleop.webrtc import router as webrtc_router
 
-teleop_router = APIRouter()
+router = APIRouter()
 
-teleop_router.include_router(webrtc_router, prefix="/rtc")
+router.include_router(webrtc_router, prefix="/rtc")
diff --git a/store/app/routers/users.py b/store/app/routers/users.py
index a9513563..8014c8fe 100644
--- a/store/app/routers/users.py
+++ b/store/app/routers/users.py
@@ -21,7 +21,7 @@
 
 logger = logging.getLogger(__name__)
 
-users_router = APIRouter()
+router = APIRouter()
 
 TOKEN_TYPE = "Bearer"
 
@@ -66,7 +66,7 @@ def from_user(cls, user: User) -> Self:
         )
 
 
-@users_router.get("/me", response_model=MyUserInfoResponse)
+@router.get("/me", response_model=MyUserInfoResponse)
 async def get_user_info_endpoint(
     user: Annotated[User, Depends(get_session_user_with_read_permission)],
 ) -> MyUserInfoResponse | None:
@@ -86,7 +86,7 @@ async def get_user_info_endpoint(
         return None
 
 
-@users_router.delete("/me")
+@router.delete("/me")
 async def delete_user_endpoint(
     user: Annotated[User, Depends(get_session_user_with_write_permission)],
     crud: Annotated[Crud, Depends(Crud.get)],
@@ -154,7 +154,7 @@ class LoginResponse(BaseModel):
     token: str
 
 
-@users_router.get("/batch", response_model=PublicUsersInfoResponse)
+@router.get("/batch", response_model=PublicUsersInfoResponse)
 async def get_users_batch_endpoint(
     crud: Annotated[Crud, Depends(Crud.get)],
     ids: list[str] = Query(...),
@@ -163,7 +163,7 @@ async def get_users_batch_endpoint(
     return PublicUsersInfoResponse(users=[PublicUserInfoResponseItem.from_user(user) for user in users])
 
 
-@users_router.get("/public/batch", response_model=PublicUsersInfoResponse)
+@router.get("/public/batch", response_model=PublicUsersInfoResponse)
 async def get_users_public_batch_endpoint(
     crud: Annotated[Crud, Depends(Crud.get)],
     ids: list[str] = Query(...),
@@ -172,7 +172,7 @@ async def get_users_public_batch_endpoint(
     return PublicUsersInfoResponse(users=[PublicUserInfoResponseItem.from_user(user) for user in users])
 
 
-@users_router.get("/{id}", response_model=UserInfoResponseItem)
+@router.get("/{id}", response_model=UserInfoResponseItem)
 async def get_user_info_by_id_endpoint(id: str, crud: Annotated[Crud, Depends(Crud.get)]) -> UserInfoResponseItem:
     user = await crud.get_user(id)
     if user is None:
@@ -180,14 +180,14 @@ async def get_user_info_by_id_endpoint(id: str, crud: Annotated[Crud, Depends(Cr
     return UserInfoResponseItem.from_user(user)
 
 
-@users_router.get("/public/me", response_model=UserPublic)
+@router.get("/public/me", response_model=UserPublic)
 async def get_my_public_user_info_endpoint(
     user: User = Depends(get_session_user_with_read_permission),
 ) -> UserPublic:  # Change return type to UserPublic
     return UserPublic(**user.model_dump())  # Return UserPublic instance directly
 
 
-@users_router.get("/public/{id}", response_model=UserPublic)
+@router.get("/public/{id}", response_model=UserPublic)
 async def get_public_user_info_by_id_endpoint(
     id: str,
     crud: Annotated[Crud, Depends(Crud.get)],
@@ -209,7 +209,7 @@ class UpdateUserRequest(BaseModel):
     bio: str | None = None
 
 
-@users_router.put("/me", response_model=UserPublic)
+@router.put("/me", response_model=UserPublic)
 async def update_profile(
     updates: UpdateUserRequest,
     user: Annotated[User, Depends(get_session_user_with_write_permission)],
@@ -233,7 +233,7 @@ class UpdateUsernameRequest(BaseModel):
     new_username: str
 
 
-@users_router.put("/me/username", response_model=UserPublic)
+@router.put("/me/username", response_model=UserPublic)
 async def update_username(
     request: UpdateUsernameRequest,
     user: Annotated[User, Depends(get_session_user_with_write_permission)],
@@ -245,7 +245,7 @@ async def update_username(
     return UserPublic(**updated_user.model_dump())
 
 
-@users_router.get("/validate-api-key")
+@router.get("/validate-api-key")
 async def validate_api_key_endpoint(
     crud: Annotated[Crud, Depends(Crud.get)],
     api_key_id: Annotated[str, Depends(get_request_api_key_id)],
@@ -262,7 +262,7 @@ class SetModeratorRequest(BaseModel):
     is_mod: bool
 
 
-@users_router.post("/set-moderator")
+@router.post("/set-moderator")
 async def set_moderator(
     request: SetModeratorRequest,
     admin_user: Annotated[User, Depends(get_session_user_with_admin_permission)],
@@ -281,7 +281,7 @@ async def set_moderator(
     return UserPublic(**updated_user.model_dump())
 
 
-@users_router.get("/check-username/{username}")
+@router.get("/check-username/{username}")
 async def check_username_availability(
     username: str,
     crud: Annotated[Crud, Depends(Crud.get)],
@@ -296,7 +296,7 @@ class SetContentManagerRequest(BaseModel):
     is_content_manager: bool
 
 
-@users_router.post("/set-content-manager")
+@router.post("/set-content-manager")
 async def set_content_manager(
     request: SetContentManagerRequest,
     admin_user: Annotated[User, Depends(get_session_user_with_admin_permission)],