diff --git a/haunt.scm b/haunt.scm
index f73bea1..59804ad 100644
--- a/haunt.scm
+++ b/haunt.scm
@@ -2,8 +2,8 @@
              (haunt artifact)
              (haunt html)
 	     (haunt post)
-             (extless-blog)
-             (extless-atom)
+             (hippo builder blog-extless)
+             (hippo builder atom-extless)
              (haunt builder assets)
              (haunt reader commonmark)
              (haunt site)
diff --git a/extless-atom.scm b/hippo/builder/atom-extless.scm
similarity index 99%
rename from extless-atom.scm
rename to hippo/builder/atom-extless.scm
index a68a27c..e1f0442 100644
--- a/extless-atom.scm
+++ b/hippo/builder/atom-extless.scm
@@ -26,7 +26,7 @@
 ;;; Public License along with this module. If not, see
 ;;; <http://www.gnu.org/licenses/>.
 
-(define-module (extless-atom)
+(define-module (hippo builder atom-extless)
   #:use-module (srfi srfi-9)
   #:use-module (srfi srfi-19)
   #:use-module (srfi srfi-26)
diff --git a/extless-blog.scm b/hippo/builder/blog-extless.scm
similarity index 99%
rename from extless-blog.scm
rename to hippo/builder/blog-extless.scm
index 22c3156..0f3a02f 100644
--- a/extless-blog.scm
+++ b/hippo/builder/blog-extless.scm
@@ -25,7 +25,7 @@
 ;;; Public License along with this module. If not, see
 ;;; <http://www.gnu.org/licenses/>.
 
-(define-module (extless-blog)
+(define-module (hippo builder blog-extless)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-9)