@@ -428,11 +428,11 @@
 
 (if (args:get-arg "-server")
 
     ;; Server? Start up here.
     ;;
-    (let ((tl        (setup-for-run))
+    (let ((tl        (launch:setup-for-run))
 	  (run-id    (and (args:get-arg "-run-id")
 			  (string->number (args:get-arg "-run-id")))))
       (if run-id
 	  (begin
 	    (server:launch run-id)
@@ -447,11 +447,11 @@
 		     (hash-table-keys args:arg-hash)
 		     '("-list-servers"
 		       "-stop-server"
 		       "-show-cmdinfo"
 		       "-list-runs")))
-	(if (setup-for-run)
+	(if (launch:setup-for-run)
 	    (let ((run-id    (and (args:get-arg "-run-id")
 				  (string->number (args:get-arg "-run-id")))))
 	      ;; (set! *fdb*   (filedb:open-db (conc *toppath* "/db/paths.db")))
 	      ;; if not list or kill then start a client (if appropriate)
 	      (if (or (args-defined? "-h" "-version" "-gen-megatest-area" "-gen-megatest-test")
@@ -466,11 +466,11 @@
 ;; MAY STILL NEED THIS
 ;;		       (set! *megatest-db* (make-dbr:dbstruct path: *toppath* local: #t))))))))))
 
 (if (or (args:get-arg "-list-servers")
 	(args:get-arg "-stop-server"))
-    (let ((tl (setup-for-run)))
+    (let ((tl (launch:setup-for-run)))
       (if tl 
 	  (let* ((servers (open-run-close tasks:get-all-servers tasks:open-db))
 		 (fmtstr  "~5a~12a~8a~20a~24a~10a~10a~10a~10a\n")
 		 (servers-to-kill '())
 		 (killinfo   (args:get-arg "-stop-server"))
@@ -537,16 +537,16 @@
 		     (setenv "MT_RUN_AREA_HOME" *toppath*)
 		     (if key-vals
 			 (for-each (lambda (kt)
 				     (setenv (car kt) (cadr kt)))
 				   key-vals))
-		     (read-config "runconfigs.config" #f #t sections: sections))))
+		     (read-config (conc *toppath* "/runconfigs.config") #f #t sections: sections))))
     data))
 
 
 (if (args:get-arg "-show-runconfig")
-    (let ((tl (setup-for-run)))
+    (let ((tl (launch:setup-for-run)))
       (push-directory *toppath*)
       (let ((data (full-runconfigs-read)))
 	;; keep this one local
 	(cond
 	 ((and (args:get-arg "-section")
@@ -561,11 +561,11 @@
 	  (debug:print 0 "ERROR: -dumpmode of " (args:get-arg "-dumpmode") " not recognised")))
 	(set! *didsomething* #t))
       (pop-directory)))
 
 (if (args:get-arg "-show-config")
-    (let ((tl   (setup-for-run))
+    (let ((tl   (launch:setup-for-run))
 	  (data *configdat*)) ;; (read-config "megatest.config" #f #t)))
       (push-directory *toppath*)
       ;; keep this one local
       (cond 
        ((and (args:get-arg "-section")
@@ -667,11 +667,11 @@
 
 ;; NOTE: list-runs and list-db-targets operate on local db!!!
 ;;
 (if (or (args:get-arg "-list-runs")
 	(args:get-arg "-list-db-targets"))
-    (if (setup-for-run)
+    (if (launch:setup-for-run)
 	(let* ((dbstruct (make-dbr:dbstruct path: *toppath* local: #t))
 	       (runpatt  (args:get-arg "-list-runs"))
 	       (testpatt (if (args:get-arg "-testpatt") 
 			     (args:get-arg "-testpatt") 
 			     "%"))
@@ -865,11 +865,11 @@
 	  (change-directory toppath)
 	  (if (not target)
 	      (begin
 		(debug:print 0 "ERROR: -target is required.")
 		(exit 1)))
-	  (if (not (setup-for-run))
+	  (if (not (launch:setup-for-run))
 	      (begin
 		(debug:print 0 "Failed to setup, giving up on -test-paths or -test-files, exiting")
 		(exit 1)))
 	  (let* ((keys     (rmt:get-keys))
 		 ;; db:test-get-paths must not be run remote
@@ -911,11 +911,11 @@
 	  (change-directory testpath)
 	  (if (not target)
 	      (begin
 		(debug:print 0 "ERROR: -target is required.")
 		(exit 1)))
-	  (if (not (setup-for-run))
+	  (if (not (launch:setup-for-run))
 	      (begin
 		(debug:print 0 "Failed to setup, giving up on -archive, exiting")
 		(exit 1)))
 	  (let* ((keys     (rmt:get-keys))
 		 (paths    (tests:test-get-paths-matching keys target)))
@@ -985,11 +985,11 @@
 	     (test-id   (assoc/default 'test-id   cmdinfo))
 	     (itemdat   (assoc/default 'itemdat   cmdinfo))
 	     (work-area (assoc/default 'work-area cmdinfo))
 	     (db        #f))
 	(change-directory testpath)
-	(if (not (setup-for-run))
+	(if (not (launch:setup-for-run))
 	    (begin
 	      (debug:print 0 "Failed to setup, exiting")
 	      (exit 1)))
 	(if (and state status)
 	    (rmt:teststep-set-status! run-id test-id step state status msg logfile)
@@ -1032,11 +1032,11 @@
 	       (itemdat   (assoc/default 'itemdat   cmdinfo))
 	       (work-area (assoc/default 'work-area cmdinfo))
 	       (db        #f) ;; (open-db))
 	       (state     (args:get-arg ":state"))
 	       (status    (args:get-arg ":status")))
-	  (if (not (setup-for-run))
+	  (if (not (launch:setup-for-run))
 	      (begin
 		(debug:print 0 "Failed to setup, exiting")
 		(exit 1)))
 
 	  (if (args:get-arg "-runstep")(debug:print-info 1 "Running -runstep, first change to directory " work-area))
@@ -1137,11 +1137,11 @@
 
 (if (or (args:get-arg "-showkeys")
         (args:get-arg "-show-keys"))
     (let ((db #f)
 	  (keys #f))
-      (if (not (setup-for-run))
+      (if (not (launch:setup-for-run))
 	  (begin
 	    (debug:print 0 "Failed to setup, exiting")
 	    (exit 1)))
       (set! keys (cdb:remote-run db:get-keys db))
       (debug:print 1 "Keys: " (string-intersperse keys ", "))
@@ -1168,31 +1168,31 @@
 ;; Update the database schema, clean up the db
 ;;======================================================================
 
 (if (args:get-arg "-rebuild-db")
     (begin
-      (if (not (setup-for-run))
+      (if (not (launch:setup-for-run))
 	  (begin
 	    (debug:print 0 "Failed to setup, exiting") 
 	    (exit 1)))
       ;; keep this one local
       (open-run-close patch-db #f)
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-cleanup-db")
     (begin
-      (if (not (setup-for-run))
+      (if (not (launch:setup-for-run))
 	  (begin
 	    (debug:print 0 "Failed to setup, exiting") 
 	    (exit 1)))
       ;; keep this one local
       (open-run-close db:clean-up #f)
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-mark-incompletes")
     (begin
-      (if (not (setup-for-run))
+      (if (not (launch:setup-for-run))
 	  (begin
 	    (debug:print 0 "Failed to setup, exiting") 
 	    (exit 1)))
       (open-run-close db:find-and-mark-incomplete #f)
       (set! *didsomething* #t)))
@@ -1201,11 +1201,11 @@
 ;; Update the tests meta data from the testconfig files
 ;;======================================================================
 
 (if (args:get-arg "-update-meta")
     (begin
-      (if (not (setup-for-run))
+      (if (not (launch:setup-for-run))
 	  (begin
 	    (debug:print 0 "Failed to setup, exiting") 
 	    (exit 1)))
       ;; now can find our db
       ;; keep this one local
@@ -1216,11 +1216,11 @@
 ;; Start a repl
 ;;======================================================================
 
 (if (or (args:get-arg "-repl")
 	(args:get-arg "-load"))
-    (let* ((toppath (setup-for-run))
+    (let* ((toppath (launch:setup-for-run))
 	   (dbstruct (if toppath (make-dbr:dbstruct path: toppath local: #t) #f)))
       (if dbstruct
 	  (begin
 	    (set! *db* dbstruct)
 	    (set! *client-non-blocking-mode* #t)
@@ -1242,45 +1242,45 @@
 ;; Wait on a run to complete
 ;;======================================================================
 
 (if (args:get-arg "-run-wait")
     (begin
-      (if (not (setup-for-run))
+      (if (not (launch:setup-for-run))
 	  (begin
 	    (debug:print 0 "Failed to setup, exiting") 
 	    (exit 1)))
       (operate-on 'run-wait)
       (set! *didsomething* #t)))
 
-;; Not converted to use dbstruct yet
-;;
-(if (args:get-arg "-convert-to-norm")
-    (let* ((toppath (setup-for-run))
-	   (dbstruct (if toppath (make-dbr:dbstruct path: toppath local: #t))))
-      (for-each 
-       (lambda (field)
-	 (let ((dat '()))
-	   (debug:print-info 0 "Getting data for field " field)
-	   (sqlite3:for-each-row
-	    (lambda (id val)
-	      (set! dat (cons (list id val) dat)))
-	    (get-db db run-id)
-	    (conc "SELECT id," field " FROM tests;"))
-	   (debug:print-info 0 "found " (length dat) " items for field " field)
-	   (let ((qry (sqlite3:prepare db (conc "UPDATE tests SET " field "=? WHERE id=?;"))))
-	     (for-each
-	      (lambda (item)
-		(let ((newval ;; (sdb:qry 'getid 
-		       (cadr item))) ;; )
-		  (if (not (equal? newval (cadr item)))
-		      (debug:print-info 0 "Converting " (cadr item) " to " newval " for test #" (car item)))
-		  (sqlite3:execute qry newval (car item))))
-	      dat)
-	     (sqlite3:finalize! qry))))
-       (db:close-all dbstruct)
-       (list "uname" "rundir" "final_logf" "comment"))
-      (set! *didsomething* #t)))
+;; ;; ;; redo me ;; Not converted to use dbstruct yet
+;; ;; ;; redo me ;;
+;; ;; ;; redo me (if (args:get-arg "-convert-to-norm")
+;; ;; ;; redo me     (let* ((toppath (setup-for-run))
+;; ;; ;; redo me 	   (dbstruct (if toppath (make-dbr:dbstruct path: toppath local: #t))))
+;; ;; ;; redo me       (for-each 
+;; ;; ;; redo me        (lambda (field)
+;; ;; ;; redo me 	 (let ((dat '()))
+;; ;; ;; redo me 	   (debug:print-info 0 "Getting data for field " field)
+;; ;; ;; redo me 	   (sqlite3:for-each-row
+;; ;; ;; redo me 	    (lambda (id val)
+;; ;; ;; redo me 	      (set! dat (cons (list id val) dat)))
+;; ;; ;; redo me 	    (db:get-db db run-id)
+;; ;; ;; redo me 	    (conc "SELECT id," field " FROM tests;"))
+;; ;; ;; redo me 	   (debug:print-info 0 "found " (length dat) " items for field " field)
+;; ;; ;; redo me 	   (let ((qry (sqlite3:prepare db (conc "UPDATE tests SET " field "=? WHERE id=?;"))))
+;; ;; ;; redo me 	     (for-each
+;; ;; ;; redo me 	      (lambda (item)
+;; ;; ;; redo me 		(let ((newval ;; (sdb:qry 'getid 
+;; ;; ;; redo me 		       (cadr item))) ;; )
+;; ;; ;; redo me 		  (if (not (equal? newval (cadr item)))
+;; ;; ;; redo me 		      (debug:print-info 0 "Converting " (cadr item) " to " newval " for test #" (car item)))
+;; ;; ;; redo me 		  (sqlite3:execute qry newval (car item))))
+;; ;; ;; redo me 	      dat)
+;; ;; ;; redo me 	     (sqlite3:finalize! qry))))
+;; ;; ;; redo me        (db:close-all dbstruct)
+;; ;; ;; redo me        (list "uname" "rundir" "final_logf" "comment"))
+;; ;; ;; redo me       (set! *didsomething* #t)))
 
 (if (args:get-arg "-import-megatest.db")
     (let* ((toppath  (setup-for-run))
 	   (dbstruct (if toppath (make-dbr:dbstruct path: toppath) #f))
 	   (mtdb     (if toppath (db:open-megatest-db)))