@@ -16,20 +16,10 @@
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 ;;======================================================================
 
-(import format)
-;; (import iup)
-(import (prefix iup iup:))
-(import canvas-draw)
-
-(import sqlite3 srfi-1
-	chicken.file.posix
-	regex regex-case srfi-69)
-(import (prefix sqlite3 sqlite3:))
-
 (declare (unit tree))
 (declare (uses mtargs))
 (declare (uses mtver))
 (declare (uses launchmod))
 ;; (declare (uses megatest-version))
@@ -37,15 +27,33 @@
 (declare (uses dbmod))
 (declare (uses servermod))
 ;; (declare (uses synchash))
 (declare (uses dcommon))
 
+(module tree
+	*
+	
+(import scheme
+	chicken.base
+	chicken.string
+	chicken.file.posix
+	)
+
+(import format
+	srfi-13
+	(prefix iup iup:)
+	canvas-draw
+	sqlite3
+	srfi-1
+	regex regex-case srfi-69
+	(prefix sqlite3 sqlite3:))
+
 (import mtver
 	launchmod
 	dbmod
 	servermod
-	)
+	gutils)
 
 ;; (include "megatest-version.scm")
 ;; (include "common_records.scm")
 (include "db_records.scm")
 (include "key_records.scm")
@@ -162,5 +170,7 @@
                              (dboard:data-curr-run-id-set! data run-id)
                              (dashboard:update-run-summary-tab)))
                        ;; (print "path: " (tree:node->path obj id) " run-id: " run-id)
                        ))))
 |#
+
+)