diff --git a/contrib/walker/tests.lisp b/contrib/walker/tests/tests.lisp
similarity index 100%
rename from contrib/walker/tests.lisp
rename to contrib/walker/tests/tests.lisp
diff --git a/micros.asd b/micros.asd
index 3665fe5..9ee9a05 100644
--- a/micros.asd
+++ b/micros.asd
@@ -49,12 +49,14 @@
                              ;; (:file "snapshot")
                              ;; (:file "sprof")
                              (:module "walker"
-                              :components ((:file "walker")))))
+                              :components ((:file "package")
+                                           (:file "types")
+                                           (:file "walker")
+                                           (:file "defun-form")))))
                (:file "lsp-api")))
 
 (defsystem "micros/tests"
   :depends-on ("rove" "micros")
   :serial t
-  :components ((:module "contrib"
-                :components ((:module "walker"
-                              :components ((:file "tests")))))))
+  :pathname "contrib/walker/tests/"
+  :components ((:file "tests")))