@@ -16,23 +16,52 @@
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 ;;======================================================================
 
-(declare (uses common))
 (declare (uses mtargs))
 (declare (uses mtargs.import))
-(declare (uses keys))
-(declare (uses items))
 (declare (uses debugprint))
 (declare (uses debugprint.import))
-(declare (uses db))
-(declare (uses configf))
-(declare (uses configfmod))
-(declare (uses configfmod.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 mtmod))
+(declare (uses mtmod.import))
+(declare (uses dbfile))
+(declare (uses dbfile.import))
+(declare (uses dbmod))
+(declare (uses dbmod.import))
+(declare (uses portlogger))
+(declare (uses portlogger.import))
+(declare (uses tcp-transportmod))
+(declare (uses tcp-transportmod.import))
+(declare (uses servermod))
+(declare (uses servermod.import))
+(declare (uses megatestmod))
+(declare (uses megatestmod.import))
+(declare (uses apimod))
+(declare (uses apimod.import))
+(declare (uses rmtmod))
+(declare (uses rmtmod.import))
+(declare (uses pgdb))
+(declare (uses pgdb.import))
+(declare (uses tasksmod))
+(declare (uses tasksmod.import))
+
+(declare (uses configf))
+(declare (uses common))
+(declare (uses keys))
+(declare (uses items))
+(declare (uses db))
 (declare (uses process))
 (declare (uses launch))
 (declare (uses runs))
 (declare (uses dashboard-tests))
 (declare (uses tree))
@@ -39,17 +68,10 @@
 (declare (uses dcommon))
 (declare (uses dashboard-context-menu))
 (declare (uses vg))
 (declare (uses subrun))
 (declare (uses mt))
-(declare (uses dbmod))
-(declare (uses dbfile))
-(declare (uses dbfile.import))
-(declare (uses rmtmod))
-(declare (uses rmtmod.import))
-(declare (uses commonmod))
-(declare (uses commonmod.import))
 
 (use format)
 
 (require-library iup)
 (import (prefix iup iup:))
@@ -66,11 +88,15 @@
 	processmod
 	(prefix mtargs args:)
 	dbmod
 	dbfile
 	rmtmod
-	debugprint)
+	debugprint
+	stml2
+	megatestmod
+	tasksmod
+	)
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "task_records.scm")
@@ -82,10 +108,13 @@
 ;; executables such as dashboard and mtutil
 ;;
 (include "dashboard-transport-mode.scm")
 (dbfile:db-init-proc db:initialize-main-db)
 (set! rmtmod:send-receive rmt:send-receive)
+
+;; remove when configf fully modularized
+(read-config-set! configf:read-file)
 
 (debug:print-info 0 *default-log-port* "transport-mode="(rmt:transport-mode))
 
 (define help (conc 
 	      "Megatest Dashboard, documentation at http://www.kiatoa.com/fossils/megatest version " megatest-version