Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -41,11 +41,11 @@
 # module source files
 MSRCFILES = dbfile.scm debugprint.scm mtargs.scm commonmod.scm dbmod.scm \
             tcp-transportmod.scm rmtmod.scm portlogger.scm apimod.scm \
 	    configfmod.scm processmod.scm servermod.scm megatestmod.scm \
 	    stml2.scm fsmod.scm cpumod.scm mtmod.scm odsmod.scm tasksmod.scm \
-            pkts.scm testsmod.scm pgdb.scm
+            pkts.scm testsmod.scm pgdb.scm cookie.scm
 
 transport-mode.scm : transport-mode.scm.template
 	cp transport-mode.scm.template transport-mode.scm
 
 dashboard-transport-mode.scm : dashboard-transport-mode.scm.template
@@ -77,10 +77,11 @@
 mofiles/rmtmod.o mofiles/dbmod.o : mofiles/dbfile.o mofiles/commonmod.o mofiles/debugprint.o
 db.o : mofiles/dbmod.o mofiles/dbfile.o
 mofiles/debugprint.o : mofiles/mtargs.o
 mofiles/tcp-transportmod.o : mofiles/portlogger.o
 mofiles/tasksmod.o : mofiles/rmtmod.o mofiles/pgdb.o
+mofiles/fsmod.o : mofiles/debugprint.o
 
 # ftail.scm rmtmod.scm commonmod.scm removed
 # MSRCFILES = ducttape-lib.scm pkts.scm stml2.scm cookie.scm mutils.scm	\
 #             mtargs.scm commonmod.scm dbmod.scm adjutant.scm ulex.scm	\
 #             rmtmod.scm apimod.scm

Index: commonmod.scm
==================================================================
--- commonmod.scm
+++ commonmod.scm
@@ -21,11 +21,37 @@
 (declare (unit commonmod))
 (declare (uses debugprint))
 (declare (uses mtargs))
 (declare (uses stml2))
 
-(use srfi-69)
+(use srfi-69
+     srfi-18
+     srfi-1
+     srfi-13
+     (prefix base64 base64:)
+     (prefix sqlite3 sqlite3:)
+     data-structures
+     extras
+     files
+     matchable
+     md5
+     message-digest
+     pathname-expand
+     posix
+     posix-extras
+     regex
+     regex-case
+     sparse-vectors
+     srfi-1
+     srfi-13
+     srfi-18
+     srfi-69
+     typed-records
+     z3)
+
+(import stml2
+	)
 
 (module commonmod
 	*
 
 (import scheme)

Index: configf.scm
==================================================================
--- configf.scm
+++ configf.scm
@@ -39,16 +39,20 @@
 (declare (uses configfmod.import))
 (declare (uses dbfile))
 (declare (uses dbfile.import))
 (declare (uses dbmod))
 (declare (uses dbmod.import))
+(declare (uses mtmod))
+(declare (uses mtmod.import))
 
 (import commonmod
 	configfmod
 	processmod
 	(prefix mtargs args:)
-	debugprint)
+	debugprint
+	mtmod
+	)
 
 (include "common_records.scm")
 
 (define configf:imports "(import commonmod configfmod processmod (prefix mtargs args:))")
 

Index: js-path.scm
==================================================================
--- js-path.scm
+++ js-path.scm
@@ -13,6 +13,7 @@
 ;;     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/>.
 ;;
+
 (define *java-script-lib* (conc  (common:get-install-area) "/share/js/jquery-3.1.0.slim.min.js")) 

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -33,10 +33,12 @@
 (declare (uses rmtmod))
 (declare (uses ezsteps))
 ;; (declare (uses dbmod))
 (declare (uses dbfile))
 (declare (uses mtargs))
+(declare (uses mtmod))
+(declare (uses megatestmod))
 
 (use regex regex-case base64 sqlite3 srfi-18 directory-utils posix posix-extras z3
      call-with-environment-variables csv hostinfo 
      typed-records pathname-expand matchable)
 
@@ -54,11 +56,14 @@
 	processmod
 	configfmod
 	rmtmod
 	debugprint
 	;; dbmod
-	dbfile)
+	dbfile
+	mtmod
+	megatestmod
+	)
 
 ;;======================================================================
 ;; ezsteps
 ;;======================================================================
 

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -27,26 +27,24 @@
 ;; (declare (uses margs))
 (declare (uses mtargs))
 (declare (uses mtargs.import))
 (declare (uses debugprint))
 (declare (uses debugprint.import))
+(declare (uses cookie))
+(declare (uses cookie.import))
+(declare (uses stml2))
+(declare (uses stml2.import))
 (declare (uses commonmod))
 (declare (uses commonmod.import))
 (declare (uses processmod))
 (declare (uses processmod.import))
 (declare (uses configfmod))
 (declare (uses configfmod.import))
-
-(declare (uses runs))
-(declare (uses launch))
-(declare (uses server))
-(declare (uses tests))
-(declare (uses genexample))
-;; (declare (uses daemon))
-
-(declare (uses db))
-;; (declare (uses dcommon))
+(declare (uses mtmod))
+(declare (uses mtmod.import))
+(declare (uses servermod))
+(declare (uses servermod.import))
 
 (declare (uses tdb))
 (declare (uses mt))
 (declare (uses api))
 (declare (uses tasks)) ;; only used for debugging.
@@ -59,22 +57,30 @@
 (declare (uses dbmod.import))
 (declare (uses portlogger))
 (declare (uses portlogger.import))
 (declare (uses tcp-transportmod))
 (declare (uses tcp-transportmod.import))
+(declare (uses megatestmod))
+(declare (uses megatestmod.import))
 (declare (uses apimod))
 (declare (uses apimod.import))
 (declare (uses rmtmod))
 (declare (uses rmtmod.import))
 (declare (uses fsmod))
 (declare (uses fsmod.import))
 (declare (uses cpumod))
 (declare (uses cpumod.import))
-(declare (uses mtmod))
-(declare (uses mtmod.import))
-(declare (uses megatestmod))
-(declare (uses megatestmod.import))
+
+(declare (uses runs))
+(declare (uses launch))
+(declare (uses server))
+(declare (uses tests))
+(declare (uses genexample))
+;; (declare (uses daemon))
+
+(declare (uses db))
+;; (declare (uses dcommon))
 
 ;; (declare (uses debugprint))
 ;; (declare (uses debugprint.import))
 
 ;; (declare (uses ftail))
@@ -89,10 +95,14 @@
 	dbfile
 	portlogger
 	tcp-transportmod
 	rmtmod
 	apimod
+	stml2
+	mtmod
+	megatestmod
+	servermod
         )
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
 
 (include "common_records.scm")
@@ -108,10 +118,13 @@
 ;; Added for csv stuff - will be removed
 ;;
 (use sparse-vectors)
 
 (require-library mutils)
+
+;; remove when configf fully modularized
+(read-config-set! configf:read-file)
 
 (define *usage-log-file* #f)    ;; put path to file for logging usage in this var in the ~/.megatestrc file
 (define *usage-use-seconds* #t) ;; for Epoc seconds in usage logging change this to #t in ~/.megatestrc file
 
 ;; set some parameters here - these need to be put in something that can be loaded from other

Index: mt.scm
==================================================================
--- mt.scm
+++ mt.scm
@@ -42,11 +42,11 @@
 	configfmod
 	rmtmod
 	megatestmod)
 
 ;; make mt: calls in megatestmod work
-(read-config-set! read-config)
+;; (read-config-set! read-config)
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -33,18 +33,21 @@
 (declare (uses items))
 (declare (uses runconfig))
 (declare (uses server))
 (declare (uses mtargs))
 (declare (uses rmtmod))
+(declare (uses megatestmod))
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking directory-utils)
 (import (prefix sqlite3 sqlite3:))
 (import commonmod
 	configfmod
 	(prefix mtargs args:)
 	debugprint
-	rmtmod)
+	rmtmod
+	megatestmod
+	)
 (require-library stml)
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")