Index: .fossil-settings/ignore-glob
==================================================================
--- .fossil-settings/ignore-glob
+++ .fossil-settings/ignore-glob
@@ -1,5 +1,6 @@
+tmpinstall
 tests/fullrun/logs/*
 tests/fullrun/lt
 tests/fullrun/megatest.db
 altdb.scm
 utils/build/*
@@ -46,5 +47,8 @@
 tests/fdktestqa/testqa/monitor.db
 megatest-fossil-hash.scm
 tests/release/runs/*
 tests/release/links/*
 tests/release/megatest.db
+tcmt
+mtut
+*.import.scm

Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -59,11 +59,11 @@
 DEPLOYHELPERS=$(addprefix deploytarg/,$(ADTLSCR))
 MTESTHASH=$(shell fossil info|grep checkout:| awk '{print $$2}')
 
 MT_EGGS_BASE=$(PREFIX)/eggs
 MT_EGGS_DIR=$(MT_EGGS_BASE)/lib/chicken/7
-MTEGGS=$(MT_EGGS_DIR)/mtconfigf.so
+MTEGGS=$(MT_EGGS_DIR)/mtconfigf.so $(MT_EGGS_DIR)/mtdebug.so
 CHICKEN_REPOSITORY=$(MT_EGGS_DIR)
 export CHICKEN_REPOSITORY
 #CSCOPTS=-Wl,-rpath,$(MT_EGGS_DIR)
 
 
@@ -176,12 +176,22 @@
 
 $(MT_EGGS_DIR)/types.db : $(MT_EGGS_DIR)
 	cp -rsf $(CKREPOSITORY)/ $(MT_EGGS_BASE)/lib/chicken/
 
 #	chicken-install -init $(MT_EGGS_DIR)
+csi:
+	csi
 
-$(MT_EGGS_DIR)/mtconfigf.so : $(MT_EGGS_DIR)/types.db $(MTUTILS_DIR)/mtconfigf/mtconfigf.scm
+$(MT_EGGS_DIR)/mtargs.so : $(MT_EGGS_DIR)/types.db $(MTUTILS_DIR)/mtargs/mtargs.scm
+	cd $(MTUTILS_DIR)/mtargs && chicken-install -prefix $(MT_EGGS_BASE)
+
+
+$(MT_EGGS_DIR)/mtdebug.so : $(MT_EGGS_DIR)/types.db $(MTUTILS_DIR)/mtdebug/mtdebug.scm $(MT_EGGS_DIR)/mtargs.so
+	cd $(MTUTILS_DIR)/mtdebug && chicken-install -prefix $(MT_EGGS_BASE)
+
+
+$(MT_EGGS_DIR)/mtconfigf.so : $(MT_EGGS_DIR)/types.db $(MTUTILS_DIR)/mtconfigf/mtconfigf.scm $(MT_EGGS_DIR)/mtdebug.so
 	cd $(MTUTILS_DIR)/mtconfigf && chicken-install -prefix $(MT_EGGS_BASE)
 
 #
 # Special dependencies for the includes
 #

Index: archive.scm
==================================================================
--- archive.scm
+++ archive.scm
@@ -21,11 +21,11 @@
 (use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 format md5 message-digest srfi-18)
 
 (declare (unit archive))
 (declare (uses db))
 (declare (uses common))
-(use (prefix mtconfigf configf:))
+;;;; (use (prefix mtconfigf configf:))
 (include "common_records.scm")
 (include "db_records.scm")
 
 ;;======================================================================
 ;; 

Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -66,11 +66,11 @@
       (repository-path libpath)))
 
 
 
 ;;(declare (uses mtconfigf))
-(use (prefix mtconfigf configf:))
+;; (use (prefix mtconfigf configf:))
 ;;(configf:add-eval-string "(use common)")
 
 
 
 (include "common_records.scm")
@@ -272,14 +272,10 @@
 
 ;; This is a cache of pre-reqs met, don't re-calc in cases where called with same params less than
 ;; five seconds ago
 (define *pre-reqs-met-cache* (make-hash-table))
 
-;; cache of verbosity given string
-;;
-(define *verbosity-cache*    (make-hash-table))
-
 (define (common:clear-caches)
   (set! *target*             (make-hash-table))
   (set! *keys*               (make-hash-table))
   (set! *keyvals*            (make-hash-table))
   (set! *toptest-paths*      (make-hash-table))

Index: common_records.scm
==================================================================
--- common_records.scm
+++ common_records.scm
@@ -19,10 +19,11 @@
 ;;======================================================================
 
 ;; (use trace)
 
 (include "altdb.scm")
+(include "modules.scm")
 
 ;; Some of these routines use:
 ;;
 ;;     http://www.cs.toronto.edu/~gfb/scheme/simple-macros.html
 ;;
@@ -76,76 +77,10 @@
   (mutex-lock! mtx)
   (let ((res (apply accessor record val)))
     (mutex-unlock! mtx)
     res))
 
-;; this was cached based on results from profiling but it turned out the profiling
-;; somehow went wrong - perhaps too many processes writing to it. Leaving the caching
-;; in for now but can probably take it out later.
-;;
-(define (debug:calc-verbosity vstr)
-  (or (hash-table-ref/default *verbosity-cache* vstr #f)
-      (let ((res (cond
-                  ((number? vstr) vstr)
-                  ((not (string?  vstr))   1)
-                  ;; ((string-match  "^\\s*$" vstr) 1)
-                  (vstr           (let ((debugvals  (filter number? (map string->number (string-split vstr ",")))))
-                                    (cond
-                                     ((> (length debugvals) 1) debugvals)
-                                     ((> (length debugvals) 0)(car debugvals))
-                                     (else 1))))
-                  ((args:get-arg "-v")   2)
-                  ((args:get-arg "-q")    0)
-                  (else                   1))))
-        (hash-table-set! *verbosity-cache* vstr res)
-        res)))
-
-;; check verbosity, #t is ok
-(define (debug:check-verbosity verbosity vstr)
-  (if (not (or (number? verbosity)
-	       (list?   verbosity)))
-      (begin
-	(print "ERROR: Invalid debug value \"" vstr "\"")
-	#f)
-      #t))
-
-(define (debug:debug-mode n)
-  (cond
-   ((and (number? *verbosity*)   ;; number number
-	 (number? n))
-    (<= n *verbosity*))
-   ((and (list? *verbosity*)     ;; list   number
-	 (number? n))
-    (member n *verbosity*))
-   ((and (list? *verbosity*)     ;; list   list
-	 (list? n))
-    (not (null? (lset-intersection! eq? *verbosity* n))))
-   ((and (number? *verbosity*)
-	 (list? n))
-    (member *verbosity* n))))
-
-(define (debug:setup)
-  (let ((debugstr (or (args:get-arg "-debug")
-		      (getenv "MT_DEBUG_MODE"))))
-    (set! *verbosity* (debug:calc-verbosity debugstr))
-    (debug:check-verbosity *verbosity* debugstr)
-    ;; if we were handed a bad verbosity rule then we will override it with 1 and continue
-    (if (not *verbosity*)(set! *verbosity* 1))
-    (if (or (args:get-arg "-debug")
-	    (not (getenv "MT_DEBUG_MODE")))
-	(setenv "MT_DEBUG_MODE" (if (list? *verbosity*)
-				    (string-intersperse (map conc *verbosity*) ",")
-				    (conc *verbosity*))))))
-  
-(define (debug:print n e . params)
-  (if (debug:debug-mode n)
-      (with-output-to-port (or e (current-error-port))
-	(lambda ()
-	  (if *logging*
-	      (db:log-event (apply conc params))
-	      (apply print params)
-	      )))))
 
 ;; Brandon's debug printer shortcut (indulge me :)
 (define *BB-process-starttime* (current-milliseconds))
 (define (BB> . in-args)
   (let* ((stack (get-call-chain))
@@ -212,40 +147,13 @@
        (printf "~a is: ~a\n" 'x (with-output-to-string (lambda () (BBpp x))))
      ;;  )
      ]
     [(_ x y ...) (begin (inspect x) (inspect y ...))]))
 
-(define (debug:print-error n e . params)
-  ;; normal print
-  (if (debug:debug-mode n)
-      (with-output-to-port (if (port? e) e (current-error-port))
-	(lambda ()
-	  (if *logging*
-	      (db:log-event (apply conc params))
-	      ;; (apply print "pid:" (current-process-id) " " params)
-	      (apply print "ERROR: " params)
-	      ))))
-  ;; pass important messages to stderr
-  (if (and (eq? n 0)(not (eq? e (current-error-port)))) 
-      (with-output-to-port (current-error-port)
-	(lambda ()
-	  (apply print "ERROR: " params)
-	  ))))
-
-(define (debug:print-info n e . params)
-  (if (debug:debug-mode n)
-      (with-output-to-port (if (port? e) e (current-error-port))
-	(lambda ()
-	  (if *logging*
-	      (let ((res (format#format #f "INFO: (~a) ~a" n (apply conc params))))
-		(db:log-event res))
-	      ;; (apply print "pid:" (current-process-id) " " "INFO: (" n ") " params) ;; res)
-	      (apply print "INFO: (" n ") " params) ;; res)
-	      )))))
 
 
 
 ;; if a value is printable (i.e. string or number) return the value
 ;; else return an empty string
 (define-inline (printable val)
   (if (or (number? val)(string? val)) val ""))
 

Index: dashboard-context-menu.scm
==================================================================
--- dashboard-context-menu.scm
+++ dashboard-context-menu.scm
@@ -24,11 +24,11 @@
 ;;======================================================================
 
 (use format fmt)
 (require-library iup)
 (import (prefix iup iup:))
-(use (prefix mtconfigf configf:))
+;; (use (prefix mtconfigf configf:))
 (use canvas-draw)
 
 (use srfi-1 posix regex regex-case srfi-69)
 (use (prefix sqlite3 sqlite3:))
 

Index: dashboard-tests.scm
==================================================================
--- dashboard-tests.scm
+++ dashboard-tests.scm
@@ -23,11 +23,11 @@
 ;;======================================================================
 
 (use format fmt)
 (require-library iup)
 (import (prefix iup iup:))
-(use (prefix mtconfigf configf:))
+;; (use (prefix mtconfigf configf:))
 (use canvas-draw)
 
 (use srfi-1 posix regex regex-case srfi-69)
 (use (prefix sqlite3 sqlite3:))
 

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -20,25 +20,24 @@
 
 (use format)
 
 (require-library iup)
 (import (prefix iup iup:))
-(use (prefix mtconfigf configf:))
+;; (use (prefix mtconfigf configf:))
 (use canvas-draw)
 (import canvas-draw-iup)
 (use ducttape-lib)
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 typed-records sparse-vectors) ;; defstruct
 (import (prefix sqlite3 sqlite3:))
 
 (declare (uses common))
-(declare (uses margs))
 (declare (uses keys))
 (declare (uses items))
 (declare (uses db))
 
 ;;(declare (uses mtconfigf))
-(use (prefix mtconfigf configf:))
+
 
 (declare (uses process))
 (declare (uses launch))
 (declare (uses runs))
 (declare (uses dashboard-tests))

Index: datashare.scm
==================================================================
--- datashare.scm
+++ datashare.scm
@@ -30,20 +30,20 @@
 
 (require-library iup)
 (import (prefix iup iup:))
 (require-library ini-file)
 (import (prefix ini-file ini:))
-(use (prefix mtconfigf configf:))
+;; (use (prefix mtconfigf configf:))
 (use canvas-draw)
 (import canvas-draw-iup)
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69)
 (import (prefix sqlite3 sqlite3:))
-
-(declare (uses configf))
+(include "modules.scm")
+;;(declare (uses configf))
 (declare (uses tree))
-(declare (uses margs))
+;;(declare (uses margs))
 ;; (declare (uses dcommon))
 ;; (declare (uses launch))
 ;; (declare (uses gutils))
 ;; (declare (uses db))
 ;; (declare (uses synchash))

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -33,11 +33,11 @@
 (declare (uses common))
 (declare (uses keys))
 (declare (uses ods))
 (declare (uses client))
 (declare (uses mt))
-(use (prefix mtconfigf configf:))
+;; (use (prefix mtconfigf configf:))
 (include "common_records.scm")
 (include "db_records.scm")
 (include "key_records.scm")
 (include "run_records.scm")
 

Index: dcommon.scm
==================================================================
--- dcommon.scm
+++ dcommon.scm
@@ -29,11 +29,11 @@
 
 (declare (uses megatest-version))
 (declare (uses gutils))
 (declare (uses db))
 ;; (declare (uses synchash))
-(use (prefix mtconfigf configf:))
+;; (use (prefix mtconfigf configf:))
 (include "common_records.scm")
 (include "db_records.scm")
 (include "key_records.scm")
 (include "run_records.scm")
 

Index: ezsteps.scm
==================================================================
--- ezsteps.scm
+++ ezsteps.scm
@@ -26,11 +26,11 @@
 (declare (uses common))
 (declare (uses items))
 (declare (uses runconfig))
 ;; (declare (uses sdb))
 ;; (declare (uses filedb))
-(use (prefix mtconfigf configf:))
+;; (use (prefix mtconfigf configf:))
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 

Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -26,11 +26,11 @@
 ;; Configurations for server
 (tcp-buffer-size 2048)
 (max-connections 2048) 
 
 (declare (unit http-transport))
-(use (prefix mtconfigf configf:))
+;; (use (prefix mtconfigf configf:))
 (declare (uses common))
 (declare (uses db))
 (declare (uses tests))
 (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
 (declare (uses server))

Index: items.scm
==================================================================
--- items.scm
+++ items.scm
@@ -21,11 +21,11 @@
 ;; 		     (temperature "cool medium hot")
 ;; 		     (season      "summer winter fall spring")))
 
 (declare (unit items))
 (declare (uses common))
-(use (prefix mtconfigf configf:))
+;; (use (prefix mtconfigf configf:))
 (include "common_records.scm")
 
 ;; Puts out all combinations
 (define (process-itemlist hierdepth curritemkey itemlist)
   (let ((res '()))

Index: keys.scm
==================================================================
--- keys.scm
+++ keys.scm
@@ -24,11 +24,11 @@
 (use sqlite3 srfi-1 posix regex regex-case srfi-69)
 (import (prefix sqlite3 sqlite3:))
 
 (declare (unit keys))
 (declare (uses common))
-(use (prefix mtconfigf configf:))
+;; (use (prefix mtconfigf configf:))
 (include "key_records.scm")
 (include "common_records.scm")
 
 (define (keys->keystr keys) ;; => key1,key2,key3,additiona1, ...
   (string-intersperse keys ","))

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -21,11 +21,11 @@
 ;;
 ;;======================================================================
 
 (use regex regex-case base64 sqlite3 srfi-18 directory-utils posix-extras z3 call-with-environment-variables csv)
 (use typed-records pathname-expand matchable)
-;; (use (prefix mtconfigf configf:))
+;;;; (use (prefix mtconfigf configf:))
 
 (import (prefix base64 base64:))
 (import (prefix sqlite3 sqlite3:))
 
 (declare (unit launch))
@@ -33,11 +33,11 @@
 (declare (uses common))
 ;; (declare (uses configf))
 (declare (uses db))
 
 ;;(declare (uses mtconfigf))
-(use (prefix mtconfigf configf:))
+;; (use (prefix mtconfigf configf:))
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -34,11 +34,10 @@
 
 ;; (use zmq)
 
 (declare (uses common))
 (declare (uses megatest-version))
-(declare (uses margs))
 (declare (uses runs))
 (declare (uses launch))
 (declare (uses server))
 (declare (uses client))
 (declare (uses tests))
@@ -54,11 +53,11 @@
 (declare (uses env))
 (declare (uses diff-report))
 (declare (uses ftail))
 (import ftail)
 ;;(declare (uses mtconfigf))
-(use (prefix mtconfigf configf:))
+
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
 
 (include "common_records.scm")
 (include "key_records.scm")
@@ -596,11 +595,12 @@
 ;; Misc setup stuff
 ;;======================================================================
 
 (debug:setup)
 
-(if (args:get-arg "-logging")(set! *logging* #t))
+(if (args:get-arg "-logging")
+    (debug:add-logging-callback db:log-event))
 
 (if (debug:debug-mode 3) ;; we are obviously debugging
     (set! open-run-close open-run-close-no-exception-handling))
 
 (if (args:get-arg "-itempatt")

ADDED   modules.scm
Index: modules.scm
==================================================================
--- /dev/null
+++ modules.scm
@@ -0,0 +1,24 @@
+;;======================================================================
+;; Copyright 2006-2018, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+;;======================================================================
+
+(use (prefix mtargs    args:))
+(use (prefix mtdebug   debug:))
+(use (prefix mtconfigf configf:))
+(define debug:print debug:dprint)
+(define args:any? args:any-defined?)

Index: mt.scm
==================================================================
--- mt.scm
+++ mt.scm
@@ -28,11 +28,11 @@
 (declare (uses tests))
 (declare (uses server))
 (declare (uses runs))
 (declare (uses rmt))
 ;; (declare (uses filedb))
-(use (prefix mtconfigf configf:))
+;; (use (prefix mtconfigf configf:))
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "test_records.scm")

Index: mtut.scm
==================================================================
--- mtut.scm
+++ mtut.scm
@@ -28,16 +28,16 @@
      (prefix dbi dbi:)
      nanomsg)
 
 (declare (uses common))
 (declare (uses megatest-version))
-(declare (uses margs))
+;;(declare (uses margs))
 ;; (declare (uses rmt))
 
 ;; mtconfigf is compiled in as a compilation unit
 ;;(declare (uses mtconfigf))
-(use (prefix mtconfigf configf:))
+;; (use (prefix mtconfigf configf:))
 
 (use ducttape-lib)
 
 (include "megatest-fossil-hash.scm")
 

Index: newdashboard.scm
==================================================================
--- newdashboard.scm
+++ newdashboard.scm
@@ -28,12 +28,12 @@
 (use sql-de-lite srfi-1 posix regex regex-case srfi-69 typed-records sparse-vectors ;; defstruct
      (prefix dbi dbi:))
 
 (declare (uses common))
 (declare (uses megatest-version))
-(declare (uses margs))
-(use (prefix mtconfigf configf:))
+;;(declare (uses margs))
+;; (use (prefix mtconfigf configf:))
 ;; (declare (uses launch))
 ;; (declare (uses gutils))
 ;; (declare (uses db))
 ;; (declare (uses server))
 ;; (declare (uses synchash))

Index: portlogger.scm
==================================================================
--- portlogger.scm
+++ portlogger.scm
@@ -22,11 +22,11 @@
 (use sqlite3 srfi-1 posix srfi-69 hostinfo dot-locking z3)
 (import (prefix sqlite3 sqlite3:))
 
 (declare (unit portlogger))
 (declare (uses db))
-(use (prefix mtconfigf configf:))
+;; (use (prefix mtconfigf configf:))
 ;; lsof -i
 
 
 (define (portlogger:open-db fname)
   (let* ((avail    (tasks:wait-on-journal fname 5 remove: #t)) ;; wait up to about 10 seconds for the journal to go away

Index: rpc-transport.scm
==================================================================
--- rpc-transport.scm
+++ rpc-transport.scm
@@ -27,11 +27,11 @@
 
 (declare (uses common))
 (declare (uses db))
 (declare (uses tests))
 (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
-(use (prefix mtconfigf configf:))
+;; (use (prefix mtconfigf configf:))
 (include "common_records.scm")
 (include "db_records.scm")
 
 ;; procstr is the name of the procedure to be called as a string
 (define (rpc-transport:autoremote procstr params)

Index: runconfig.scm
==================================================================
--- runconfig.scm
+++ runconfig.scm
@@ -22,11 +22,11 @@
 
 (use format directory-utils)
 
 (declare (unit runconfig))
 (declare (uses common))
-(use (prefix mtconfigf configf:))
+;; (use (prefix mtconfigf configf:))
 (include "common_records.scm")
 
 (define (runconfig:read fname target environ-patt)
   (let ((ht (make-hash-table)))
     (if target (hash-table-set! ht target '()))

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -29,11 +29,11 @@
 (declare (uses tests))
 (declare (uses server))
 (declare (uses mt))
 (declare (uses archive))
 ;; (declare (uses filedb))
-(use (prefix mtconfigf configf:))
+;; (use (prefix mtconfigf configf:))
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "test_records.scm")

Index: sauthorize.scm
==================================================================
--- sauthorize.scm
+++ sauthorize.scm
@@ -25,11 +25,12 @@
 (use refdb)
 
 (use sql-de-lite srfi-1 posix regex regex-case srfi-69)
 ;(declare (uses common))
 ;(declare (uses configf))
-(declare (uses margs))
+(require "modules.scm")
+;;(declare (uses margs))
 (declare (uses megatest-version))
 
 (include "megatest-fossil-hash.scm")
 ;;; please create this file before using sautherise. For sample file is avaliable sample-sauth-paths.scm. 
 (include "sauth-paths.scm")

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -32,11 +32,11 @@
 ;; (declare (uses synchash))
 (declare (uses http-transport))
 ;;(declare (uses rpc-transport))
 (declare (uses launch))
 ;; (declare (uses daemon))
-(use (prefix mtconfigf configf:))
+;; (use (prefix mtconfigf configf:))
 (include "common_records.scm")
 (include "db_records.scm")
 
 (define (server:make-server-url hostport)
   (if (not hostport)

Index: sharedat.scm
==================================================================
--- sharedat.scm
+++ sharedat.scm
@@ -28,20 +28,21 @@
 ;; (use posix)
 ;; (use json)
 ;; (use csv)
 (use srfi-18)
 (use format)
-(use (prefix mtconfigf configf:))
+(require "modules.scm")
+;;;; (use (prefix mtconfigf configf:))
 (require-library ini-file)
 (import (prefix ini-file ini:))
 
 (use sql-de-lite srfi-1 posix regex regex-case srfi-69)
 ;; (import (prefix sqlite3 sqlite3:))
 ;; 
-(declare (uses configf))
+;; (declare (uses configf))
 ;; (declare (uses tree))
-(declare (uses margs))
+;; (declare (uses margs))
 ;; (declare (uses dcommon))
 ;; (declare (uses launch))
 ;; (declare (uses gutils))
 ;; (declare (uses db))
 ;; (declare (uses synchash))

Index: spublish.scm
==================================================================
--- spublish.scm
+++ spublish.scm
@@ -21,15 +21,15 @@
 (use refdb)
 (use srfi-18)
 (use srfi-19)
 (use format)
 (use sql-de-lite srfi-1 posix regex regex-case srfi-69)
-(use (prefix mtconfigf configf:))
+;;;; (use (prefix mtconfigf configf:))
 ;(declare (uses configf))
 ;; (declare (uses tree))
-(declare (uses margs))
-
+;;(declare (uses margs))
+(require "modules.scm")
 (declare (uses megatest-version))
 ;; (declare (uses tbd))
 
 (include "megatest-fossil-hash.scm")
 ;;; please create this file before using sautherise. For sample file is avaliable sample-sauth-paths.scm. 

Index: sretrieve.scm
==================================================================
--- sretrieve.scm
+++ sretrieve.scm
@@ -23,14 +23,14 @@
 (use srfi-19)
 (use refdb)
 (use sql-de-lite srfi-1 posix regex regex-case srfi-69)
 ;(declare (uses common))
 ;(declare (uses configf))
-(declare (uses margs))
+;;(declare (uses margs))
 (declare (uses megatest-version))
-(use (prefix mtconfigf configf:)) 
-
+;;;; (use (prefix mtconfigf configf:)) 
+(include "modules.scm")
 (include "megatest-fossil-hash.scm")
 ;;; please create this file before using sautherise. For sample file is avaliable sample-sauth-paths.scm. 
 (include "sauth-paths.scm")
 (include "sauth-common.scm")
 

Index: subrun.scm
==================================================================
--- subrun.scm
+++ subrun.scm
@@ -23,11 +23,11 @@
      call-with-environment-variables)
 (declare (unit subrun))
 ;;(declare (uses runs))
 (declare (uses db))
 (declare (uses common))
-(use (prefix mtconfigf configf:))
+;; (use (prefix mtconfigf configf:))
 ;;(declare (uses items))
 ;;(declare (uses runconfig))
 ;;(declare (uses tests))
 ;;(declare (uses server))
 (declare (uses mt))

Index: tasks.scm
==================================================================
--- tasks.scm
+++ tasks.scm
@@ -18,11 +18,11 @@
 
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking format)
 (import (prefix sqlite3 sqlite3:))
-(use (prefix mtconfigf configf:))
+;; (use (prefix mtconfigf configf:))
 (declare (unit tasks))
 (declare (uses db))
 (declare (uses rmt))
 (declare (uses common))
 (declare (uses pgdb))

Index: tcmt.scm
==================================================================
--- tcmt.scm
+++ tcmt.scm
@@ -25,12 +25,11 @@
 
 (use srfi-1 posix srfi-69 srfi-18 regex defstruct)
 
 (use trace)
 ;; (trace-call-sites #t)
-
-(declare (uses margs))
+;;(declare (uses margs))
 (declare (uses rmt))
 (declare (uses common))
 (declare (uses megatest-version))
 
 (include "megatest-fossil-hash.scm")

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -23,11 +23,11 @@
 ;;======================================================================
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking tcp directory-utils)
 (import (prefix sqlite3 sqlite3:))
 (require-library stml)
-(use (prefix mtconfigf configf:))
+;; (use (prefix mtconfigf configf:))
 (declare (unit tests))
 (declare (uses lock-queue))
 (declare (uses db))
 (declare (uses tdb))
 (declare (uses common))

Index: tree.scm
==================================================================
--- tree.scm
+++ tree.scm
@@ -25,11 +25,10 @@
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69)
 (import (prefix sqlite3 sqlite3:))
 
 (declare (unit tree))
-(declare (uses margs))
 (declare (uses launch))
 (declare (uses megatest-version))
 (declare (uses gutils))
 (declare (uses db))
 (declare (uses server))