diff --git a/src/ui/layout.lisp b/src/components/layout.lisp
similarity index 82%
rename from src/ui/layout.lisp
rename to src/components/layout.lisp
index db3442e..30ae77b 100644
--- a/src/ui/layout.lisp
+++ b/src/components/layout.lisp
@@ -1,8 +1,8 @@
-(uiop:define-package #:hp/ui/layout
+(uiop:define-package #:hp/components/layout
   (:use #:cl)
   (:local-nicknames (#:pi #:piccolo))
   (:export #:layout))
-(in-package #:hp/ui/layout)
+(in-package #:hp/components/layout)
 
 (pi:define-element layout ()
   (pi:h
diff --git a/src/routes/index.lisp b/src/routes/index.lisp
index 9373951..5297e96 100644
--- a/src/routes/index.lisp
+++ b/src/routes/index.lisp
@@ -2,7 +2,7 @@
   (:use #:cl)
   (:local-nicknames (#:pi #:piccolo))
   (:local-nicknames (#:jg #:jingle))
-  (:local-nicknames (#:ui #:hp/ui/*))
+  (:local-nicknames (#:cmp #:hp/components/*))
   (:export #:on-get))
 (in-package #:hp/routes/index)
 
@@ -10,7 +10,7 @@
 
 (pi:define-element page ()
   (pi:h
-    (ui:layout
+    (cmp:layout
       (section :class "h-full flex justify-center items-center"
         (p :class "text-primary text-4xl"
           "Hello World!")))))
diff --git a/src/routes/user/=name.lisp b/src/routes/user/=name.lisp
index ddd95ba..1ea43e7 100644
--- a/src/routes/user/=name.lisp
+++ b/src/routes/user/=name.lisp
@@ -2,7 +2,7 @@
   (:use #:cl)
   (:local-nicknames (#:pi #:piccolo))
   (:local-nicknames (#:jg #:jingle))
-  (:local-nicknames (#:ui #:hp/ui/*))
+  (:local-nicknames (#:cmp #:hp/components/*))
   (:export #:on-get))
 (in-package #:hp/routes/user/=name)
 
@@ -10,7 +10,7 @@
 
 (pi:define-element page (name)
   (pi:h
-    (ui:layout
+    (cmp:layout
       (section :class "h-full flex justify-center items-center"
         (p :class "text-primary text-4xl"
           "Hello, " name "!")))))