diff --git a/Makefile.am b/Makefile.am
index 8afa1c9..7fba0d0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,8 +32,7 @@ SUFFIXES = .scm .go
 .scm.go:
 	$(AM_V_GEN)$(top_builddir)/pre-inst-env $(GUILE_TOOLS) compile $(GUILE_TARGET) $(GUILE_WARNINGS) -o "$@" "$<"
 
-SOURCES = msg.scm \
-          msg/config.scm \
+SOURCES = msg/config.scm \
           msg/machine.scm \
           msg/hconfig.scm \
           msg/shell.scm \
@@ -61,6 +60,7 @@ EXTRA_DIST = README.org \
              README \
              HACKING \
              COPYING \
+             doc/config.scm \
              NEWS \
              AUTHORS \
              ChangeLog \
diff --git a/configure.ac b/configure.ac
index 581ad19..ffbf15c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_SUBST(HVERSION, "\"0.1\"")
 AC_SUBST(AUTHOR, "\"Chad Nelson\"")
 AC_SUBST(COPYRIGHT, "'(2023)")
 AC_SUBST(LICENSE, gpl3+)
-AC_CONFIG_SRCDIR(msg.scm)
+AC_CONFIG_SRCDIR(scripts)
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([1.12 gnu silent-rules subdir-objects  color-tests parallel-tests -Woverride -Wno-portability])
 AM_SILENT_RULES([yes])
diff --git a/doc/config.scm b/doc/config.scm
new file mode 100644
index 0000000..46888ff
--- /dev/null
+++ b/doc/config.scm
@@ -0,0 +1 @@
+((cpu . 4) (mem . 4))
\ No newline at end of file
diff --git a/hall.scm b/hall.scm
index 179a17c..008e7a6 100644
--- a/hall.scm
+++ b/hall.scm
@@ -13,22 +13,21 @@
  (skip ())
  (features ((guix #f) (native-language-support #f) (licensing #f)))
  (files (libraries
-         ((scheme-file "msg")
-          (directory
+         ((directory
            "msg"
            ((scheme-file "config")
             (scheme-file "machine")
             (scheme-file "hconfig")
             (scheme-file "shell")
             (scheme-file "helpers")))))
-        (tests ((directory "tests" ())))
+        (tests ())
         (programs ((directory "scripts" ((in-file "msg")))))
         (documentation
          ((org-file "README")
           (symlink "README" "README.org")
           (text-file "HACKING")
           (text-file "COPYING")
-          (directory "doc" ((texi-file "msg")))
+          (directory "doc" ((texi-file "msg") (scheme-file "config")))
           (text-file "NEWS")
           (text-file "AUTHORS")
           (text-file "ChangeLog")))
diff --git a/msg.scm b/msg.scm
deleted file mode 100644
index e69de29..0000000