diff --git a/src/PackageRegistryService/Pages/Components/Package.cs b/src/PackageRegistryService/Pages/Components/Package.cs
new file mode 100644
index 0000000..cd0b32c
--- /dev/null
+++ b/src/PackageRegistryService/Pages/Components/Package.cs
@@ -0,0 +1,58 @@
+using PackageRegistryService.Models;
+using System.Text;
+
+namespace PackageRegistryService.Pages.Components
+{
+    public class Package
+    {
+        public static string Render(
+            string packageName,
+            string packageVersion,
+            string packageDescription,
+            string packageReleaseNotes,
+            string packageContent,
+            DateOnly packageReleaseDate,
+            string[] packageTags,
+            Author[] packageAuthors,
+            string versionTable
+        )
+        {
+            return $@"<section>
+  <hgroup>
+    <h1>Validation Package <mark>{packageName}</mark></h1>
+    <p>{PackageTag.RenderAllInline(packageTags)}</p>
+    <p><strong>v{packageVersion}</strong> released on {packageReleaseDate}</p>
+  </hgroup>
+</section>
+<hr />
+<section>
+  <h4>Install with <a href=""a"">arc-validate</a></h3>
+  <pre><code> arc-validate package install {packageName} --package-version {packageVersion}</code></pre>
+</section>
+<hr />
+<section> 
+  <h2>Description</h2>
+  {PackageDescription.Render(packageDescription)}
+</section>
+<hr />
+<section>
+  <details>
+    <summary role=""button"" class=""primary"">Release notes</summary>
+      {PackageReleaseNotes.Render(packageReleaseNotes)}
+  </details>
+  <hr />
+  <details>
+    <summary role=""button"" class=""primary"">Browse code (v{packageVersion})</summary>
+      <pre><code>{packageContent}</code></pre>
+  </details>
+  <hr />
+  <details>
+    <summary role=""button"" class=""primary"">Available versions</summary>
+    {versionTable}
+  </details>
+</section>
+<hr />
+";
+        }
+    }
+}
diff --git a/src/PackageRegistryService/Pages/Index.cs b/src/PackageRegistryService/Pages/Handlers/IndexHandlers.cs
similarity index 90%
rename from src/PackageRegistryService/Pages/Index.cs
rename to src/PackageRegistryService/Pages/Handlers/IndexHandlers.cs
index cf8d2e4..d743016 100644
--- a/src/PackageRegistryService/Pages/Index.cs
+++ b/src/PackageRegistryService/Pages/Handlers/IndexHandlers.cs
@@ -2,9 +2,9 @@
 using PackageRegistryService.Models;
 using PackageRegistryService.Pages.Components;
 
-namespace PackageRegistryService.Pages
+namespace PackageRegistryService.Pages.Handlers
 {
-    public static class Index
+    public static class IndexHandlers
     {
         public static async Task<ContentHttpResult> Render()
         {
diff --git a/src/PackageRegistryService/Pages/Handlers/PackageHandlers.cs b/src/PackageRegistryService/Pages/Handlers/PackageHandlers.cs
new file mode 100644
index 0000000..baae68b
--- /dev/null
+++ b/src/PackageRegistryService/Pages/Handlers/PackageHandlers.cs
@@ -0,0 +1,99 @@
+using Microsoft.AspNetCore.Http.HttpResults;
+using Microsoft.EntityFrameworkCore;
+using PackageRegistryService.Models;
+using PackageRegistryService.Pages.Components;
+using System.Text;
+using System.Xml.Linq;
+
+namespace PackageRegistryService.Pages.Handlers
+{
+    public static class PackageHandlers
+    {
+        public static async Task<Results<ContentHttpResult, NotFound, BadRequest<string>>> Render(string packageName, string version, ValidationPackageDb database)
+        {
+            var splt = version.Split('.');
+            if (splt.Length != 3)
+            {
+                return TypedResults.BadRequest("version was not a of valid format MAJOR.MINOR.REVISION");
+            }
+
+            int major; int minor; int revision;
+
+            if (
+                !int.TryParse(splt[0], out major)
+                || !int.TryParse(splt[1], out minor)
+                || !int.TryParse(splt[2], out revision)
+            )
+            {
+                return TypedResults.BadRequest("version was not a of valid format MAJOR.MINOR.REVISION");
+            }
+
+            var package = await database.ValidationPackages.FindAsync(packageName, major, minor, revision);
+
+            if (package == null)
+            {
+                return TypedResults.NotFound();
+            }
+
+            var packages = await 
+                database.ValidationPackages
+                .Where(p => p.Name == packageName)
+                .ToArrayAsync();
+
+            var page = Layout.Render(
+                activeNavbarItem: "",
+                title: $"Package {packageName} - ARC validation package registry API",
+                content: Components.Package.Render(
+                    packageName: packageName,
+                    packageVersion: package.GetSemanticVersionString(),
+                    packageContent: Encoding.UTF8.GetString(package.PackageContent),
+                    packageReleaseDate: package.ReleaseDate,
+                    packageTags: package.Tags ?? [],
+                    packageDescription: package.Description,
+                    packageReleaseNotes: package.ReleaseNotes ?? "",
+                    packageAuthors: (package.Authors ?? []).ToArray(),
+                    versionTable: Components.PackageAvailableVersion.RenderVersionTable(packages)
+                )
+            );
+
+            return TypedResults.Text(content: page, contentType: "text/html");
+        }
+        public static async Task<Results<ContentHttpResult, NotFound>> RenderLatest(string packageName, ValidationPackageDb database)
+        {
+            var packages = await
+                database.ValidationPackages
+                    .Where(p => p.Name == packageName)
+                    .ToArrayAsync();
+
+            var latestPackage =
+                packages
+                .OrderByDescending(p => p.MajorVersion)
+                .ThenByDescending(p => p.MinorVersion)
+                .ThenByDescending(p => p.PatchVersion)
+                .FirstOrDefault();
+
+            if (latestPackage == null)
+            {
+                return TypedResults.NotFound();
+            }
+
+            var page = Layout.Render(
+                activeNavbarItem: "",
+                title: $"Package {packageName} - ARC validation package registry API",
+                content: Components.Package.Render(
+                    packageName: packageName,
+                    packageVersion: latestPackage.GetSemanticVersionString(),
+                    packageContent: Encoding.UTF8.GetString(latestPackage.PackageContent),
+                    packageReleaseDate: latestPackage.ReleaseDate,
+                    packageTags: latestPackage.Tags ?? [],
+                    packageDescription: latestPackage.Description,
+                    packageReleaseNotes: latestPackage.ReleaseNotes ?? "",
+                    packageAuthors: (latestPackage.Authors ?? []).ToArray(),
+                    versionTable: Components.PackageAvailableVersion.RenderVersionTable(packages)
+                )
+            );
+
+            return TypedResults.Text(content: page, contentType: "text/html");
+        }
+    }
+}
diff --git a/src/PackageRegistryService/Pages/Packages.cs b/src/PackageRegistryService/Pages/Handlers/PackagesHandlers.cs
similarity index 95%
rename from src/PackageRegistryService/Pages/Packages.cs
rename to src/PackageRegistryService/Pages/Handlers/PackagesHandlers.cs
index 989a51b..53a4a45 100644
--- a/src/PackageRegistryService/Pages/Packages.cs
+++ b/src/PackageRegistryService/Pages/Handlers/PackagesHandlers.cs
@@ -7,11 +7,10 @@
 using System.Linq;
 using static System.Net.Mime.MediaTypeNames;
 
-namespace PackageRegistryService.Pages
+namespace PackageRegistryService.Pages.Handlers
 {
-    public static class Packages
+    public static class PackagesHandlers
     {
-        
         public static async Task<ContentHttpResult> Render(ValidationPackageDb database)
         {
             var packages = await database.ValidationPackages.ToArrayAsync();
diff --git a/src/PackageRegistryService/Pages/Package.cs b/src/PackageRegistryService/Pages/Package.cs
deleted file mode 100644
index c517eae..0000000
--- a/src/PackageRegistryService/Pages/Package.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using Microsoft.AspNetCore.Http.HttpResults;
-using Microsoft.EntityFrameworkCore;
-using PackageRegistryService.Models;
-using PackageRegistryService.Pages.Components;
-using System.Text;
-
-namespace PackageRegistryService.Pages
-{
-    public static class Package
-    {
-        public static async Task<Results<ContentHttpResult, NotFound>> Render(string packageName, string version, ValidationPackageDb database)
-        {
-            var content = $"{packageName}, {version}";
-            return TypedResults.Text(content: content, contentType: "text/html");
-        }
-        public static async Task<Results<ContentHttpResult, NotFound>> RenderLatest(string packageName, ValidationPackageDb database)
-        {
-            var packages = await 
-                database.ValidationPackages
-                    .Where(p => p.Name == packageName)
-                    .ToArrayAsync();
-
-            var latestPackage =
-                packages
-                .OrderByDescending(p => p.MajorVersion)
-                .ThenByDescending(p => p.MinorVersion)
-                .ThenByDescending(p => p.PatchVersion)
-                .FirstOrDefault();
-
-            if (latestPackage == null)
-            {
-                return TypedResults.NotFound();
-            }
-
-            var content = $@"<section>
-  <hgroup>
-    <h1>Validation Package <mark>{packageName}</mark></h1>
-    <p>{PackageTag.RenderAllInline(latestPackage.Tags)}</p>
-    <p>v{latestPackage.GetSemanticVersionString()}</p>
-  </hgroup>
-</section>
-<hr />
-<section>
-  <h4>Install with <a href=""a"">arc-validate</a></h3>
-  <pre><code> arc-validate package install {packageName} --package-version {latestPackage.GetSemanticVersionString()}</code></pre>
-</section>
-<hr />
-<section> 
-  <h2>Description</h2>
-  {PackageDescription.Render(latestPackage.Description)}
-</section>
-<hr />
-<section>
-  <details>
-    <summary role=""button"" class=""primary"">Release notes</summary>
-      {PackageReleaseNotes.Render(latestPackage.ReleaseNotes)}
-  </details>
-  <hr />
-  <details>
-    <summary role=""button"" class=""primary"">Browse code (v{latestPackage.GetSemanticVersionString()})</summary>
-      <pre><code>{Encoding.UTF8.GetString(latestPackage.PackageContent)}</code></pre>
-  </details>
-  <hr />
-  <details>
-    <summary role=""button"" class=""primary"">Available versions</summary>
-    {PackageAvailableVersion.RenderVersionTable(packages)}
-  </details>
-</section>
-<hr />
-";
-
-            var page = Layout.Render(
-                activeNavbarItem: "",
-                title: $"Package {packageName} - ARC validation package registry API",
-                content: content
-            );
-
-            return TypedResults.Text(content: page, contentType: "text/html");
-        }
-    }
-}
diff --git a/src/PackageRegistryService/Pages/PageEndpoints.cs b/src/PackageRegistryService/Pages/PageEndpoints.cs
index 8a8624c..fc5ab8f 100644
--- a/src/PackageRegistryService/Pages/PageEndpoints.cs
+++ b/src/PackageRegistryService/Pages/PageEndpoints.cs
@@ -1,16 +1,18 @@
-namespace PackageRegistryService.Pages
+using PackageRegistryService.Pages.Handlers;
+
+namespace PackageRegistryService.Pages
 {
     public static class PageEndpoints
     {
         public static RouteGroupBuilder MapPageEndpoints(this RouteGroupBuilder group)
         {
-            group.MapGet("", Index.Render);
+            group.MapGet("", IndexHandlers.Render);
 
-            group.MapGet("packages", Packages.Render);
+            group.MapGet("packages", PackagesHandlers.Render);
 
-            group.MapGet("package/{packageName}", Package.RenderLatest);
+            group.MapGet("package/{packageName}", PackageHandlers.RenderLatest);
 
-            group.MapGet("package/{packageName}/{version}", Package.Render);
+            group.MapGet("package/{packageName}/{version}", PackageHandlers.Render);
 
             return group;
         }