--- a/VSEPackageFileSourceWriter.st	Wed Jan 28 15:11:49 2015 +0100
+++ b/VSEPackageFileSourceWriter.st	Wed Jan 28 18:01:05 2015 +0100
@@ -72,50 +72,6 @@
 "
 ! !
 
-!VSEPackageFileSourceWriter class methodsFor:'utilities'!
-
-fileOutPackage:packageID on:aStream
-    |classesToFileout methodsToFileOut writer|
-
-    aStream lineEndCRLF.
-
-    classesToFileout := Smalltalk allClassesInPackage:packageID.
-    classesToFileout := classesToFileout reject:[:cls | cls isSubclassOf: ProjectDefinition ].
-    classesToFileout topologicalSort:[:a :b | b isSubclassOf:a].
-
-    methodsToFileOut := self extensionMethodsFor:packageID.
-
-    classesToFileout do:[:eachClass |
-        self ensureNoUnicodeInClass:eachClass
-    ].
-    methodsToFileOut do:[:eachClass |
-        self ensureNoUnicodeInMethod:eachClass
-    ].
-
-    writer := VSEPackageFileSourceWriter new.
-    writer packageName:packageID.
-    writer writeHeaderOn:aStream.
-
-    AbstractSourceFileWriter methodSourceRewriteQuery handle:[:rewriteQuery |
-        |method source|
-
-        method := rewriteQuery method.
-        source := rewriteQuery source.
-        source := self vseSourceRewriter rewriteMethod:method.
-        rewriteQuery proceedWith:source.
-    ] do:[
-        classesToFileout do:[:eachClass |
-            writer fileOut:eachClass on:aStream
-        ].
-
-        "/ fileout extensions
-        methodsToFileOut do:[:eachMethod |
-            writer fileOutMethod:eachMethod on:aStream.
-            aStream cr.
-        ].
-    ].
-! !
-
 !VSEPackageFileSourceWriter methodsFor:'accessing'!
 
 packageName:something
@@ -311,13 +267,56 @@
     self putEntry:nil value:'nobody' on:aStream.
 ! !
 
+!VSEPackageFileSourceWriter methodsFor:'utilities'!
+
+fileOutPackage:packageID on:aStream
+    |classesToFileout methodsToFileOut|
+
+    aStream lineEndCRLF.
+
+    classesToFileout := Smalltalk allClassesInPackage:packageID.
+    classesToFileout := classesToFileout reject:[:cls | cls isSubclassOf: ProjectDefinition ].
+    classesToFileout topologicalSort:[:a :b | b isSubclassOf:a].
+
+    methodsToFileOut := self extensionMethodsFor:packageID.
+
+    classesToFileout do:[:eachClass |
+        self ensureNoUnicodeInClass:eachClass
+    ].
+    methodsToFileOut do:[:eachClass |
+        self ensureNoUnicodeInMethod:eachClass
+    ].
+
+    self packageName:packageID.
+    self writeHeaderOn:aStream.
+
+    AbstractSourceFileWriter methodSourceRewriteQuery handle:[:rewriteQuery |
+        |method source|
+
+        method := rewriteQuery method.
+        source := rewriteQuery source.
+        source := self class vseSourceRewriter rewriteMethod:method.
+        rewriteQuery proceedWith:source.
+    ] do:[
+        classesToFileout do:[:eachClass |
+            self fileOut:eachClass on:aStream
+        ].
+
+        "/ fileout extensions
+        methodsToFileOut do:[:eachMethod |
+            self fileOutMethod:eachMethod on:aStream.
+            aStream cr.
+        ].
+    ].
+! !
+
 !VSEPackageFileSourceWriter class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/VSEPackageFileSourceWriter.st,v 1.3 2015-01-27 20:34:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/VSEPackageFileSourceWriter.st,v 1.4 2015-01-28 17:01:05 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/VSEPackageFileSourceWriter.st,v 1.3 2015-01-27 20:34:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/VSEPackageFileSourceWriter.st,v 1.4 2015-01-28 17:01:05 cg Exp $'
 ! !