Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -29,13 +29,10 @@
    client.scm mt.scm \
    ezsteps.scm lock-queue.scm sdb.scm \
    rmt.scm api.scm subrun.scm \
    portlogger.scm archive.scm env.scm diff-report.scm cgisetup/models/pgdb.scm
 
-OPENSRC_DIR=../opensrc
-MTUTILS_DIR=$(OPENSRC_DIR)/mtutils
-
 # module source files
 MSRCFILES = ftail.scm mtconfigf.scm
 #  mtcommon.scm mtdb.scm
 
 # Eggs to install (straightforward ones)
@@ -47,17 +44,14 @@
 GUISRCF  = dashboard-context-menu.scm dashboard-tests.scm dashboard-guimonitor.scm gutils.scm dcommon.scm tree.scm vg.scm
 
 OFILES   = $(SRCFILES:%.scm=%.o)
 GOFILES  = $(GUISRCF:%.scm=%.o)
 
-MOFILES = $(addprefix mofiles/,$(MSRCFILES:%.scm=%.o))
+MOFILES = $(MSRCFILES:%.scm=%.o)
 
-mofiles/%.o : %.scm ../adat.scm
-	mkdir -p mofiles
-	rm -f $*.import.scm mofiles/$*.import.scm
-	csc $(CSCOPTS) -J -c $< -o mofiles/$*.o
-	ln -f $*.import.scm mofiles/$*.import.scm
+%.o : %.scm ../adat.scm
+	csc $(CSCOPTS) -J -c $< -o $*.o
 
 ADTLSCR=mt_laststep mt_runstep mt_ezstep
 HELPERS=$(addprefix $(PREFIX)/bin/,$(ADTLSCR))
 DEPLOYHELPERS=$(addprefix deploytarg/,$(ADTLSCR))
 MTESTHASH=$(shell fossil info|grep checkout:| awk '{print $$2}')
@@ -77,24 +71,27 @@
 PNGFILES = $(shell cd docs/manual;ls *png)
 
 #all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut ndboard
 all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut
 
-mtest: $(OFILES) readline-fix.scm megatest.o $(MOFILES) mofiles/ftail.o
+mtest: $(OFILES) readline-fix.scm megatest.o $(MOFILES)
 	csc $(CSCOPTS) $(OFILES) $(MOFILES) megatest.o -o mtest
 
 showmtesthash:
 	@echo $(MTESTHASH)
 
 dboard : $(OFILES) $(GOFILES) dashboard.scm $(MOFILES)
 	csc $(CSCOPTS) $(OFILES) dashboard.scm $(GOFILES) $(MOFILES) -o dboard
 
-ndboard : newdashboard.scm $(OFILES) $(GOFILES)
-	csc $(CSCOPTS) $(OFILES) $(GOFILES) newdashboard.scm -o ndboard
+mtut: $(OFILES) $(MOFILES) megatest-fossil-hash.scm mtut.scm
+	csc $(CSCOPTS) $(OFILES) $(MOFILES) mtut.scm -o mtut
 
-mtut: $(OFILES) megatest-fossil-hash.scm mtut.scm
-	csc $(CSCOPTS) $(OFILES) mtut.scm -o mtut
+# Needed only for adat.scm
+OPENSRC_DIR=../opensrc
+MTUTILS_DIR=$(OPENSRC_DIR)/mtutils
+../adat.scm :  $(MTUTILS_DIR)/adat.scm
+	ln -sf $(PWD)/$< $@
 
 # # stuff for handling external files from opensrc package
 # mtcommon.scm : $(MTUTILS_DIR)/mtcommon/mtcommon.scm
 # 	ln -sf $< $@
 # 
@@ -102,13 +99,10 @@
 # 	ln -sf $< $@
 # 
 # mtconfigf.scm : $(MTUTILS_DIR)/mtconfigf/mtconfigf.scm 
 # 	ln -sf $< $@
 # 
-../adat.scm :  $(MTUTILS_DIR)/adat.scm
-	ln -sf $(PWD)/$< $@
-
 TCMTOBJS = \
 	api.o \
 	archive.o \
 	cgisetup/models/pgdb.o \
 	client.o \
@@ -133,11 +127,11 @@
 	server.o \
 	tasks.o \
 	tdb.o \
 	tests.o \
 	subrun.o \
-
+	mtconfigf.o
 
 tcmt : $(TCMTOBJS) tcmt.scm
 	csc $(CSCOPTS) $(TCMTOBJS) tcmt.scm -o tcmt
 
 # install documentation to $(PREFIX)/docs
@@ -155,18 +149,18 @@
 
 $(PREFIX)/share/db/mt-pg.sql : mt-pg.sql
 	mkdir -p $(PREFIX)/share/db
 	$(INSTALL) mt-pg.sql $(PREFIX)/share/db/mt-pg.sql
 
-#multi-dboard : multi-dboard.scm $(OFILES) $(GOFILES)
-#	csc $(CSCOPTS) $(OFILES) $(GOFILES) multi-dboard.scm -o multi-dboard
-
-# 
-# $(PREFIX)/bin/revtagfsl : utils/revtagfsl.scm
-#	csc utils/revtagfsl.scm -o $(PREFIX)/bin/revtagfsl
-
+#
 # Special dependencies for the includes
+#
+
+# anything that depends on the special MOFILES needs to be listed on the left here
+launch.o : $(MOFILES)
+mtconfigf.o : $(MTUTILS_DIR)/mtconfigf/mtconfigf.scm
+
 tests.o db.o launch.o runs.o dashboard-tests.o dashboard-context-menu.o dashboard-guimonitor.o dashboard-main.o monitor.o dashboard.o  \
 archive.o megatest.o : db_records.scm
 tests.o runs.o dashboard.o dashboard-tests.o dashboard-context-menu.o dashboard-main.o  : run_records.scm
 db.o ezsteps.o keys.o launch.o megatest.o monitor.o runs-for-ref.o runs.o tests.o : key_records.scm
 tests.o tasks.o dashboard-tasks.o : task_records.scm

Index: cgisetup/models/pgdb.scm
==================================================================
--- cgisetup/models/pgdb.scm
+++ cgisetup/models/pgdb.scm
@@ -17,12 +17,12 @@
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;======================================================================
 
 (declare (unit pgdb))
-;; (declare (uses configf))
-(use (prefix mtconfigf configf:))
+(declare (uses mtconfigf))
+(import (prefix mtconfigf configf:))
 
 ;; I don't know how to mix compilation units and modules, so no module here.
 ;;
 ;; (module pgdb
 ;;     (

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -26,18 +26,20 @@
 (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:))
-(use (prefix mtconfigf configf:))
 
 (declare (uses common))
 (declare (uses margs))
 (declare (uses keys))
 (declare (uses items))
 (declare (uses db))
-;; (declare (uses configf))
+
+(declare (uses mtconfigf))
+(import (prefix mtconfigf configf:))
+
 (declare (uses process))
 (declare (uses launch))
 (declare (uses runs))
 (declare (uses dashboard-tests))
 (declare (uses dashboard-guimonitor))

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -72,11 +72,11 @@
 ;;   the comment can be set in the step record in launch.scm
 ;;
 (define (launch:load-logpro-dat run-id test-id stepname)
   (let ((cname (conc stepname ".dat")))
     (if (common:file-exists? cname)
-	(let* ((dat  (read-config cname #f #f))
+	(let* ((dat  (configf:read-config cname #f #f))
 	       (csvr (db:logpro-dat->csv dat stepname))
 	       (csvt (let-values (((fmt-cell fmt-record fmt-csv) (make-format ",")))
 		       (fmt-csv (map list->csv-record csvr))))
 	       (status (configf:lookup dat "final" "exit-status"))
 	       (msg     (configf:lookup dat "final" "message")))
@@ -646,11 +646,11 @@
 	  ;; NOTE: Current order is to process runconfigs *before* setting the MT_ vars. This 
 	  ;;       seems non-ideal but could well break stuff
 	  ;;    BUG? BUG? BUG?
 	  
 	  (let ((rconfig (full-runconfigs-read)) ;; (read-config (conc  *toppath* "/runconfigs.config") #f #t sections: (list "default" target))))
-		(wconfig (read-config "waivers.config" #f #t sections: `( "default" ,target )))) ;; read the waivers config if it exists
+		(wconfig (configf:read-config "waivers.config" #f #t sections: `( "default" ,target )))) ;; read the waivers config if it exists
 	    ;; (setup-env-defaults (conc *toppath* "/runconfigs.config") run-id (make-hash-table) keyvals target)
 	    ;; (set-run-config-vars run-id keyvals target) ;; (db:get-target db run-id))
 	    ;; Now have runconfigs data loaded, set environment vars
 	    (for-each
 	     (lambda (section)
@@ -960,19 +960,19 @@
 	 ;; we have all the info needed to fully process runconfigs and megatest.config
 	 ((and ;; (not force-reread) ;; force-reread is irrelevant in the AND, could however OR it?
 	       mtcachef
 	       rccachef) ;; BB- why are we doing this without asking if caching is desired?
           ;;(BB> "launch:setup-body -- cond branch 2")
-	  (let* ((first-pass    (find-and-read-config        ;; NB// sets MT_RUN_AREA_HOME as side effect
+	  (let* ((first-pass    (configf:find-and-read-config        ;; NB// sets MT_RUN_AREA_HOME as side effect
 				 mtconfig
 				 environ-patt: "env-override"
 				 given-toppath: toppath
 				 pathenvvar: "MT_RUN_AREA_HOME"))
 		 (first-rundat  (let ((toppath (if toppath 
 						   toppath
 						   (car first-pass))))
-				  (read-config ;; (conc toppath "/runconfigs.config") ;; this should be converted to runconfig:read but it is non-trivial, leaving it for now.
+				  (configf:read-config ;; (conc toppath "/runconfigs.config") ;; this should be converted to runconfig:read but it is non-trivial, leaving it for now.
 				   (conc (if (string? toppath)
 					     toppath
 					     (get-environment-variable "MT_RUN_AREA_HOME"))
 					 "/runconfigs.config")
 				   *runconfigdat* #t 
@@ -996,20 +996,20 @@
 			 (key-vals     (keys:target->keyval keys target))
 			 (linktree     (common:get-linktree)) ;; (or (getenv "MT_LINKTREE")(if *configdat* (configf:lookup *configdat* "setup" "linktree") #f)))
 					;     (if *configdat*
 					; 	   (configf:lookup *configdat* "setup" "linktree")
 					; 	   (conc *toppath* "/lt"))))
-			 (second-pass  (find-and-read-config
+			 (second-pass  (configf:find-and-read-config
 					mtconfig
 					environ-patt: "env-override"
 					given-toppath: toppath
 					pathenvvar: "MT_RUN_AREA_HOME"))
 			 (runconfigdat (begin     ;; this read of the runconfigs will see any adjustments made by re-reading megatest.config
 					 (for-each (lambda (kt)
 						     (setenv (car kt) (cadr kt)))
 						   key-vals)
-					 (read-config (conc toppath "/runconfigs.config") *runconfigdat* #t ;; consider using runconfig:read some day ...
+					 (configf:read-config (conc toppath "/runconfigs.config") *runconfigdat* #t ;; consider using runconfig:read some day ...
 						      sections: sections)))
                          (cachefiles   (launch:get-cache-file-paths areapath toppath target mtconfig))
                          (mtcachef     (car cachefiles))
                          (rccachef     (cdr cachefiles)))
                     ;;  trap exception due to stale NFS handle -- Error: (open-output-file) cannot open file - Stale NFS file handle: "/p/fdk/gwa/lefkowit/mtTesting/qa/primbeqa/links/p1222/11/PDK_r1.1.1/prim/clean/pcell_testgen/.runconfigs.cfg-1.6427-7d1e789cb3f62f9cde719a4865bb51b3c17ea853" - ticket 220546342
@@ -1034,19 +1034,19 @@
 
 	 ;; else read what you can and set the flag accordingly
 	 ;; here we don't have either mtconfig or rccachef
 	 (else
           ;;(BB> "launch:setup-body -- cond branch 3 - else")
-	  (let* ((cfgdat   (find-and-read-config 
+	  (let* ((cfgdat   (configf:find-and-read-config 
 			    (or (args:get-arg "-config") "megatest.config")
 			    environ-patt: "env-override"
 			    given-toppath: (get-environment-variable "MT_RUN_AREA_HOME")
 			    pathenvvar: "MT_RUN_AREA_HOME")))
 
             (if (and cfgdat (list? cfgdat) (> (length cfgdat) 0) (hash-table? (car cfgdat)))
 		(let* ((toppath  (or (get-environment-variable "MT_RUN_AREA_HOME")(cadr cfgdat)))
-		       (rdat     (read-config (conc toppath  ;; convert this to use runconfig:read!
+		       (rdat     (configf:read-config (conc toppath  ;; convert this to use runconfig:read!
 						    "/runconfigs.config") *runconfigdat* #t sections: sections)))
 		  (set! *configinfo*   cfgdat)
 		  (set! *configdat*    (car cfgdat))
 		  (set! *runconfigdat* rdat)
 		  (set! *toppath*      toppath)
@@ -1116,11 +1116,11 @@
 
 	;; if have -append-config then read and append here
 	(let ((cfname (args:get-arg "-append-config")))
 	  (if (and cfname
 		   (file-read-access? cfname))
-	      (read-config cfname *configdat* #t))) ;; values are added to the hash, no need to do anything special.
+	      (configf:read-config cfname *configdat* #t))) ;; values are added to the hash, no need to do anything special.
 	*toppath*)))
 
 (define (get-best-disk confdat testconfig)
   (let* ((disks   (or (and testconfig (hash-table-ref/default testconfig "disks" #f))
 		      (hash-table-ref/default confdat "disks" #f)))

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -53,10 +53,12 @@
 (declare (uses tasks)) ;; only used for debugging.
 (declare (uses env))
 (declare (uses diff-report))
 (declare (uses ftail))
 (import ftail)
+(declare (uses mtconfigf))
+(import (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")

Index: mtut.scm
==================================================================
--- mtut.scm
+++ mtut.scm
@@ -20,12 +20,13 @@
 ;; (include "megatest-version.scm")
 
 ;; fake out readline usage of toplevel-command
 (define (toplevel-command . a) #f)
 
-(use srfi-1 posix srfi-69 readline ;;  regex regex-case srfi-69 apropos json http-client directory-utils rpc typed-records;; (srfi 18) extras)
-   srfi-19  srfi-18 extras format pkts regex regex-case
+(use srfi-1 posix srfi-69 readline
+     srfi-19  srfi-18 extras format
+     pkts regex regex-case
      (prefix dbi dbi:)
      nanomsg)
 
 (declare (uses common))
 (declare (uses megatest-version))