diff --git a/src/net/JNetReflector/InternalMethods.cs b/src/net/JNetReflector/InternalMethods.cs
index 27f16ec5d9..d0d1b801f6 100644
--- a/src/net/JNetReflector/InternalMethods.cs
+++ b/src/net/JNetReflector/InternalMethods.cs
@@ -335,7 +335,7 @@ static void AnalyzeSubItems(string package, IDictionary<string, IDictionary<stri
                                                            .Replace(AllPackageClasses.NAMESPACE, package)
                                                            .Replace(AllPackageClasses.CLASSES, sb.ToString());
 
-                        WriteFile(path, itemPackage);
+                        //WriteFile(path, itemPackage);
                         _allPackages.Add(path, itemPackage);
                     }
                     else
@@ -343,7 +343,7 @@ static void AnalyzeSubItems(string package, IDictionary<string, IDictionary<stri
                         var packageContent = File.ReadAllText(path);
                         var itemPackage = packageContent.Replace(AllPackageClasses.CLASSES, sb.ToString());
 
-                        WriteFile(path, itemPackage);
+                        //WriteFile(path, itemPackage);
                         _allPackages[path] = itemPackage;
                     }
                 }
@@ -355,7 +355,7 @@ static void AnalyzeSubItems(string package, IDictionary<string, IDictionary<stri
                                                    .Replace(AllPackageClasses.NAMESPACE, package)
                                                    .Replace(AllPackageClasses.CLASSES, sb.ToString());
 
-                WriteFile(path, itemPackage);
+                //WriteFile(path, itemPackage);
             }
         }
 
@@ -493,7 +493,10 @@ static string AnalyzeClasses(string jarOrModuleName, IEnumerable<Class> classDef
                 allClassBlock.Append(classGenericBlock);
             }
 
-            var singleFileBlockStr = singleFileBlock.ToString();
+            allClassBlock.AppendLine();
+            allClassBlock.AppendLine();
+            allClassBlock.Append(singleFileBlock.ToString());
+            var singleFileBlockStr = allClassBlock.ToString();
             if (!string.IsNullOrWhiteSpace(singleFileBlockStr))
             {
                 var singleClassFileTemplate = Template.GetTemplate(Template.SingleClassFileTemplate);
diff --git a/src/net/JNetReflector/Templates/AllPackageClassesStubClass.template b/src/net/JNetReflector/Templates/AllPackageClassesStubClass.template
index 01a7bd751f..416d708894 100644
--- a/src/net/JNetReflector/Templates/AllPackageClassesStubClass.template
+++ b/src/net/JNetReflector/Templates/AllPackageClassesStubClass.template
@@ -1,4 +1,4 @@
-#region ALLPACKAGE_CLASSES_STUB_CLASS_PLACEHOLDER
+#region ALLPACKAGE_CLASSES_STUB_CLASS_PLACEHOLDER definition
 ALLPACKAGE_CLASSES_STUB_CLASS_DECORATION_PLACEHOLDER
 public partial class ALLPACKAGE_CLASSES_STUB_CLASS_PLACEHOLDER : ALLPACKAGE_CLASSES_STUB_BASECLASS_PLACEHOLDERALLPACKAGE_CLASSES_STUB_WHERECLAUSES_PLACEHOLDER
 {
diff --git a/src/net/JNetReflector/Templates/AllPackageClassesStubClassInterfaceOrAbstract.template b/src/net/JNetReflector/Templates/AllPackageClassesStubClassInterfaceOrAbstract.template
index a5f9bd84a3..9d5fc46613 100644
--- a/src/net/JNetReflector/Templates/AllPackageClassesStubClassInterfaceOrAbstract.template
+++ b/src/net/JNetReflector/Templates/AllPackageClassesStubClassInterfaceOrAbstract.template
@@ -1,4 +1,4 @@
-#region ALLPACKAGE_CLASSES_STUB_CLASS_PLACEHOLDER
+#region ALLPACKAGE_CLASSES_STUB_CLASS_PLACEHOLDER definition
 ALLPACKAGE_CLASSES_STUB_CLASS_DECORATION_PLACEHOLDER
 public partial class ALLPACKAGE_CLASSES_STUB_CLASS_PLACEHOLDER : ALLPACKAGE_CLASSES_STUB_BASECLASS_PLACEHOLDERALLPACKAGE_CLASSES_STUB_WHERECLAUSES_PLACEHOLDER
 {
diff --git a/src/net/JNetReflector/Templates/AllPackageClassesStubClassListener.template b/src/net/JNetReflector/Templates/AllPackageClassesStubClassListener.template
index 2cda9caf65..f74516e3a3 100644
--- a/src/net/JNetReflector/Templates/AllPackageClassesStubClassListener.template
+++ b/src/net/JNetReflector/Templates/AllPackageClassesStubClassListener.template
@@ -1,4 +1,4 @@
-#region ALLPACKAGE_CLASSES_STUB_CLASS_PLACEHOLDER
+#region ALLPACKAGE_CLASSES_STUB_CLASS_PLACEHOLDER definition
 ALLPACKAGE_CLASSES_STUB_CLASS_DECORATION_PLACEHOLDER
 public partial class ALLPACKAGE_CLASSES_STUB_CLASS_PLACEHOLDER : ALLPACKAGE_CLASSES_STUB_BASECLASS_PLACEHOLDER
 {
@@ -14,7 +14,7 @@ ALLPACKAGE_CLASSES_STUB_LISTENER_CLASS_PLACEHOLDER
 }
 #endregion
 
-#region ALLPACKAGE_CLASSES_STUB_CLASS_DIRECT_PLACEHOLDER
+#region ALLPACKAGE_CLASSES_STUB_CLASS_DIRECT_PLACEHOLDER definition
 /// <summary>
 /// Direct override of <see cref="ALLPACKAGE_CLASSES_STUB_SIMPLECLASS_PLACEHOLDER"/> or its generic type if there is one
 /// </summary>
diff --git a/src/net/JNetReflector/Templates/AllPackageClassesStubClassMainClass.template b/src/net/JNetReflector/Templates/AllPackageClassesStubClassMainClass.template
index d0b6a1f2ac..1f03c877a4 100644
--- a/src/net/JNetReflector/Templates/AllPackageClassesStubClassMainClass.template
+++ b/src/net/JNetReflector/Templates/AllPackageClassesStubClassMainClass.template
@@ -1,4 +1,4 @@
-#region ALLPACKAGE_CLASSES_STUB_CLASS_PLACEHOLDER
+#region ALLPACKAGE_CLASSES_STUB_CLASS_PLACEHOLDER definition
 /// <summary>
 /// ALLPACKAGE_CLASSES_STUB_CLASS_HELP_PLACEHOLDER
 /// </summary>
diff --git a/src/net/JNetReflector/Templates/AllPackageClassesStubException.template b/src/net/JNetReflector/Templates/AllPackageClassesStubException.template
index 5069a439f4..2075a886b0 100644
--- a/src/net/JNetReflector/Templates/AllPackageClassesStubException.template
+++ b/src/net/JNetReflector/Templates/AllPackageClassesStubException.template
@@ -1,4 +1,4 @@
-#region ALLPACKAGE_CLASSES_STUB_CLASS_PLACEHOLDER
+#region ALLPACKAGE_CLASSES_STUB_CLASS_PLACEHOLDER definition
 ALLPACKAGE_CLASSES_STUB_CLASS_DECORATION_PLACEHOLDER
 public partial class ALLPACKAGE_CLASSES_STUB_CLASS_PLACEHOLDER : ALLPACKAGE_CLASSES_STUB_BASECLASS_PLACEHOLDER
 {