diff --git a/src/components/podcast-episodes-list.tsx b/src/components/podcast-episodes-list.tsx
deleted file mode 100644
index ab9da62..0000000
--- a/src/components/podcast-episodes-list.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import { Link, useParams } from "react-router-dom";
-import { usePodcastQuery } from "../services/podcasts/podcast.hooks";
-import {
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableHeadCell,
-  TableRow,
-} from "./ui/table/table";
-import { useTitle } from "../hooks/use-title";
-
-export function PodcastEpisodesList() {
-  const { podcastId } = useParams<{ podcastId: string }>();
-  const { data: podcast } = usePodcastQuery(podcastId);
-  useTitle(podcast?.title ?? "Podcast");
-
-  return (
-    <div>
-      <div className={"p-3 text-xl font-bold shadow-md"}>
-        Episodes: {podcast?.trackCount}
-      </div>
-      <div className={"mt-6 p-3 shadow-md"}>
-        <Table>
-          <TableHead>
-            <TableRow className={"!bg-slate-50"}>
-              <TableHeadCell className={"text-start"}>Title</TableHeadCell>
-              <TableHeadCell className={"text-start"}>Date</TableHeadCell>
-              <TableHeadCell className={"text-end"}>Duration</TableHeadCell>
-            </TableRow>
-          </TableHead>
-          <TableBody>
-            {podcast?.episodes?.map((episode) => {
-              const formattedDate = formatDate(episode.releaseDate);
-              const formattedDuration = formatDuration(episode.durationSeconds);
-              const url = `/podcast/${podcastId}/episode/${episode.id}`;
-
-              return (
-                <TableRow key={episode.id}>
-                  <TableCell>
-                    <Link
-                      to={url}
-                      className={"text-indigo-500 hover:underline"}
-                    >
-                      {episode.title}
-                    </Link>
-                  </TableCell>
-                  <TableCell>{formattedDate}</TableCell>
-                  <TableCell className={"text-end"}>
-                    {formattedDuration}
-                  </TableCell>
-                </TableRow>
-              );
-            })}
-          </TableBody>
-        </Table>
-      </div>
-    </div>
-  );
-}
-
-function formatDuration(duration?: number) {
-  if (!duration) {
-    return "N/A";
-  }
-  const minutes = Math.floor(duration / 60);
-  const seconds = Math.floor(duration % 60);
-  return `${minutes.toString().padStart(2, "0")}:${seconds.toString().padStart(2, "0")}`;
-}
-
-function formatDate(date: string) {
-  return new Date(date).toLocaleDateString("es-ES", {
-    month: "2-digit",
-    day: "2-digit",
-    year: "numeric",
-  });
-}
diff --git a/src/components/podcast/podcast-episodes-list.tsx b/src/components/podcast/podcast-episodes-list.tsx
new file mode 100644
index 0000000..5d9fc65
--- /dev/null
+++ b/src/components/podcast/podcast-episodes-list.tsx
@@ -0,0 +1,22 @@
+import { useParams } from "react-router-dom";
+import { usePodcastQuery } from "../../services/podcasts/podcast.hooks";
+import { useTitle } from "../../hooks/use-title";
+import { PodcastEpisodesTable } from "./podcast-episodes-table";
+
+export function PodcastEpisodesList() {
+  const { podcastId } = useParams<{ podcastId: string }>();
+  const { data: podcast } = usePodcastQuery(podcastId);
+
+  useTitle(podcast?.title ?? "Podcast");
+
+  return (
+    <section>
+      <header className={"p-3 text-xl font-bold shadow-md"}>
+        Episodes: {podcast?.trackCount}
+      </header>
+      <article className={"mt-6 p-3 shadow-md"}>
+        <PodcastEpisodesTable episodes={podcast?.episodes} />
+      </article>
+    </section>
+  );
+}
diff --git a/src/components/podcast/podcast-episodes-table.tsx b/src/components/podcast/podcast-episodes-table.tsx
new file mode 100644
index 0000000..cb4ae4a
--- /dev/null
+++ b/src/components/podcast/podcast-episodes-table.tsx
@@ -0,0 +1,52 @@
+import { memo } from "react";
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeadCell,
+  TableRow,
+} from "../ui/table/table";
+import { formatDate, formatDuration } from "../../utils";
+import { Link } from "react-router-dom";
+import { Episode } from "../../services/rss-parser";
+
+type Props = {
+  episodes: Episode[] | undefined;
+};
+
+export const PodcastEpisodesTable = memo(({ episodes }: Props) => {
+  return (
+    <Table className={"w-full"}>
+      <TableHead>
+        <TableRow className={"!bg-slate-50"}>
+          <TableHeadCell>Title</TableHeadCell>
+          <TableHeadCell>Date</TableHeadCell>
+          <TableHeadCell className={"text-end"}>Duration</TableHeadCell>
+        </TableRow>
+      </TableHead>
+      <TableBody>
+        {episodes?.map((episode) => {
+          const formattedDate = formatDate(episode.releaseDate);
+          const dateTime = new Date(episode.releaseDate).toISOString();
+          const formattedDuration = formatDuration(episode.durationSeconds);
+          const url = `episode/${episode.id}`;
+
+          return (
+            <TableRow key={episode.id}>
+              <TableCell>
+                <Link to={url} className={"text-indigo-500 hover:underline"}>
+                  {episode.title}
+                </Link>
+              </TableCell>
+              <TableCell>
+                <time dateTime={dateTime}>{formattedDate}</time>
+              </TableCell>
+              <TableCell className={"text-end"}>{formattedDuration}</TableCell>
+            </TableRow>
+          );
+        })}
+      </TableBody>
+    </Table>
+  );
+});
diff --git a/src/components/podcast-info-card.tsx b/src/components/podcast/podcast-info-card.tsx
similarity index 90%
rename from src/components/podcast-info-card.tsx
rename to src/components/podcast/podcast-info-card.tsx
index 11ba3bd..5958dc5 100644
--- a/src/components/podcast-info-card.tsx
+++ b/src/components/podcast/podcast-info-card.tsx
@@ -1,5 +1,5 @@
 import { Link, useParams } from "react-router-dom";
-import { Wrap } from "./wrap";
+import { Wrap } from "../utils/wrap";
 
 type Props = {
   title: string;
@@ -39,10 +39,10 @@ export function PodcastInfoCard({
           <em className={"text-sm"}>by {author}</em>
         </Wrap>
       </div>
-      <div>
+      <div className={"px-2 py-2"}>
         <strong className={"text-sm"}>Description:</strong>
         <div
-          className={"break-words text-sm italic"}
+          className={"mt-1 break-words text-sm italic"}
           dangerouslySetInnerHTML={{ __html: description }}
         ></div>
       </div>
diff --git a/src/components/podcast-preview-card.tsx b/src/components/podcast/podcast-preview-card.tsx
similarity index 100%
rename from src/components/podcast-preview-card.tsx
rename to src/components/podcast/podcast-preview-card.tsx
diff --git a/src/components/ui/input/input.tsx b/src/components/ui/input/input.tsx
new file mode 100644
index 0000000..a3f696c
--- /dev/null
+++ b/src/components/ui/input/input.tsx
@@ -0,0 +1,16 @@
+import { ComponentPropsWithoutRef, ElementRef, forwardRef } from "react";
+import { clsx } from "clsx";
+
+type InputProps = ComponentPropsWithoutRef<"input">;
+type InputRef = ElementRef<"input">;
+
+export const Input = forwardRef<InputRef, InputProps>(
+  ({ className, ...props }, ref) => {
+    const classes = clsx(
+      "w-1/3 rounded-md border border-gray-300 p-2",
+      className,
+    );
+
+    return <input ref={ref} className={classes} {...props} />;
+  },
+);
diff --git a/src/components/layout.tsx b/src/components/ui/layout/layout.tsx
similarity index 94%
rename from src/components/layout.tsx
rename to src/components/ui/layout/layout.tsx
index 10e388f..8f629e1 100644
--- a/src/components/layout.tsx
+++ b/src/components/ui/layout/layout.tsx
@@ -1,5 +1,5 @@
 import { Link, Outlet } from "react-router-dom";
-import { Spinner } from "./spinner";
+import { Spinner } from "../spinner/spinner";
 import { useIsFetching } from "@tanstack/react-query";
 
 export function Layout() {
diff --git a/src/components/spinner.module.css b/src/components/ui/spinner/spinner.module.css
similarity index 100%
rename from src/components/spinner.module.css
rename to src/components/ui/spinner/spinner.module.css
diff --git a/src/components/spinner.tsx b/src/components/ui/spinner/spinner.tsx
similarity index 100%
rename from src/components/spinner.tsx
rename to src/components/ui/spinner/spinner.tsx
diff --git a/src/components/ui/table/table.tsx b/src/components/ui/table/table.tsx
index 5006cb7..f7af7b2 100644
--- a/src/components/ui/table/table.tsx
+++ b/src/components/ui/table/table.tsx
@@ -35,7 +35,7 @@ export const TableHeadCell = forwardRef<
   ElementRef<"th">,
   ComponentPropsWithoutRef<"th">
 >(({ children, className, ...rest }, ref) => {
-  const classes = clsx(className, "py-3 px-4");
+  const classes = clsx(className, "py-3 px-4 text-start");
 
   return (
     <th className={classes} {...rest} ref={ref}>
diff --git a/src/components/wrap.tsx b/src/components/utils/wrap.tsx
similarity index 100%
rename from src/components/wrap.tsx
rename to src/components/utils/wrap.tsx
diff --git a/src/pages/episode.tsx b/src/pages/episode.tsx
index 631aa12..366cef3 100644
--- a/src/pages/episode.tsx
+++ b/src/pages/episode.tsx
@@ -17,17 +17,17 @@ export function Episode() {
   useTitle(episode?.title ?? "Episode");
 
   return (
-    <div className={"h-fit w-full p-4 pb-6 shadow-md"}>
-      <h2 className={"text-2xl font-bold tracking-tight"}>{episode?.title}</h2>
-      <div
+    <section className={"h-fit w-full p-4 pb-6 shadow-md"}>
+      <header className={"text-2xl font-bold tracking-tight"}>
+        {episode?.title}
+      </header>
+      <article
         className={"prose mt-2 max-w-full border-b pb-4 leading-snug"}
         dangerouslySetInnerHTML={{ __html: episode?.description ?? "" }}
       />
-      <div>
-        <audio controls src={episode?.audioUrl} className={"mt-4 w-full"}>
-          Audio is not supported by your browser
-        </audio>
-      </div>
-    </div>
+      <audio controls src={episode?.audioUrl} className={"mt-4 w-full"}>
+        Audio is not supported by your browser
+      </audio>
+    </section>
   );
 }
diff --git a/src/pages/home.tsx b/src/pages/home.tsx
index b455689..7da88a7 100644
--- a/src/pages/home.tsx
+++ b/src/pages/home.tsx
@@ -1,6 +1,6 @@
 import { useState } from "react";
 
-import { PodcastPreviewCard } from "../components/podcast-preview-card";
+import { PodcastPreviewCard } from "../components/podcast/podcast-preview-card";
 import { useTopPodcastsQuery } from "../services/podcasts/podcast.hooks";
 
 export function Home() {
diff --git a/src/pages/podcast.tsx b/src/pages/podcast.tsx
index 5ba8f3a..5c33843 100644
--- a/src/pages/podcast.tsx
+++ b/src/pages/podcast.tsx
@@ -1,6 +1,6 @@
 import { Outlet, useParams } from "react-router-dom";
 import { usePodcastQuery } from "../services/podcasts/podcast.hooks";
-import { PodcastInfoCard } from "../components/podcast-info-card";
+import { PodcastInfoCard } from "../components/podcast/podcast-info-card";
 
 export function Podcast() {
   const { podcastId } = useParams<{ podcastId: string }>();
diff --git a/src/router.tsx b/src/router.tsx
index 0aa7a31..dcbe5e5 100644
--- a/src/router.tsx
+++ b/src/router.tsx
@@ -2,8 +2,8 @@ import { createBrowserRouter, RouterProvider } from "react-router-dom";
 import { Home } from "./pages/home";
 import { Podcast } from "./pages/podcast";
 import { Episode } from "./pages/episode";
-import { PodcastEpisodesList } from "./components/podcast-episodes-list";
-import { Layout } from "./components/layout";
+import { PodcastEpisodesList } from "./components/podcast/podcast-episodes-list";
+import { Layout } from "./components/ui/layout/layout";
 
 const router = createBrowserRouter([
   {
diff --git a/src/utils/datetime.ts b/src/utils/datetime.ts
new file mode 100644
index 0000000..e3dcc20
--- /dev/null
+++ b/src/utils/datetime.ts
@@ -0,0 +1,16 @@
+export function formatDate(date: string) {
+  return new Date(date).toLocaleDateString("es-ES", {
+    month: "2-digit",
+    day: "2-digit",
+    year: "numeric",
+  });
+}
+
+export function formatDuration(duration?: number) {
+  if (!duration) {
+    return "N/A";
+  }
+  const minutes = Math.floor(duration / 60);
+  const seconds = Math.floor(duration % 60);
+  return `${minutes.toString().padStart(2, "0")}:${seconds.toString().padStart(2, "0")}`;
+}
diff --git a/src/utils/index.ts b/src/utils/index.ts
new file mode 100644
index 0000000..34541dd
--- /dev/null
+++ b/src/utils/index.ts
@@ -0,0 +1 @@
+export * from "./datetime";