Index: docs/code/module-hierarchy.dot
==================================================================
--- docs/code/module-hierarchy.dot
+++ docs/code/module-hierarchy.dot
@@ -67,10 +67,11 @@
     commonmod -> mtmod;
     rmtmod    -> mtmod;
     servermod -> mtmod;
     taskmod   -> mtmod;
     mtargs    -> mtmod;
+    subrunmod -> mtmod;
     // launchmod -> mtmod;
     // runsmod
     mtmod     -> runsmod;
     commonmod -> runsmod;
     testsmod  -> runsmod;
@@ -92,14 +93,14 @@
     // commonmod -> launchmod;
     // rmtmod    -> launchmod;
     // testsmod  -> launchmod;
     // mtconfigf -> launchmod;
     // mtargs    -> launchmod;
-    // subrunmod -> launchmod;
+    subrunmod -> launchmod;
     // dbmod     -> launchmod;
     
     // subrun
     
 }
   
 }
 

Index: launchmod.scm
==================================================================
--- launchmod.scm
+++ launchmod.scm
@@ -17,17 +17,18 @@
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;======================================================================
 
 (declare (unit launchmod))
+
 (declare (uses commonmod))
-(declare (uses rmtmod))
-(declare (uses mtconfigf))
-(declare (uses testsmod))
-(declare (uses mtargs))
-(declare (uses subrunmod))
-(declare (uses dbmod))
+;; (declare (uses rmtmod))
+;; (declare (uses mtconfigf))
+;; (declare (uses testsmod))
+;; (declare (uses mtargs))
+;; (declare (uses subrunmod))
+;; (declare (uses dbmod))
 
 (module launchmod
 	*
 	
 (import scheme chicken data-structures extras files)
@@ -34,18 +35,18 @@
 (import (prefix sqlite3 sqlite3:) posix typed-records
 	srfi-18 srfi-69 format ports srfi-1 matchable
 	z3 (prefix base64 base64:) regex
 	call-with-environment-variables csv)
 (import commonmod)
-(import rmtmod)
-(import (prefix mtconfigf configf:))
-(import testsmod)
-(import (prefix mtargs args:))
-(import subrunmod)
-(import dbmod)
-
-;; (use (prefix ulex ulex:))
-
-(include "common_records.scm")
-(include "db_records.scm")
-(include "run_records.scm")
+;; (import rmtmod)
+;; (import (prefix mtconfigf configf:))
+;; (import testsmod)
+;; (import (prefix mtargs args:))
+;; (import subrunmod)
+;; (import dbmod)
+;; 
+;; ;; (use (prefix ulex ulex:))
+;; 
+;; (include "common_records.scm")
+;; (include "db_records.scm")
+;; (include "run_records.scm")
 )

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -53,12 +53,12 @@
 (declare (uses ducttape-lib))
 (declare (uses mutils))
 (declare (uses pgdbmod))
 (declare (uses pkts))
 (declare (uses rmtmod))
-(declare (uses mtmod))
 (declare (uses subrunmod))
+(declare (uses mtmod))
 (declare (uses runsmod))
 (declare (uses tasksmod))
 (declare (uses testsmod))
 (declare (uses megamod))
 
@@ -73,12 +73,12 @@
 (import apimod)
 (import ducttape-lib)
 (import mutils)
 (import pkts)
 (import rmtmod)
-(import mtmod)
 (import testsmod)
+(import mtmod)
 (import subrunmod)
 (import runsmod)
 (import megamod)
 
 ;; NOTE: Order is important!