@@ -29,56 +29,67 @@
 ;; Added for csv stuff - will be removed
 ;;
 (use sparse-vectors)
 
 (declare (uses mtargs))
-(import (prefix mtargs args:))
 (declare (uses mtconfigf))
+
+(import (prefix mtargs args:))
 (import (prefix mtconfigf configf:))
-(declare (uses ducttape-lib))
-(import ducttape-lib)
-(declare (uses pkts))
-(import pkts)
-(declare (uses ulex))
-(import ulex)
+
+(declare (uses apimod))
+(declare (uses commonmod))
 (declare (uses cookie))
-(import cookie)
-(declare (uses stml2))
-(import stml2)
+(declare (uses dbmod))
+(declare (uses ducttape-lib))
+(declare (uses megamod))
 (declare (uses mutils))
+(declare (uses pgdbmod))
+(declare (uses pkts))
+(declare (uses rmtmod))
+(declare (uses runsmod))
+(declare (uses stml2))
+(declare (uses tasksmod))
+(declare (uses testsmod))
+(declare (uses ulex))
+
+(import apimod)
+(import commonmod)
+(import cookie)
+(import dbmod)
+(import ducttape-lib)
+(import megamod)
 (import mutils)
+(import pgdbmod)
+(import pkts)
+(import rmtmod)
+(import runsmod)
+(import stml2)
+(import testsmod)
+(import ulex)
+
+;; invoke the imports
+(declare (uses apimod.import))
+(declare (uses commonmod.import))
+(declare (uses cookie.import))
+(declare (uses dbmod))
+(declare (uses ducttape-lib.import))
+(declare (uses megamod.import))
+(declare (uses mutils.import))
+(declare (uses pkts.import))
+(declare (uses pgdbmod.import))
+(declare (uses rmtmod.import))
+(declare (uses runsmod.import))
+(declare (uses stml2.import))
+(declare (uses tasksmod.import))
+(declare (uses testsmod.import))
+(declare (uses ulex.import))
 
 ;; invoke the imports
 (declare (uses mtargs.import))
 (declare (uses mtconfigf.import))
-(declare (uses ducttape-lib.import))
-(declare (uses pkts.import))
-(declare (uses ulex.import))
-(declare (uses cookie.import))
-(declare (uses stml2.import))
-(declare (uses mutils.import))
-
-(declare (uses commonmod))
-(import commonmod)
-
-(declare (uses rmtmod))
-(import rmtmod)
-(declare (uses dbmod))
-(import dbmod)
-(declare (uses runsmod))
-(import runsmod)
-(declare (uses testsmod))
-(import testsmod)
-(declare (uses megamod))
-(import megamod)
-
-;; invoke the imports
-(declare (uses commonmod.import))
-(declare (uses testsmod.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*)
 
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
 (define *default-log-port* (current-error-port))