diff --git a/org/core-manifest.org b/org/core-manifest.org
index 98b3222..4e007e2 100644
--- a/org/core-manifest.org
+++ b/org/core-manifest.org
@@ -49,5 +49,8 @@ The TUI is a standalone system that depends on Croatoan (ncurses bindings) in ad
 #+begin_src lisp
 (defsystem :passepartout/tui
   :depends-on (:passepartout :croatoan :usocket :bordeaux-threads)
-  :components ((:file "lisp/gateway-tui")))
+  :serial t
+  :components ((:file "lisp/gateway-tui-model")
+               (:file "lisp/gateway-tui-view")
+               (:file "lisp/gateway-tui-main")))
 #+end_src
diff --git a/passepartout.asd b/passepartout.asd
index 4bacbca..25e24ba 100644
--- a/passepartout.asd
+++ b/passepartout.asd
@@ -18,4 +18,7 @@
 
 (defsystem :passepartout/tui
   :depends-on (:passepartout :croatoan :usocket :bordeaux-threads)
-  :components ((:file "lisp/gateway-tui")))
+  :serial t
+  :components ((:file "lisp/gateway-tui-model")
+               (:file "lisp/gateway-tui-view")
+               (:file "lisp/gateway-tui-main")))