--- a/VSEChunkFileSourceWriter.st	Mon Feb 02 12:34:03 2015 +0100
+++ b/VSEChunkFileSourceWriter.st	Mon Feb 02 12:34:11 2015 +0100
@@ -231,6 +231,8 @@
 !
 
 generateCallToInitializerFor:aClass on:aStream
+    "here, the initializers are colelcted and generated alltogether at the end"
+
     rememberedInitializers isNil ifTrue:[
         rememberedInitializers := OrderedCollection new.
     ].
@@ -242,7 +244,7 @@
 !VSEChunkFileSourceWriter methodsFor:'utilities'!
 
 fileOutPackage:packageID on:aStream
-    |classesToFileout|
+    |classesToFileout rewriter|
 
     aStream lineEndCRLF.
 
@@ -250,12 +252,15 @@
     classesToFileout := classesToFileout reject:[:cls | cls isSubclassOf: ProjectDefinition ].
     classesToFileout topologicalSort:[:a :b | b isSubclassOf:a].
 
+    rewriter := self class vseSourceRewriter new.
+    rewriter classNamesToRewrite:classNameTranslations.
+
     AbstractSourceFileWriter methodSourceRewriteQuery handle:[:rewriteQuery |
         |method source|
 
         method := rewriteQuery method.
         source := rewriteQuery source.
-        source := self class vseSourceRewriter rewriteMethod:method.
+        source := rewriter rewriteMethod:method.
         rewriteQuery proceedWith:source.
     ] do:[
         |first|
@@ -279,12 +284,15 @@
 
                     mPckg := mthd package.
                     (mPckg = packageID and:[mPckg ~= eachClass package]) ifTrue:[
+                        aStream nextPutChunkSeparator.
+                        aStream nextPutAll:(self rewrittenClassNameOf:mthd mclass theNonMetaclass).
+                        mthd mclass isMetaclass ifTrue:[ aStream nextPutAll:' class' ].
+                        aStream nextPutAll:' methodsFor: '.
+                        aStream nextPutAll:'''',mthd category,''''.
+
+                        aStream nextPutChunkSeparator; cr; cr.
                         self fileOutMethod:mthd on:aStream.
-"/                        eachClass
-"/                            fileOutCategory:mthd category
-"/                            methodFilter:[:m | m == mthd]
-"/                            on:aStream.
-                        aStream cr.
+                        aStream space; nextPutChunkSeparator; cr; cr.
                     ]
                 ]
             ].
@@ -306,10 +314,10 @@
 !VSEChunkFileSourceWriter class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/VSEChunkFileSourceWriter.st,v 1.6 2015-01-28 18:08:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/VSEChunkFileSourceWriter.st,v 1.7 2015-02-02 11:34:11 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/VSEChunkFileSourceWriter.st,v 1.6 2015-01-28 18:08:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/VSEChunkFileSourceWriter.st,v 1.7 2015-02-02 11:34:11 cg Exp $'
 ! !