diff --git a/src/main/kotlin/org/freenet/website/main.kt b/src/main/kotlin/org/freenet/website/main.kt
index 52ab7c7..609d2a1 100644
--- a/src/main/kotlin/org/freenet/website/main.kt
+++ b/src/main/kotlin/org/freenet/website/main.kt
@@ -17,7 +17,7 @@ import org.freenet.website.pages.homePage
 import org.freenet.website.pages.identityPage
 import org.freenet.website.pages.news.NewsItem
 import org.freenet.website.pages.news.retrieveNews
-import org.freenet.website.dev.devPage
+import org.freenet.website.pages.dev.devPage
 import org.freenet.website.util.HealthCheckPlugin
 import org.freenet.website.util.UrlToPathSegmentsRF
 import org.freenet.website.util.recordVisit
diff --git a/src/main/kotlin/org/freenet/website/dev/PivotalTracker.kt b/src/main/kotlin/org/freenet/website/pages/dev/PivotalTracker.kt
similarity index 99%
rename from src/main/kotlin/org/freenet/website/dev/PivotalTracker.kt
rename to src/main/kotlin/org/freenet/website/pages/dev/PivotalTracker.kt
index 32f3492..f24767d 100644
--- a/src/main/kotlin/org/freenet/website/dev/PivotalTracker.kt
+++ b/src/main/kotlin/org/freenet/website/pages/dev/PivotalTracker.kt
@@ -1,6 +1,6 @@
 @file:UseSerializers(LocalDateSerializer::class)
 
-package org.freenet.website.dev
+package org.freenet.website.pages.dev
 
 import LocalDateSerializer
 import io.ktor.client.*
diff --git a/src/main/kotlin/org/freenet/website/dev/devPage.kt b/src/main/kotlin/org/freenet/website/pages/dev/devPage.kt
similarity index 95%
rename from src/main/kotlin/org/freenet/website/dev/devPage.kt
rename to src/main/kotlin/org/freenet/website/pages/dev/devPage.kt
index 51810be..7c60a61 100644
--- a/src/main/kotlin/org/freenet/website/dev/devPage.kt
+++ b/src/main/kotlin/org/freenet/website/pages/dev/devPage.kt
@@ -1,7 +1,6 @@
-package org.freenet.website.dev
+package org.freenet.website.pages.dev
 
 import kweb.*
-import kweb.button
 import kweb.components.Component
 
 fun Component.devPage() {
diff --git a/src/main/kotlin/org/freenet/website/dev/roadmap.kt b/src/main/kotlin/org/freenet/website/pages/dev/roadmap.kt
similarity index 97%
rename from src/main/kotlin/org/freenet/website/dev/roadmap.kt
rename to src/main/kotlin/org/freenet/website/pages/dev/roadmap.kt
index ed8c0ea..ae5ea12 100644
--- a/src/main/kotlin/org/freenet/website/dev/roadmap.kt
+++ b/src/main/kotlin/org/freenet/website/pages/dev/roadmap.kt
@@ -1,4 +1,4 @@
-package org.freenet.website.dev
+package org.freenet.website.pages.dev
 
 import kweb.*
 import kweb.components.Component
diff --git a/src/main/kotlin/org/freenet/website/pages/homePage.kt b/src/main/kotlin/org/freenet/website/pages/homePage.kt
index 20df847..c6a63f9 100644
--- a/src/main/kotlin/org/freenet/website/pages/homePage.kt
+++ b/src/main/kotlin/org/freenet/website/pages/homePage.kt
@@ -10,40 +10,36 @@ import java.util.*
 fun Component.homePage(latestNewsItems: ObservableList<NewsItem>) {
     h2().classes("title", "is-small").text("Declare your digital independence")
 
-    p()
-        .text(
-            """The internet has grown increasingly centralized over the past few decades, with a handful of 
-                    corporations now controlling most of its infrastructure. This privatization of the public square 
-                    threatens freedom of speech and democracy.""".trimMargin()
-        )
-
-    p()
-        .innerHTML(
-            """23 years ago, we created <a href="https://freenetproject.org/">Freenet Classic</a> - the 
-                            first distributed, decentralized peer-to-peer network.  Freenet Classic pioneered 
-                            technologies like cryptographic contracts and small-world networks and still has an active 
-                            community of users and developers today.
-                """.trimMargin()
-        )
-
-    p()
-        .text(
-            """The internet has evolved significantly since its early days and so have user 
-                            expectations. To meet these current challenges, we are developing a new version of 
-                            Freenet for 2023, initially known as "Locutus." In January 2023, the 
-                            Freenet Board of Directors announced that the original Freenet will be renamed to 
-                            "Freenet Classic" and Locutus will be renamed to Freenet.""".trimIndent()
-        )
-
-    p()
-        .text(
-            """ This new Freenet will make it easy for developers to create and deploy 
-                            decentralized alternatives to current centralized internet services such as instant 
-                            messaging, social networking, email, and online stores. These decentralized applications 
-                            will be user-friendly, scalable and secured through the use of cryptography. Freenet will 
-                            empower users by giving back control.
-                """.trimMargin()
-        )
+    p().innerHTML("""
+        <p>
+        The internet has grown increasingly centralized over the past few decades, with a 
+        handful of corporations now controlling most of its infrastructure. This centralization 
+        threatens freedom of speech and undermines the democratic principles of the internet as 
+        a virtual public square.
+        </p>
+        <p>
+        In 1999, we pioneered the concept of a decentralized internet with the creation of the 
+        original Freenet—a distributed, peer-to-peer network that introduced groundbreaking 
+        technologies like cryptographic contracts and small-world networks.
+        </p>
+        <p>
+        Now, we are proud to introduce Freenet 2023—a completely reimagined and redesigned 
+        version of our decentralized digital ecosystem. Freenet 2023 aims to serve as a drop-in 
+        decentralized replacement for the World Wide Web, offering a powerful and liberating 
+        alternative to the centralized internet.
+        </p>
+        <p>
+        With Freenet 2023, developers can easily create and deploy decentralized alternatives 
+        to current centralized internet services, including instant messaging, social 
+        networking, email, and online stores. These decentralized applications will be 
+        user-friendly, scalable, and secured through cryptography. By giving users control 
+        over their digital experiences, Freenet 2023 fosters a sense of digital autonomy 
+        and promotes a more equitable and inclusive online environment.
+        </p>
+        <p>
+        Embrace the freedom of a decentralized internet with Freenet 2023.
+        </p>
+    """.trimIndent())
 
     h3().classes("title", "is-medium").text("Learn More")
 
diff --git a/src/main/kotlin/org/freenet/website/id/IdComponent.kt b/src/main/kotlin/org/freenet/website/pages/id/IdComponent.kt
similarity index 96%
rename from src/main/kotlin/org/freenet/website/id/IdComponent.kt
rename to src/main/kotlin/org/freenet/website/pages/id/IdComponent.kt
index eed9144..c6036d0 100644
--- a/src/main/kotlin/org/freenet/website/id/IdComponent.kt
+++ b/src/main/kotlin/org/freenet/website/pages/id/IdComponent.kt
@@ -1,4 +1,4 @@
-package org.freenet.website.id
+package org.freenet.website.pages.id
 import org.bouncycastle.crypto.engines.RSAEngine
 import org.bouncycastle.crypto.params.RSAKeyParameters
 import java.math.BigInteger