Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -19,19 +19,10 @@
 # rm <files>.o ; make install CSCOPTS='-profile' ; ... ;  chicken-profile | less
 SHELL=/bin/bash
 PREFIX=$(PWD)
 CSCOPTS=
 INSTALL=install
-DELFILES = common.scm items.scm launch.scm \
-  ods.scm runconfig.scm server.scm configf.scm \
-  db.scm keys.scm margs.scm megatest-version.scm \
-  process.scm runs.scm tasks.scm tests.scm genexample.scm \
-  http-transport.scm filedb.scm tdb.scm \
-  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 
 
 SRCFILES=
 
 # removed from MSRCFILES: ftail.scm
 # module source files
@@ -524,9 +515,5 @@
 
 
 unit :
 	cd tests;make unit
 
-delfiles :
-	mv $(DELFILES) attic
-	fossil mv $(DELFILES) attic
-

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -55,10 +55,12 @@
 
 (declare (uses commonmod))
 (import commonmod)
 (declare (uses rmtmod))
 (import rmtmod)
+(declare (uses runsmod))
+(import runsmod)
 (declare (uses dbmod))
 (import dbmod)
 
 (declare (uses dcommonmod))
 (import dcommonmod)
@@ -71,10 +73,11 @@
 (include "vg_records.scm")
 
 ;; invoke the imports
 (declare (uses commonmod.import))
 (declare (uses rmtmod.import))
+(declare (uses runsmod.import))
 (declare (uses megamod.import))
 (declare (uses dcommonmod.import))
 
 (configf:set-debug-printers debug:print debug:print-info debug:print-error *default-log-port*)
 (configf:add-eval-string "(import megamod)(import commonmod)")

Index: megamod.scm
==================================================================
--- megamod.scm
+++ megamod.scm
@@ -17,18 +17,15 @@
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;======================================================================
 
 (declare (unit megamod))
-;; (declare (uses commonmod))
+(declare (uses commonmod))
 ;; (declare (uses dbmod))
 ;; ;;(declare (uses apimod))
 ;; (declare (uses ftail))
 ;; ;; (declare (uses rmtmod))
-
-(declare (uses commonmod))
-
 ;; (declare (uses apimod))
 ;; (declare (uses archivemod))
 ;; (declare (uses clientmod))
 ;; (declare (uses dbmod))
 ;; (declare (uses dcommonmod))
@@ -38,11 +35,11 @@
 ;; (declare (uses keysmod))
 ;; (declare (uses launchmod))
 ;; (declare (uses odsmod))
 ;; (declare (uses processmod))
 ;; (declare (uses runconfigmod))
-;; (declare (uses runsmod))
+(declare (uses runsmod))
 ;; (declare (uses servermod))
 ;; (declare (uses subrunmod))
 ;; (declare (uses tasksmod))
 ;; (declare (uses testsmod))
 ;; (declare (uses vgmod))
@@ -121,11 +118,11 @@
 ;; (import launchmod)
 ;; (import odsmod)
 ;; (import processmod)
 (import rmtmod)
 ;; (import runconfigmod)
-;; (import runsmod)
+(import runsmod)
 ;; (import servermod)
 ;; (import subrunmod)
 ;; (import tasksmod)
 ;; (import testsmod)
 ;; (import vgmod)
@@ -142,13 +139,10 @@
 
 ;;======================================================================
 ;; L O C K I N G   M E C H A N I S M S 
 ;;======================================================================
 
-;; (include "megatest-fossil-hash.scm") ;; try getting this from commonmod
-;; (include "megatest-version.scm")
-
 ;; globals
 (define *writes-total-delay* 0)
 (define *exit-started* #f)
 (define *last-monitor-update-time* 0)
 (define *default-log-port* (current-error-port))

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -52,16 +52,19 @@
 (import commonmod)
 (declare (uses rmtmod))
 (import rmtmod)
 (declare (uses dbmod))
 (import dbmod)
+(declare (uses runsmod))
+(import runsmod)
 (declare (uses megamod))
 (import megamod)
 
 ;; invoke the imports
 (declare (uses commonmod.import))
 (declare (uses rmtmod.import))
+(declare (uses runsmod.import))
 (declare (uses megamod.import))
 
 (configf:set-debug-printers debug:print debug:print-info debug:print-error *default-log-port*)
 
 ;; (declare (uses tdb))

Index: runs-inc.scm
==================================================================
--- runs-inc.scm
+++ runs-inc.scm
@@ -17,24 +17,10 @@
 
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
 ;; use this struct to facilitate refactoring
 ;;
-
-(defstruct runs:dat
-  reglen regfull
-  runname max-concurrent-jobs run-id
-  test-patts required-tests test-registry
-  registry-mutex flags keyvals run-info all-tests-registry
-  can-run-more-tests
-  ((can-run-more-tests-count 0) : fixnum))
-
-(defstruct runs:testdat
-  hed tal reg reruns  test-record
-  test-name item-path jobgroup
-  waitons testmode  newtal itemmaps prereqs-not-met)
-
 
 (define (runs:get-mt-env-alist run-id runname target testname itempath)
   ;;(bb-check-path msg: "runs:set-megatest-env-vars entry")
   `(("MT_TEST_NAME"     . ,testname)
     

Index: runsmod.scm
==================================================================
--- runsmod.scm
+++ runsmod.scm
@@ -27,9 +27,20 @@
 (import scheme chicken data-structures extras)
 (import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 format ports srfi-1 matchable)
 (import commonmod)
 ;; (use (prefix ulex ulex:))
 
-(include "common_records.scm")
+;; (include "common_records.scm")
+(defstruct runs:dat
+  reglen regfull
+  runname max-concurrent-jobs run-id
+  test-patts required-tests test-registry
+  registry-mutex flags keyvals run-info all-tests-registry
+  can-run-more-tests
+  ((can-run-more-tests-count 0) : fixnum))
 
+(defstruct runs:testdat
+  hed tal reg reruns  test-record
+  test-name item-path jobgroup
+  waitons testmode  newtal itemmaps prereqs-not-met)
 
 )