@@ -1,6 +1,6 @@
-; Copyright 2006-2017, Matthew Welland.
+;; Copyright 2006-2017, 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
@@ -23,23 +23,30 @@
 (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
      (prefix dbi dbi:)
-     nanomsg)
+     nanomsg (prefix mtconfigf configf:))
 
-(declare (uses common))
-(declare (uses megatest-version))
-(declare (uses margs))
-(declare (uses configf))
+;; (declare (uses common))
+;; (declare (uses megatest-version))
+;; (declare (uses margs))
+;; (declare (uses configfmod))
+(declare (uses commonmod))
+(declare (uses megamod))
+(import commonmod)
+;; (import configfmod)
+(import megamod)
+
 ;; (declare (uses rmt))
 
 (use ducttape-lib)
 
 (include "megatest-fossil-hash.scm")
 
-(require-library stml)
+;; (require-library stml)
+(use stml2)
 
 ;; stuff for the mapper and checker functions
 ;;
 (define *target-mappers*  (make-hash-table)) 
 (define *runname-mappers* (make-hash-table))