Index: txtdb/txtdb.scm
==================================================================
--- txtdb/txtdb.scm
+++ txtdb/txtdb.scm
@@ -111,30 +111,34 @@
 						    (if (and colnum-a colnum-b)
 							(< (cadr colnum-a)(cadr colnum-b))
 							(if (and (string? a)
 								 (string? b))
 							    (string< a b))))))))))
-    (with-output-to-file (conc targdir "/sxml/" sheet-name ".sxml")
+    (with-output-to-file (conc targdir "/xml/" sheet-name ".xml")
       (lambda ()
-	(pp remaining)))))
+	(print (sxml-serializer#serialize-sxml remaining))))
+    sheet-name))
 
 
 (define (extract-txtdb dat targdir)
   (let* ((wrkbk   (find-section   dat   'http://www.gnumeric.org/v10.dtd:Workbook))
 	 (wrk-rem (remove-section dat   'http://www.gnumeric.org/v10.dtd:Workbook))
 	 (sheets  (find-section   wrkbk 'http://www.gnumeric.org/v10.dtd:Sheets))
 	 (sht-rem (remove-section wrkbk 'http://www.gnumeric.org/v10.dtd:Sheets)))
-    (create-directory (conc targdir "/sxml") #t)
-    (with-output-to-file (conc targdir "/sxml/workbook.sxml")
-      (lambda ()
-	(pp wrk-rem)))
-    (with-output-to-file (conc targdir "/sxml/sheets.sxml")
-      (lambda ()
-	(pp sht-rem)))
-    (for-each (lambda (sheet)
-		(sheet->txtdb sheet targdir))
-	      sheets)))
+    (create-directory (conc targdir "/xml") #t)
+    (with-output-to-file (conc targdir "/xml/workbook.xml")
+      (lambda ()
+	(print (sxml-serializer#serialize-sxml wrk-rem))))
+    (with-output-to-file (conc targdir "/xml/sheets.xml")
+      (lambda ()
+	(print (sxml-serializer#serialize-sxml sht-rem))))
+    (let ((sheet-names (map (lambda (sheet)
+			      (sheet->txtdb sheet targdir))
+			    sheets)))
+      (with-output-to-file (conc targdir "/sheet-names.cfg")
+	(lambda ()
+	  (map print sheet-names))))))
 
 #|  
  (define x (txtdb:read-gnumeric-xml "testdata-stripped.xml"))