diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt
index dce65ecc953..bb2b7f3675e 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt
@@ -399,9 +399,9 @@ open class Kapt3IT : Kapt3BaseIT() {
             val actual = getErrorMessages()
             // try as 0 starting lines first, then as 1 starting line
             try {
-                Assert.assertEquals(genJavaErrorString(8, 16), actual)
+                Assert.assertEquals(genJavaErrorString(8, 20), actual)
             } catch (e: AssertionError) {
-                Assert.assertEquals(genJavaErrorString(9, 17), actual)
+                Assert.assertEquals(genJavaErrorString(9, 21), actual)
             }
         }
 
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt b/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt
index 5da6cc6ef88..ba16efee0a0 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt
@@ -5,14 +5,14 @@ public enum E {
     /*public static final*/ X /* = new E() */,
     /*public static final*/ Y /* = new E() */;
 
+    E() {
+    }
+
     public abstract void a();
 
     public final void b() {
     }
 
-    E() {
-    }
-
     @kotlin.Metadata()
     public static final class Obj {
         @org.jetbrains.annotations.NotNull()
@@ -42,13 +42,13 @@ public enum E2 {
     /*public static final*/ X /* = new E2() */,
     /*public static final*/ Y /* = new E2() */;
 
-    public abstract void a();
-
     E2(int n) {
     }
 
     E2(java.lang.String s) {
     }
+
+    public abstract void a();
 }
 
 ////////////////////
@@ -63,13 +63,13 @@ public enum E3 {
     @org.jetbrains.annotations.NotNull()
     private final java.lang.String a = null;
 
+    E3(java.lang.String a) {
+    }
+
     @org.jetbrains.annotations.NotNull()
     public final java.lang.String getA() {
         return null;
     }
-
-    E3(java.lang.String a) {
-    }
 }
 
 ////////////////////
@@ -86,6 +86,9 @@ public enum E4 {
     private final long c = 0L;
     private final boolean d = false;
 
+    E4(java.lang.String a, int b, long c, boolean d) {
+    }
+
     @org.jetbrains.annotations.NotNull()
     public final java.lang.String getA() {
         return null;
@@ -102,7 +105,4 @@ public enum E4 {
     public final boolean getD() {
         return false;
     }
-
-    E4(java.lang.String a, int b, long c, boolean d) {
-    }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/abstractMethods.txt b/plugins/kapt3/kapt3-compiler/testData/converter/abstractMethods.txt
index d7a55aa13d2..1625b6d5ecd 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/abstractMethods.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/abstractMethods.txt
@@ -3,15 +3,15 @@ import java.lang.System;
 @kotlin.Metadata()
 public abstract class Base {
 
+    public Base() {
+        super();
+    }
+
     protected abstract void doJob(@org.jetbrains.annotations.NotNull()
     java.lang.String job, int delay);
 
     protected abstract <T extends java.lang.CharSequence>void doJobGeneric(@org.jetbrains.annotations.NotNull()
     T job, int delay);
-
-    public Base() {
-        super();
-    }
 }
 
 ////////////////////
@@ -22,6 +22,10 @@ import java.lang.System;
 @kotlin.Metadata()
 public final class Impl extends Base {
 
+    public Impl() {
+        super();
+    }
+
     @java.lang.Override()
     protected void doJob(@org.jetbrains.annotations.NotNull()
     java.lang.String job, int delay) {
@@ -31,8 +35,4 @@ public final class Impl extends Base {
     protected <T extends java.lang.CharSequence>void doJobGeneric(@org.jetbrains.annotations.NotNull()
     T job, int delay) {
     }
-
-    public Impl() {
-        super();
-    }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.txt b/plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.txt
index 35770662333..1b67d8a629d 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.txt
@@ -10,6 +10,10 @@ public final class Test {
     public a.b.ABC abc;
     public bcd bcd;
 
+    public Test() {
+        super();
+    }
+
     @org.jetbrains.annotations.NotNull()
     public final Test.MyDate getDate() {
         return null;
@@ -55,14 +59,14 @@ public final class Test {
     bcd p0) {
     }
 
-    public Test() {
-        super();
-    }
-
     @kotlin.Metadata()
     public static final class MyDate {
         public Test.MyDate date2;
 
+        public MyDate() {
+            super();
+        }
+
         @org.jetbrains.annotations.NotNull()
         public final Test.MyDate getDate2() {
             return null;
@@ -71,10 +75,6 @@ public final class Test {
         public final void setDate2(@org.jetbrains.annotations.NotNull()
         Test.MyDate p0) {
         }
-
-        public MyDate() {
-            super();
-        }
     }
 }
 
@@ -89,6 +89,10 @@ import a.b.ABC;
 public final class Test2 {
     public java.util.Date date;
 
+    public Test2() {
+        super();
+    }
+
     @org.jetbrains.annotations.NotNull()
     public final java.util.Date getDate() {
         return null;
@@ -97,8 +101,4 @@ public final class Test2 {
     public final void setDate(@org.jetbrains.annotations.NotNull()
     java.util.Date p0) {
     }
-
-    public Test2() {
-        super();
-    }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt
index ddbaa8f4059..784c91d085c 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt
@@ -103,30 +103,30 @@ public final class TestAnno2 {
     @Anno3(value = "field")
     private java.lang.String b = "property initializer";
 
+    public TestAnno2() {
+        super();
+    }
+
     @Anno1()
     public final void a(@org.jetbrains.annotations.NotNull()
     @Anno3(value = "param-pam-pam")
     java.lang.String param) {
     }
 
-    @Anno3(value = "property")
-    @java.lang.Deprecated()
-    public static void getB$annotations() {
-    }
-
     @org.jetbrains.annotations.NotNull()
     @Anno3(value = "getter")
     public final java.lang.String getB() {
         return null;
     }
 
+    @Anno3(value = "property")
+    @java.lang.Deprecated()
+    public static void getB$annotations() {
+    }
+
     @Anno3(value = "setter")
     public final void setB(@org.jetbrains.annotations.NotNull()
     @Anno3(value = "setparam")
     java.lang.String p0) {
     }
-
-    public TestAnno2() {
-        super();
-    }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt
index 1ecb47c7377..3b7f23b51ba 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt
@@ -56,14 +56,14 @@ public enum Enum {
     /*public static final*/ BLACK /* = new Enum() */;
     private final int x = 0;
 
-    public final int getX() {
-        return 0;
-    }
-
     @Anno(value = "enum-constructor")
     Enum(@Anno(value = "x")
     int x) {
     }
+
+    public final int getX() {
+        return 0;
+    }
 }
 
 ////////////////////
@@ -78,21 +78,11 @@ public abstract class Test {
     @org.jetbrains.annotations.NotNull()
     private java.lang.String v;
 
-    @org.jetbrains.annotations.NotNull()
-    @Anno(value = "abstract-method")
-    public abstract java.lang.String abstractMethod();
-
-    @Anno(value = "abstract-val")
-    @java.lang.Deprecated()
-    public static void getAbstractVal$annotations() {
-    }
-
-    @org.jetbrains.annotations.NotNull()
-    public abstract java.lang.String getAbstractVal();
-
-    @Anno(value = "v-property")
-    @java.lang.Deprecated()
-    public static void getV$annotations() {
+    @Anno(value = "test-constructor")
+    protected Test(@org.jetbrains.annotations.NotNull()
+    @Anno(value = "v-param")
+    java.lang.String v) {
+        super();
     }
 
     @org.jetbrains.annotations.NotNull()
@@ -101,16 +91,26 @@ public abstract class Test {
         return null;
     }
 
+    @Anno(value = "v-property")
+    @java.lang.Deprecated()
+    public static void getV$annotations() {
+    }
+
     @Anno(value = "v-set")
     public final void setV(@org.jetbrains.annotations.NotNull()
     @Anno(value = "v-setparam")
     java.lang.String p0) {
     }
 
-    @Anno(value = "test-constructor")
-    protected Test(@org.jetbrains.annotations.NotNull()
-    @Anno(value = "v-param")
-    java.lang.String v) {
-        super();
+    @org.jetbrains.annotations.NotNull()
+    @Anno(value = "abstract-method")
+    public abstract java.lang.String abstractMethod();
+
+    @org.jetbrains.annotations.NotNull()
+    public abstract java.lang.String getAbstractVal();
+
+    @Anno(value = "abstract-val")
+    @java.lang.Deprecated()
+    public static void getAbstractVal$annotations() {
     }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithTargets.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithTargets.txt
index 71efe5e7a30..741bdac2ba0 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithTargets.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithTargets.txt
@@ -16,10 +16,8 @@ public final class Bar {
     @FieldAnno()
     private final java.lang.String a = "";
 
-    @Anno()
-    @PropertyAnno()
-    @java.lang.Deprecated()
-    public static void getA$annotations() {
+    public Bar() {
+        super();
     }
 
     @org.jetbrains.annotations.NotNull()
@@ -27,8 +25,10 @@ public final class Bar {
         return null;
     }
 
-    public Bar() {
-        super();
+    @Anno()
+    @PropertyAnno()
+    @java.lang.Deprecated()
+    public static void getA$annotations() {
     }
 }
 
@@ -43,14 +43,14 @@ public final class Baz {
     @FieldAnno()
     public final java.lang.String a = "";
 
+    public Baz() {
+        super();
+    }
+
     @Anno()
     @java.lang.Deprecated()
     public static void getA$annotations() {
     }
-
-    public Baz() {
-        super();
-    }
 }
 
 ////////////////////
@@ -76,9 +76,11 @@ public final class Foo {
     @FieldAnno()
     private final java.lang.String a = null;
 
-    @PropertyAnno()
-    @java.lang.Deprecated()
-    public static void getA$annotations() {
+    public Foo(@org.jetbrains.annotations.NotNull()
+    @Anno()
+    @ParameterAnno()
+    java.lang.String a) {
+        super();
     }
 
     @org.jetbrains.annotations.NotNull()
@@ -86,11 +88,9 @@ public final class Foo {
         return null;
     }
 
-    public Foo(@org.jetbrains.annotations.NotNull()
-    @Anno()
-    @ParameterAnno()
-    java.lang.String a) {
-        super();
+    @PropertyAnno()
+    @java.lang.Deprecated()
+    public static void getA$annotations() {
     }
 }
 
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt b/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt
index 27375cccb3c..2a0718cf8e7 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt
@@ -17,11 +17,11 @@ public enum EnumError {
     /*public static final*/ One /* = new EnumError() */,
     /*public static final*/ Two /* = new EnumError() */;
 
-    @org.jetbrains.annotations.NotNull()
-    public abstract java.lang.String doIt();
-
     EnumError() {
     }
+
+    @org.jetbrains.annotations.NotNull()
+    public abstract java.lang.String doIt();
 }
 
 ////////////////////
@@ -65,6 +65,10 @@ public final class Test {
     @org.jetbrains.annotations.NotNull()
     private final java.lang.String prop2 = "";
 
+    public Test() {
+        super();
+    }
+
     /**
      * method().
      */
@@ -84,6 +88,11 @@ public final class Test {
     java.lang.String a) {
     }
 
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getProp2() {
+        return null;
+    }
+
     /**
      * prop2.
      */
@@ -92,11 +101,6 @@ public final class Test {
     public static void getProp2$annotations() {
     }
 
-    @org.jetbrains.annotations.NotNull()
-    public final java.lang.String getProp2() {
-        return null;
-    }
-
     /**
      * get.
      */
@@ -111,10 +115,6 @@ public final class Test {
     public final void setProp3(@org.jetbrains.annotations.NotNull()
     java.lang.String v) {
     }
-
-    public Test() {
-        super();
-    }
 }
 
 ////////////////////
@@ -132,15 +132,15 @@ public final class Test2 {
     @org.jetbrains.annotations.NotNull()
     private final java.lang.String a = null;
 
-    @org.jetbrains.annotations.NotNull()
-    public final java.lang.String getA() {
-        return null;
-    }
-
     public Test2(@org.jetbrains.annotations.NotNull()
     java.lang.String a) {
         super();
     }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getA() {
+        return null;
+    }
 }
 
 ////////////////////
@@ -156,15 +156,15 @@ public final class Test3 {
     @org.jetbrains.annotations.NotNull()
     private final java.lang.String a = null;
 
-    @org.jetbrains.annotations.NotNull()
-    public final java.lang.String getA() {
-        return null;
-    }
-
     protected Test3(@org.jetbrains.annotations.NotNull()
     java.lang.String a) {
         super();
     }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getA() {
+        return null;
+    }
 }
 
 ////////////////////
@@ -175,12 +175,12 @@ import java.lang.System;
 @kotlin.Metadata()
 public final class Test4 {
 
-    public final void method() {
-    }
-
     public Test4() {
         super();
     }
+
+    public final void method() {
+    }
 }
 
 ////////////////////
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.txt b/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.txt
index 7342fc46d0d..aef55aa0aa2 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.txt
@@ -8,23 +8,30 @@ public final class User {
     private final java.lang.String secondName = null;
     private final int age = 0;
 
-    public final void procedure() {
-    }
-
     @org.jetbrains.annotations.NotNull()
-    public final java.lang.String getFirstName() {
+    public final User copy(@org.jetbrains.annotations.NotNull()
+    java.lang.String firstName, @org.jetbrains.annotations.NotNull()
+    java.lang.String secondName, int age) {
         return null;
     }
 
-    @org.jetbrains.annotations.NotNull()
-    public final java.lang.String getSecondName() {
-        return null;
+    @java.lang.Override()
+    public boolean equals(@org.jetbrains.annotations.Nullable()
+    java.lang.Object p0) {
+        return false;
     }
 
-    public final int getAge() {
+    @java.lang.Override()
+    public int hashCode() {
         return 0;
     }
 
+    @org.jetbrains.annotations.NotNull()
+    @java.lang.Override()
+    public java.lang.String toString() {
+        return null;
+    }
+
     public User(@org.jetbrains.annotations.NotNull()
     java.lang.String firstName, @org.jetbrains.annotations.NotNull()
     java.lang.String secondName, int age) {
@@ -36,36 +43,29 @@ public final class User {
         return null;
     }
 
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getFirstName() {
+        return null;
+    }
+
     @org.jetbrains.annotations.NotNull()
     public final java.lang.String component2() {
         return null;
     }
 
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getSecondName() {
+        return null;
+    }
+
     public final int component3() {
         return 0;
     }
 
-    @org.jetbrains.annotations.NotNull()
-    public final User copy(@org.jetbrains.annotations.NotNull()
-    java.lang.String firstName, @org.jetbrains.annotations.NotNull()
-    java.lang.String secondName, int age) {
-        return null;
-    }
-
-    @org.jetbrains.annotations.NotNull()
-    @java.lang.Override()
-    public java.lang.String toString() {
-        return null;
-    }
-
-    @java.lang.Override()
-    public int hashCode() {
+    public final int getAge() {
         return 0;
     }
 
-    @java.lang.Override()
-    public boolean equals(@org.jetbrains.annotations.Nullable()
-    java.lang.Object p0) {
-        return false;
+    public final void procedure() {
     }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.txt
index 293604959eb..bb9b88f9eee 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.txt
@@ -26,13 +26,13 @@ public abstract interface Intf {
         private static final int BLACK = 1;
         public static final int WHITE = 2;
 
-        public final int getBLACK() {
-            return 0;
-        }
-
         private Companion() {
             super();
         }
+
+        public final int getBLACK() {
+            return 0;
+        }
     }
 }
 
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.txt
index a20dea0e171..9e5d42614b4 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.txt
@@ -44,7 +44,21 @@ public final class Foo {
     @org.jetbrains.annotations.NotNull()
     private final Em[] emarr = null;
 
-    public final void foo(int a) {
+    public Foo() {
+        super();
+    }
+
+    public Foo(boolean z, byte b, char c, char c2, short sh, int i, long l, float f, double d, @org.jetbrains.annotations.NotNull()
+    java.lang.String s, @org.jetbrains.annotations.NotNull()
+    int[] iarr, @org.jetbrains.annotations.NotNull()
+    long[] larr, @org.jetbrains.annotations.NotNull()
+    double[] darr, @org.jetbrains.annotations.NotNull()
+    java.lang.String[] sarr, @org.jetbrains.annotations.NotNull()
+    java.lang.Class<?> cl, @org.jetbrains.annotations.NotNull()
+    java.lang.Class<?>[] clarr, @org.jetbrains.annotations.NotNull()
+    Em em, @org.jetbrains.annotations.NotNull()
+    Em[] emarr) {
+        super();
     }
 
     public final boolean getZ() {
@@ -128,20 +142,6 @@ public final class Foo {
         return null;
     }
 
-    public Foo(boolean z, byte b, char c, char c2, short sh, int i, long l, float f, double d, @org.jetbrains.annotations.NotNull()
-    java.lang.String s, @org.jetbrains.annotations.NotNull()
-    int[] iarr, @org.jetbrains.annotations.NotNull()
-    long[] larr, @org.jetbrains.annotations.NotNull()
-    double[] darr, @org.jetbrains.annotations.NotNull()
-    java.lang.String[] sarr, @org.jetbrains.annotations.NotNull()
-    java.lang.Class<?> cl, @org.jetbrains.annotations.NotNull()
-    java.lang.Class<?>[] clarr, @org.jetbrains.annotations.NotNull()
-    Em em, @org.jetbrains.annotations.NotNull()
-    Em[] emarr) {
-        super();
-    }
-
-    public Foo() {
-        super();
+    public final void foo(int a) {
     }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.txt
index a9a400e9d5f..24a4c4bb0e4 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.txt
@@ -44,7 +44,21 @@ public final class Foo {
     @org.jetbrains.annotations.NotNull()
     private final Em[] emarr = {Em.FOO, Em.BAR};
 
-    public final void foo(int a) {
+    public Foo() {
+        super();
+    }
+
+    public Foo(boolean z, byte b, char c, char c2, short sh, int i, long l, float f, double d, @org.jetbrains.annotations.NotNull()
+    java.lang.String s, @org.jetbrains.annotations.NotNull()
+    int[] iarr, @org.jetbrains.annotations.NotNull()
+    long[] larr, @org.jetbrains.annotations.NotNull()
+    double[] darr, @org.jetbrains.annotations.NotNull()
+    java.lang.String[] sarr, @org.jetbrains.annotations.NotNull()
+    java.lang.Class<?> cl, @org.jetbrains.annotations.NotNull()
+    java.lang.Class<?>[] clarr, @org.jetbrains.annotations.NotNull()
+    Em em, @org.jetbrains.annotations.NotNull()
+    Em[] emarr) {
+        super();
     }
 
     public final boolean getZ() {
@@ -128,20 +142,6 @@ public final class Foo {
         return null;
     }
 
-    public Foo(boolean z, byte b, char c, char c2, short sh, int i, long l, float f, double d, @org.jetbrains.annotations.NotNull()
-    java.lang.String s, @org.jetbrains.annotations.NotNull()
-    int[] iarr, @org.jetbrains.annotations.NotNull()
-    long[] larr, @org.jetbrains.annotations.NotNull()
-    double[] darr, @org.jetbrains.annotations.NotNull()
-    java.lang.String[] sarr, @org.jetbrains.annotations.NotNull()
-    java.lang.Class<?> cl, @org.jetbrains.annotations.NotNull()
-    java.lang.Class<?>[] clarr, @org.jetbrains.annotations.NotNull()
-    Em em, @org.jetbrains.annotations.NotNull()
-    Em[] emarr) {
-        super();
-    }
-
-    public Foo() {
-        super();
+    public final void foo(int a) {
     }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/deprecated.txt b/plugins/kapt3/kapt3-compiler/testData/converter/deprecated.txt
index 5c990f5e91b..552b8a8270f 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/deprecated.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/deprecated.txt
@@ -21,17 +21,21 @@ public final class Foo {
     @java.lang.Deprecated()
     private final int prop = 0;
 
+    public Foo() {
+        super();
+    }
+
     @java.lang.Deprecated()
     public final void foo(int a) {
     }
 
     @java.lang.Deprecated()
-    public static void getProp$annotations() {
+    public final int getProp() {
+        return 0;
     }
 
     @java.lang.Deprecated()
-    public final int getProp() {
-        return 0;
+    public static void getProp$annotations() {
     }
 
     @java.lang.Deprecated()
@@ -42,8 +46,4 @@ public final class Foo {
     @java.lang.Deprecated()
     public final void setFoo(int value) {
     }
-
-    public Foo() {
-        super();
-    }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion.txt b/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion.txt
index 445dabca9b1..ffe0217c9a9 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion.txt
@@ -115,9 +115,9 @@ public final class Test4 {
 
         @kotlin.Metadata()
         public static final class Foo {
-            public static final int constProperty = 1;
             @org.jetbrains.annotations.NotNull()
             public static final Test4.Companion.Foo INSTANCE = null;
+            public static final int constProperty = 1;
 
             private Foo() {
                 super();
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt b/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt
index 90bb77c418d..2ce210299ff 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt
@@ -34,15 +34,9 @@ public enum Enum2 {
     private final java.lang.String col = null;
     private final int col2 = 0;
 
-    @org.jetbrains.annotations.NotNull()
-    public final java.lang.String color() {
-        return null;
-    }
-
-    private final void privateEnumFun() {
-    }
-
-    public final void publicEnumFun() {
+    Enum2(@Anno1(value = "first")
+    java.lang.String col, @Anno1(value = "second")
+    int col2) {
     }
 
     @org.jetbrains.annotations.NotNull()
@@ -54,9 +48,15 @@ public enum Enum2 {
         return 0;
     }
 
-    Enum2(@Anno1(value = "first")
-    java.lang.String col, @Anno1(value = "second")
-    int col2) {
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String color() {
+        return null;
+    }
+
+    private final void privateEnumFun() {
+    }
+
+    public final void publicEnumFun() {
     }
 }
 
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.txt b/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.txt
index d2059974e1b..01c038bb11e 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.txt
@@ -35,6 +35,13 @@ public final class ErrorInConstructorParameter {
     @org.jetbrains.annotations.NotNull()
     private final java.util.List<ABC> c = null;
 
+    public ErrorInConstructorParameter(@org.jetbrains.annotations.NotNull()
+    java.lang.String a, @org.jetbrains.annotations.NotNull()
+    ABC b, @org.jetbrains.annotations.NotNull()
+    java.util.List<? extends ABC> c) {
+        super();
+    }
+
     @org.jetbrains.annotations.NotNull()
     public final java.lang.String getA() {
         return null;
@@ -49,13 +56,6 @@ public final class ErrorInConstructorParameter {
     public final java.util.List<ABC> getC() {
         return null;
     }
-
-    public ErrorInConstructorParameter(@org.jetbrains.annotations.NotNull()
-    java.lang.String a, @org.jetbrains.annotations.NotNull()
-    ABC b, @org.jetbrains.annotations.NotNull()
-    java.util.List<? extends ABC> c) {
-        super();
-    }
 }
 
 ////////////////////
@@ -69,6 +69,10 @@ public final class ErrorInDeclarations {
     public ABC p2;
     public BCD<java.lang.String> p3;
 
+    public ErrorInDeclarations() {
+        super();
+    }
+
     @org.jetbrains.annotations.NotNull()
     public final java.lang.String getP1() {
         return null;
@@ -119,10 +123,6 @@ public final class ErrorInDeclarations {
     public final ABC f4() {
         return null;
     }
-
-    public ErrorInDeclarations() {
-        super();
-    }
 }
 
 ////////////////////
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclass.txt b/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclass.txt
index 0fdad8ea0d2..91968329e1b 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclass.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclass.txt
@@ -22,17 +22,17 @@ public final class ClassWithParent implements java.lang.CharSequence {
         super();
     }
 
-    @java.lang.Override()
-    public final int length() {
-        return 0;
-    }
-
-    public abstract int getLength();
-
     @java.lang.Override()
     public final char charAt(int p0) {
         return '\u0000';
     }
 
     public abstract char get(int p0);
+
+    public abstract int getLength();
+
+    @java.lang.Override()
+    public final int length() {
+        return 0;
+    }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclassCorrectErrorTypes.txt b/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclassCorrectErrorTypes.txt
index 01c641b3783..b75ff4d79f0 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclassCorrectErrorTypes.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclassCorrectErrorTypes.txt
@@ -9,19 +9,14 @@ public final class Child extends kotlin.collections.AbstractList<java.lang.Strin
         super();
     }
 
-    @java.lang.Override()
-    public boolean contains(java.lang.String p0) {
-        return false;
-    }
-
     @java.lang.Override()
     public final boolean contains(java.lang.Object p0) {
         return false;
     }
 
     @java.lang.Override()
-    public int indexOf(java.lang.String p0) {
-        return 0;
+    public boolean contains(java.lang.String p0) {
+        return false;
     }
 
     @java.lang.Override()
@@ -30,7 +25,7 @@ public final class Child extends kotlin.collections.AbstractList<java.lang.Strin
     }
 
     @java.lang.Override()
-    public int lastIndexOf(java.lang.String p0) {
+    public int indexOf(java.lang.String p0) {
         return 0;
     }
 
@@ -38,6 +33,11 @@ public final class Child extends kotlin.collections.AbstractList<java.lang.Strin
     public final int lastIndexOf(java.lang.Object p0) {
         return 0;
     }
+
+    @java.lang.Override()
+    public int lastIndexOf(java.lang.String p0) {
+        return 0;
+    }
 }
 
 ////////////////////
@@ -115,6 +115,10 @@ import java.lang.System;
 @kotlin.Metadata()
 public final class MappedList<R extends java.lang.Object> extends kotlin.collections.AbstractList<R> implements java.util.List<R> {
 
+    public MappedList() {
+        super();
+    }
+
     @org.jetbrains.annotations.NotNull()
     @java.lang.Override()
     public java.lang.Void get(int index) {
@@ -125,10 +129,6 @@ public final class MappedList<R extends java.lang.Object> extends kotlin.collect
     public int getSize() {
         return 0;
     }
-
-    public MappedList() {
-        super();
-    }
 }
 
 ////////////////////
@@ -180,15 +180,15 @@ public final class TFooBar extends Foo implements test.Intf, Bar {
     @org.jetbrains.annotations.NotNull()
     private final X a = null;
 
-    @org.jetbrains.annotations.NotNull()
-    public final X getA() {
-        return null;
-    }
-
     public TFooBar(@org.jetbrains.annotations.NotNull()
     X a) {
         super();
     }
+
+    @org.jetbrains.annotations.NotNull()
+    public final X getA() {
+        return null;
+    }
 }
 
 ////////////////////
@@ -202,15 +202,15 @@ public final class TFooBar2 implements Foo, Bar {
     @org.jetbrains.annotations.NotNull()
     private final X a = null;
 
-    @org.jetbrains.annotations.NotNull()
-    public final X getA() {
-        return null;
-    }
-
     public TFooBar2(@org.jetbrains.annotations.NotNull()
     X a) {
         super();
     }
+
+    @org.jetbrains.annotations.NotNull()
+    public final X getA() {
+        return null;
+    }
 }
 
 ////////////////////
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/functions.txt b/plugins/kapt3/kapt3-compiler/testData/converter/functions.txt
index c3022a4f96c..39c2d66e87f 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/functions.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/functions.txt
@@ -3,6 +3,10 @@ import java.lang.System;
 @kotlin.Metadata()
 public final class FunctionsTest {
 
+    public FunctionsTest() {
+        super();
+    }
+
     @org.jetbrains.annotations.NotNull()
     public final kotlin.reflect.KProperty1<java.lang.String, java.lang.Integer> f() {
         return null;
@@ -19,8 +23,4 @@ public final class FunctionsTest {
     public final int f4() {
         return 0;
     }
-
-    public FunctionsTest() {
-        super();
-    }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/genericParameters.txt b/plugins/kapt3/kapt3-compiler/testData/converter/genericParameters.txt
index 3124b0ba9ac..8cf9e9ceebd 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/genericParameters.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/genericParameters.txt
@@ -6,6 +6,17 @@ public final class MappedList<T extends java.lang.Object, R extends java.lang.Ob
     private final java.util.List<T> list = null;
     private final kotlin.jvm.functions.Function1<T, R> function = null;
 
+    public MappedList(@org.jetbrains.annotations.NotNull()
+    java.util.List<? extends T> list, @org.jetbrains.annotations.NotNull()
+    kotlin.jvm.functions.Function1<? super T, ? extends R> function) {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.util.List<T> getList() {
+        return null;
+    }
+
     @java.lang.Override()
     public R get(int index) {
         return null;
@@ -15,15 +26,4 @@ public final class MappedList<T extends java.lang.Object, R extends java.lang.Ob
     public int getSize() {
         return 0;
     }
-
-    @org.jetbrains.annotations.NotNull()
-    public final java.util.List<T> getList() {
-        return null;
-    }
-
-    public MappedList(@org.jetbrains.annotations.NotNull()
-    java.util.List<? extends T> list, @org.jetbrains.annotations.NotNull()
-    kotlin.jvm.functions.Function1<? super T, ? extends R> function) {
-        super();
-    }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/genericRawSignatures.txt b/plugins/kapt3/kapt3-compiler/testData/converter/genericRawSignatures.txt
index e8a57c8a56a..63525d2d679 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/genericRawSignatures.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/genericRawSignatures.txt
@@ -3,6 +3,10 @@ import java.lang.System;
 @kotlin.Metadata()
 public final class GenericRawSignatures {
 
+    public GenericRawSignatures() {
+        super();
+    }
+
     @org.jetbrains.annotations.Nullable()
     public final <T extends java.lang.Object>T genericFun() {
         return null;
@@ -12,8 +16,4 @@ public final class GenericRawSignatures {
     public final java.lang.String nonGenericFun() {
         return null;
     }
-
-    public GenericRawSignatures() {
-        super();
-    }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.txt b/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.txt
index 2cc611e3767..f84e05a9a50 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.txt
@@ -54,14 +54,14 @@ public final class MyClass<M1 extends java.lang.Object, M2 extends java.lang.Obj
     @org.jetbrains.annotations.Nullable()
     private final java.util.List<java.util.Map<java.lang.String, M1>> fld = null;
 
+    public MyClass() {
+        super();
+    }
+
     @org.jetbrains.annotations.Nullable()
     public final java.util.List<java.util.Map<java.lang.String, M1>> getFld() {
         return null;
     }
-
-    public MyClass() {
-        super();
-    }
 }
 
 ////////////////////
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt
index 5becde66c24..660f293bc78 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt
@@ -7,6 +7,10 @@ public final class Test {
     @org.jetbrains.annotations.NotNull()
     private final java.lang.String nonIgnoredProperty = "";
 
+    public Test() {
+        super();
+    }
+
     public final void nonIgnoredFun() {
     }
 
@@ -14,8 +18,4 @@ public final class Test {
     public final java.lang.String getNonIgnoredProperty() {
         return null;
     }
-
-    public Test() {
-        super();
-    }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.txt b/plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.txt
index c8072353f9f..6d11ec00330 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.txt
@@ -22,6 +22,11 @@ public final class Cl {
     @org.jetbrains.annotations.NotNull()
     private java.lang.String name;
 
+    public Cl(@org.jetbrains.annotations.NotNull()
+    java.lang.String name) {
+        super();
+    }
+
     @org.jetbrains.annotations.NotNull()
     public final java.lang.String getName() {
         return null;
@@ -30,11 +35,6 @@ public final class Cl {
     public final void setName(@org.jetbrains.annotations.NotNull()
     java.lang.String p0) {
     }
-
-    public Cl(@org.jetbrains.annotations.NotNull()
-    java.lang.String name) {
-        super();
-    }
 }
 
 ////////////////////
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.txt b/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.txt
index 40e01b3c9e5..8b89f115836 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.txt
@@ -3,13 +3,13 @@ import java.lang.System;
 @kotlin.Metadata()
 public abstract class BaseClass {
 
-    @org.jetbrains.annotations.NotNull()
-    public abstract Result doJob();
-
     public BaseClass(@org.jetbrains.annotations.NotNull()
     Context context, int num, boolean bool) {
         super();
     }
+
+    @org.jetbrains.annotations.NotNull()
+    public abstract Result doJob();
 }
 
 ////////////////////
@@ -29,16 +29,16 @@ import java.lang.System;
 @kotlin.Metadata()
 public final class Inheritor extends BaseClass {
 
+    public Inheritor(@org.jetbrains.annotations.NotNull()
+    Context context) {
+        super(null, 0, false);
+    }
+
     @org.jetbrains.annotations.NotNull()
     @java.lang.Override()
     public Result doJob() {
         return null;
     }
-
-    public Inheritor(@org.jetbrains.annotations.NotNull()
-    Context context) {
-        super(null, 0, false);
-    }
 }
 
 ////////////////////
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.txt b/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.txt
index adbce593298..2af3842137d 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.txt
@@ -9,14 +9,9 @@ public final class Cl {
     @org.jetbrains.annotations.NotNull()
     private final java.lang.String a = null;
 
-    @org.jetbrains.annotations.NotNull()
-    public final java.lang.String getA() {
-        return null;
-    }
-
     @java.lang.Override()
-    public java.lang.String toString() {
-        return null;
+    public boolean equals(java.lang.Object p0) {
+        return false;
     }
 
     @java.lang.Override()
@@ -25,7 +20,12 @@ public final class Cl {
     }
 
     @java.lang.Override()
-    public boolean equals(java.lang.Object p0) {
-        return false;
+    public java.lang.String toString() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getA() {
+        return null;
     }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.txt b/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.txt
index c8e28d7075d..cf13a91ae8a 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.txt
@@ -57,6 +57,10 @@ public final class B {
     @org.jetbrains.annotations.NotNull()
     private final java.lang.String d = "";
 
+    public B() {
+        super();
+    }
+
     @org.jetbrains.annotations.NotNull()
     public final java.lang.String getA() {
         return null;
@@ -76,8 +80,4 @@ public final class B {
     public final java.lang.String getD() {
         return null;
     }
-
-    public B() {
-        super();
-    }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.txt
index 2b92efc2804..1faa41a7b2c 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.txt
@@ -7,6 +7,15 @@ public final class State {
     @org.jetbrains.annotations.NotNull()
     private final java.lang.String someString = null;
 
+    public State(int someInt, long someLong) {
+        super();
+    }
+
+    public State(int someInt, long someLong, @org.jetbrains.annotations.NotNull()
+    java.lang.String someString) {
+        super();
+    }
+
     public final int getSomeInt() {
         return 0;
     }
@@ -19,15 +28,6 @@ public final class State {
     public final java.lang.String getSomeString() {
         return null;
     }
-
-    public State(int someInt, long someLong, @org.jetbrains.annotations.NotNull()
-    java.lang.String someString) {
-        super();
-    }
-
-    public State(int someInt, long someLong) {
-        super();
-    }
 }
 
 ////////////////////
@@ -42,8 +42,20 @@ public final class State2 {
     @org.jetbrains.annotations.NotNull()
     public final java.lang.String someString = null;
 
-    public final int test(int someInt, long someLong, @org.jetbrains.annotations.NotNull()
+    public State2(int someInt) {
+        super();
+    }
+
+    public State2(int someInt, long someLong) {
+        super();
+    }
+
+    public State2(int someInt, long someLong, @org.jetbrains.annotations.NotNull()
     java.lang.String someString) {
+        super();
+    }
+
+    public final int test(int someInt) {
         return 0;
     }
 
@@ -51,7 +63,8 @@ public final class State2 {
         return 0;
     }
 
-    public final int test(int someInt) {
+    public final int test(int someInt, long someLong, @org.jetbrains.annotations.NotNull()
+    java.lang.String someString) {
         return 0;
     }
 
@@ -61,17 +74,4 @@ public final class State2 {
 
     public final void methodWithoutArgs() {
     }
-
-    public State2(int someInt, long someLong, @org.jetbrains.annotations.NotNull()
-    java.lang.String someString) {
-        super();
-    }
-
-    public State2(int someInt, long someLong) {
-        super();
-    }
-
-    public State2(int someInt) {
-        super();
-    }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt
index f92ab58e9c3..61b7d421d7f 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt
@@ -14,15 +14,15 @@ public abstract interface FooComponent {
     @kotlin.Metadata()
     public static final class Companion {
 
+        private Companion() {
+            super();
+        }
+
         @org.jetbrains.annotations.NotNull()
         public final java.lang.String create(@org.jetbrains.annotations.NotNull()
         java.lang.String context) {
             return null;
         }
-
-        private Companion() {
-            super();
-        }
     }
 }
 
@@ -33,13 +33,13 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class JvmStaticTest {
-    public final byte three = (byte)3;
-    public final char d = 'D';
+    @org.jetbrains.annotations.NotNull()
+    public static final JvmStaticTest.Companion Companion = null;
     private static final int one = 1;
     public static final int two = 2;
     public static final char c = 'C';
-    @org.jetbrains.annotations.NotNull()
-    public static final JvmStaticTest.Companion Companion = null;
+    public final byte three = (byte)3;
+    public final char d = 'D';
 
     public JvmStaticTest() {
         super();
@@ -52,16 +52,16 @@ public final class JvmStaticTest {
     @kotlin.Metadata()
     public static final class Companion {
 
-        @java.lang.Deprecated()
-        public static void getOne$annotations() {
+        private Companion() {
+            super();
         }
 
         public final int getOne() {
             return 0;
         }
 
-        private Companion() {
-            super();
+        @java.lang.Deprecated()
+        public static void getOne$annotations() {
         }
     }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt
index 74e088d08fa..72350b059c0 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt
@@ -2,10 +2,10 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class Test {
-    @org.jetbrains.annotations.NotNull()
-    private static final java.lang.String test = "";
     @org.jetbrains.annotations.NotNull()
     public static final Test.A A = null;
+    @org.jetbrains.annotations.NotNull()
+    private static final java.lang.String test = "";
 
     public Test() {
         super();
@@ -19,8 +19,8 @@ public final class Test {
     @kotlin.Metadata()
     public static final class A {
 
-        @java.lang.Deprecated()
-        public static void getTest$annotations() {
+        private A() {
+            super();
         }
 
         @org.jetbrains.annotations.NotNull()
@@ -28,8 +28,8 @@ public final class Test {
             return null;
         }
 
-        private A() {
-            super();
+        @java.lang.Deprecated()
+        public static void getTest$annotations() {
         }
     }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.txt
index 3bf3b1ad424..0110f7603f3 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.txt
@@ -3,14 +3,14 @@ import java.lang.System;
 @kotlin.Metadata()
 public final class Outer {
 
-    public final void nonAbstract(@org.jetbrains.annotations.NotNull()
-    java.lang.String s, int i) {
-    }
-
     public Outer() {
         super();
     }
 
+    public final void nonAbstract(@org.jetbrains.annotations.NotNull()
+    java.lang.String s, int i) {
+    }
+
     @kotlin.Metadata()
     final class Inner {
         @org.jetbrains.annotations.NotNull()
@@ -18,6 +18,12 @@ public final class Outer {
         @org.jetbrains.annotations.NotNull()
         private final java.lang.String bar = null;
 
+        public Inner(@org.jetbrains.annotations.NotNull()
+        java.lang.String foo, @org.jetbrains.annotations.NotNull()
+        java.lang.String bar) {
+            super();
+        }
+
         @org.jetbrains.annotations.NotNull()
         public final java.lang.String getFoo() {
             return null;
@@ -27,12 +33,6 @@ public final class Outer {
         public final java.lang.String getBar() {
             return null;
         }
-
-        public Inner(@org.jetbrains.annotations.NotNull()
-        java.lang.String foo, @org.jetbrains.annotations.NotNull()
-        java.lang.String bar) {
-            super();
-        }
     }
 
     @kotlin.Metadata()
@@ -42,6 +42,12 @@ public final class Outer {
         @org.jetbrains.annotations.NotNull()
         private final java.lang.String bar = null;
 
+        public Nested(@org.jetbrains.annotations.NotNull()
+        java.lang.String foo, @org.jetbrains.annotations.NotNull()
+        java.lang.String bar) {
+            super();
+        }
+
         @org.jetbrains.annotations.NotNull()
         public final java.lang.String getFoo() {
             return null;
@@ -51,11 +57,5 @@ public final class Outer {
         public final java.lang.String getBar() {
             return null;
         }
-
-        public Nested(@org.jetbrains.annotations.NotNull()
-        java.lang.String foo, @org.jetbrains.annotations.NotNull()
-        java.lang.String bar) {
-            super();
-        }
     }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt17567.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt17567.txt
index 3f272ea4f5b..4a865d9f846 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/kt17567.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt17567.txt
@@ -7,13 +7,13 @@ public final class MutableEntry<K extends java.lang.Object, V extends java.lang.
     private final java.util.Map<K, V> internal = null;
     private final K key = null;
 
-    @java.lang.Override()
-    public K getKey() {
-        return null;
-    }
-
     public MutableEntry(@org.jetbrains.annotations.NotNull()
     java.util.Map<K, V> internal, K key, V value) {
         super();
     }
+
+    @java.lang.Override()
+    public K getKey() {
+        return null;
+    }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt18791.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt18791.txt
index 88d1bf86686..13e41a64a9a 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/kt18791.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt18791.txt
@@ -89,10 +89,14 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class JJ {
-    @org.jetbrains.annotations.NotNull()
-    private static final java.lang.String b = null;
     @org.jetbrains.annotations.NotNull()
     public static final app.JJ INSTANCE = null;
+    @org.jetbrains.annotations.NotNull()
+    private static final java.lang.String b = null;
+
+    private JJ() {
+        super();
+    }
 
     @org.jetbrains.annotations.NotNull()
     public final java.lang.String getB() {
@@ -103,10 +107,6 @@ public final class JJ {
     public final java.lang.String c() {
         return null;
     }
-
-    private JJ() {
-        super();
-    }
 }
 
 ////////////////////
@@ -136,9 +136,8 @@ public final class MyActivity {
     public int propE = app.B.id.textView;
     private final int propF = 0;
 
-    @Bind(id = lib.R.id.textView)
-    @java.lang.Deprecated()
-    public static void getA$annotations() {
+    public MyActivity() {
+        super();
     }
 
     public final int getA() {
@@ -147,16 +146,16 @@ public final class MyActivity {
 
     @Bind(id = lib.R.id.textView)
     @java.lang.Deprecated()
-    public static void getB$annotations() {
+    public static void getA$annotations() {
     }
 
     public final int getB() {
         return 0;
     }
 
-    @Bind(id = app.R.layout.mainActivity)
+    @Bind(id = lib.R.id.textView)
     @java.lang.Deprecated()
-    public static void getC$annotations() {
+    public static void getB$annotations() {
     }
 
     public final int getC() {
@@ -165,20 +164,29 @@ public final class MyActivity {
 
     @Bind(id = app.R.layout.mainActivity)
     @java.lang.Deprecated()
-    public static void getD$annotations() {
+    public static void getC$annotations() {
     }
 
     public final int getD() {
         return 0;
     }
 
+    @Bind(id = app.R.layout.mainActivity)
+    @java.lang.Deprecated()
+    public static void getD$annotations() {
+    }
+
+    public final int getE() {
+        return 0;
+    }
+
     @Anno(a1 = app.B.a1, a2 = app.B.a2, a3 = app.B.a3, a4 = app.B.a4, a5 = app.B.a5, a6 = app.B.a6, a7 = app.B.a7, a8 = app.B.a8, a9 = "A")
     @Bind(id = app.R2.layout.mainActivity)
     @java.lang.Deprecated()
     public static void getE$annotations() {
     }
 
-    public final int getE() {
+    public final int getF() {
         return 0;
     }
 
@@ -187,10 +195,6 @@ public final class MyActivity {
     public static void getF$annotations() {
     }
 
-    public final int getF() {
-        return 0;
-    }
-
     @Bind(id = lib.R.id.textView)
     public final void foo() {
     }
@@ -230,10 +234,6 @@ public final class MyActivity {
     public final int getPropF() {
         return 0;
     }
-
-    public MyActivity() {
-        super();
-    }
 }
 
 ////////////////////
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.txt
index b3fbf47e87c..f2b7d34d2a1 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.txt
@@ -2,30 +2,30 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class Foo {
+    private final java.lang.String string = null;
     @org.jetbrains.annotations.NotNull()
     private final Foo.Bar bar = null;
-    private final java.lang.String string = null;
-
-    @org.jetbrains.annotations.NotNull()
-    public final Foo.Bar getBar() {
-        return null;
-    }
 
     public Foo(@org.jetbrains.annotations.NotNull()
     java.lang.String string) {
         super();
     }
 
+    @org.jetbrains.annotations.NotNull()
+    public final Foo.Bar getBar() {
+        return null;
+    }
+
     @kotlin.Metadata()
     public static final class Bar {
-        @org.jetbrains.annotations.NotNull()
-        private final java.util.ArrayList<Foo.Bar.Bar> bars = null;
         @org.jetbrains.annotations.NotNull()
         private final java.lang.String string = null;
-
         @org.jetbrains.annotations.NotNull()
-        public final java.util.ArrayList<Foo.Bar.Bar> getBars() {
-            return null;
+        private final java.util.ArrayList<Foo.Bar.Bar> bars = null;
+
+        public Bar(@org.jetbrains.annotations.NotNull()
+        java.lang.String string) {
+            super();
         }
 
         @org.jetbrains.annotations.NotNull()
@@ -33,9 +33,9 @@ public final class Foo {
             return null;
         }
 
-        public Bar(@org.jetbrains.annotations.NotNull()
-        java.lang.String string) {
-            super();
+        @org.jetbrains.annotations.NotNull()
+        public final java.util.ArrayList<Foo.Bar.Bar> getBars() {
+            return null;
         }
     }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt25071.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt25071.txt
index d3065ba81c7..2010763a1d6 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/kt25071.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt25071.txt
@@ -9,6 +9,10 @@ public final class StaticImport {
     private final kapt.StaticMethod<java.lang.String> m = null;
     private final int y = 0;
 
+    public StaticImport() {
+        super();
+    }
+
     public final java.util.Collection<java.lang.String> getX() {
         return null;
     }
@@ -24,10 +28,6 @@ public final class StaticImport {
     public final int getY() {
         return 0;
     }
-
-    public StaticImport() {
-        super();
-    }
 }
 
 ////////////////////
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt27126.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt27126.txt
index 9b1ef49ee4a..7bcb6b6b5a7 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/kt27126.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt27126.txt
@@ -5,6 +5,11 @@ import java.lang.System;
 @kotlin.Metadata()
 public abstract class BundleProperty<AA extends java.lang.Object> extends test.NullableBundleProperty<AA> {
 
+    public BundleProperty(@org.jetbrains.annotations.Nullable()
+    java.lang.String key) {
+        super(null);
+    }
+
     @java.lang.Override()
     public final void setValue(@org.jetbrains.annotations.NotNull()
     java.lang.Object thisRef, @org.jetbrains.annotations.NotNull()
@@ -29,11 +34,6 @@ public abstract class BundleProperty<AA extends java.lang.Object> extends test.N
     public abstract void setValue(@org.jetbrains.annotations.NotNull()
     java.lang.Object bundle, @org.jetbrains.annotations.NotNull()
     java.lang.String key, AA value);
-
-    public BundleProperty(@org.jetbrains.annotations.Nullable()
-    java.lang.String key) {
-        super(null);
-    }
 }
 
 ////////////////////
@@ -67,6 +67,11 @@ import java.lang.System;
 public abstract class NullableBundleProperty<EE extends java.lang.Object> implements kotlin.properties.ReadWriteProperty<java.lang.Object, EE> {
     private final java.lang.String key = null;
 
+    public NullableBundleProperty(@org.jetbrains.annotations.Nullable()
+    java.lang.String key) {
+        super();
+    }
+
     private final java.lang.String toKey(kotlin.reflect.KProperty<?> $this$toKey) {
         return null;
     }
@@ -95,9 +100,4 @@ public abstract class NullableBundleProperty<EE extends java.lang.Object> implem
     java.lang.Object bundle, @org.jetbrains.annotations.NotNull()
     java.lang.String key, @org.jetbrains.annotations.Nullable()
     EE value);
-
-    public NullableBundleProperty(@org.jetbrains.annotations.Nullable()
-    java.lang.String key) {
-        super();
-    }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt34569.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt34569.txt
index 10fbe967c0f..482d0e87194 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/kt34569.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt34569.txt
@@ -3,11 +3,11 @@ import java.lang.System;
 @kotlin.Metadata()
 public final class T implements java.lang.Runnable {
 
-    @java.lang.Override()
-    public void run() {
-    }
-
     public T() {
         super();
     }
+
+    @java.lang.Override()
+    public void run() {
+    }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/lazyProperty.txt b/plugins/kapt3/kapt3-compiler/testData/converter/lazyProperty.txt
index c94dce768d6..5069d02bbc1 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/lazyProperty.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/lazyProperty.txt
@@ -7,6 +7,10 @@ public final class Foo {
     private final kotlin.Lazy baz$delegate = null;
     private final kotlin.Lazy generic1$delegate = null;
 
+    public Foo() {
+        super();
+    }
+
     private final java.lang.Runnable getFoo() {
         return null;
     }
@@ -22,10 +26,6 @@ public final class Foo {
     private final GenericIntf<java.lang.CharSequence> getGeneric1() {
         return null;
     }
-
-    public Foo() {
-        super();
-    }
 }
 
 ////////////////////
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/maxErrorCount.txt b/plugins/kapt3/kapt3-compiler/testData/converter/maxErrorCount.txt
index e762ee7db60..238868dcb69 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/maxErrorCount.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/maxErrorCount.txt
@@ -3,12 +3,12 @@ import kotlin.reflect.KClass;
 @kotlin.Metadata()
 public final class Test {
 
+    public Test() {
+        super();
+    }
+
     public final void a(@org.jetbrains.annotations.NotNull()
     ABC a, @org.jetbrains.annotations.NotNull()
     BCD b) {
     }
-
-    public Test() {
-        super();
-    }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/methodParameterNames.txt b/plugins/kapt3/kapt3-compiler/testData/converter/methodParameterNames.txt
index 9891cc7ef2a..c8a55f8c834 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/methodParameterNames.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/methodParameterNames.txt
@@ -3,6 +3,10 @@ import java.lang.System;
 @kotlin.Metadata()
 public abstract class Cls {
 
+    public Cls() {
+        super();
+    }
+
     public abstract void foo(@org.jetbrains.annotations.NotNull()
     java.lang.String abc);
 
@@ -10,10 +14,6 @@ public abstract class Cls {
     public final java.lang.String bar(int bcd) {
         return null;
     }
-
-    public Cls() {
-        super();
-    }
 }
 
 ////////////////////
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.txt b/plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.txt
index 73e9d91ae0d..dad68ddd0ba 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.txt
@@ -4,6 +4,10 @@ import java.lang.System;
 public final class CrashMe {
     private final int resources = 1;
 
+    public CrashMe() {
+        super();
+    }
+
     public final int getResources() {
         return 0;
     }
@@ -12,8 +16,4 @@ public final class CrashMe {
     public final java.lang.String getResources() {
         return null;
     }
-
-    public CrashMe() {
-        super();
-    }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt
index f54ffd3f1da..8f1af9fe7bd 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt
@@ -33,6 +33,10 @@ public final class Modifiers {
     @org.jetbrains.annotations.NotNull()
     private volatile java.lang.String volatileField = "";
 
+    public Modifiers() {
+        super();
+    }
+
     @org.jetbrains.annotations.NotNull()
     public final java.lang.String getTransientField() {
         return null;
@@ -51,8 +55,7 @@ public final class Modifiers {
     }
 
     @org.jetbrains.annotations.NotNull()
-    public final java.lang.String overloads(@org.jetbrains.annotations.NotNull()
-    java.lang.String a, int n) {
+    public final java.lang.String overloads() {
         return null;
     }
 
@@ -63,13 +66,10 @@ public final class Modifiers {
     }
 
     @org.jetbrains.annotations.NotNull()
-    public final java.lang.String overloads() {
+    public final java.lang.String overloads(@org.jetbrains.annotations.NotNull()
+    java.lang.String a, int n) {
         return null;
     }
-
-    public Modifiers() {
-        super();
-    }
 }
 
 ////////////////////
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/multifileClass.txt b/plugins/kapt3/kapt3-compiler/testData/converter/multifileClass.txt
index c30ab5f953f..0229ecb99f8 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/multifileClass.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/multifileClass.txt
@@ -9,10 +9,10 @@ public final class M1 {
         super();
     }
 
-    public static final void bar() {
+    public static final void foo() {
     }
 
-    public static final void foo() {
+    public static final void bar() {
     }
 }
 
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.txt
index cc890eed4ce..bf711ec1789 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.txt
@@ -5,6 +5,10 @@ public final class A {
     @org.jetbrains.annotations.Nullable()
     private final A x = null;
 
+    public A() {
+        super();
+    }
+
     @org.jetbrains.annotations.Nullable()
     public final A getX() {
         return null;
@@ -17,10 +21,6 @@ public final class A {
         return null;
     }
 
-    public A() {
-        super();
-    }
-
     @kotlin.Metadata()
     public static abstract interface B {
 
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt
index 595a64167ff..613554429f4 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt
@@ -89,16 +89,16 @@ public final class Experiment {
     @Experiment.Type()
     public static final class Group {
 
-        public Group(@org.jetbrains.annotations.NotNull()
-        java.lang.String s) {
-            super();
-        }
-
         @org.jetbrains.annotations.NotNull()
         public final Experiment.Group copy(@org.jetbrains.annotations.NotNull()
         java.lang.String s) {
             return null;
         }
+
+        public Group(@org.jetbrains.annotations.NotNull()
+        java.lang.String s) {
+            super();
+        }
     }
 }
 
@@ -245,6 +245,16 @@ public final class Test1 extends Foo.Bar implements IFoo.IBar, IFoo.IBar.IZoo {
     @org.jetbrains.annotations.NotNull()
     private final Foo.Bar.Zoo zoo = null;
 
+    public Test1(@org.jetbrains.annotations.NotNull()
+    Foo.Bar.Zoo zoo) {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final Foo.Bar.Zoo getZoo() {
+        return null;
+    }
+
     @org.jetbrains.annotations.NotNull()
     public final java.lang.Thread.State a() {
         return null;
@@ -254,14 +264,4 @@ public final class Test1 extends Foo.Bar implements IFoo.IBar, IFoo.IBar.IZoo {
     JavaClass.Foo foo, @org.jetbrains.annotations.NotNull()
     JavaClass.Foo.Bar bar) {
     }
-
-    @org.jetbrains.annotations.NotNull()
-    public final Foo.Bar.Zoo getZoo() {
-        return null;
-    }
-
-    public Test1(@org.jetbrains.annotations.NotNull()
-    Foo.Bar.Zoo zoo) {
-        super();
-    }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt
index 4b911cb1093..2360182ec51 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt
@@ -92,16 +92,16 @@ public final class Experiment {
     @test.Experiment.Type()
     public static final class Group {
 
-        public Group(@org.jetbrains.annotations.NotNull()
-        java.lang.String s) {
-            super();
-        }
-
         @org.jetbrains.annotations.NotNull()
         public final test.Experiment.Group copy(@org.jetbrains.annotations.NotNull()
         java.lang.String s) {
             return null;
         }
+
+        public Group(@org.jetbrains.annotations.NotNull()
+        java.lang.String s) {
+            super();
+        }
     }
 }
 
@@ -253,6 +253,16 @@ public final class Test1 extends test.Foo.Bar implements test.IFoo.IBar, test.IF
     @org.jetbrains.annotations.NotNull()
     private final test.Foo.Bar.Zoo zoo = null;
 
+    public Test1(@org.jetbrains.annotations.NotNull()
+    test.Foo.Bar.Zoo zoo) {
+        super();
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final test.Foo.Bar.Zoo getZoo() {
+        return null;
+    }
+
     @org.jetbrains.annotations.NotNull()
     public final java.lang.Thread.State a() {
         return null;
@@ -262,14 +272,4 @@ public final class Test1 extends test.Foo.Bar implements test.IFoo.IBar, test.IF
     test.JavaClass.Foo foo, @org.jetbrains.annotations.NotNull()
     test.JavaClass.Foo.Bar bar) {
     }
-
-    @org.jetbrains.annotations.NotNull()
-    public final test.Foo.Bar.Zoo getZoo() {
-        return null;
-    }
-
-    public Test1(@org.jetbrains.annotations.NotNull()
-    test.Foo.Bar.Zoo zoo) {
-        super();
-    }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.txt
index 0c835f604aa..48b215d42b8 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.txt
@@ -3,6 +3,8 @@ import java.lang.System;
 @kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"})
 @kotlin.Metadata()
 public final class NonExistentType {
+    @org.jetbrains.annotations.NotNull()
+    public static final NonExistentType INSTANCE = null;
     @org.jetbrains.annotations.Nullable()
     private static final ABCDEF a = null;
     @org.jetbrains.annotations.Nullable()
@@ -11,8 +13,10 @@ public final class NonExistentType {
     private static final Function1<ABCDEF, kotlin.Unit> c = null;
     @org.jetbrains.annotations.Nullable()
     private static final ABCDEF<java.lang.String, Function1<java.util.List<ABCDEF>, kotlin.Unit>> d = null;
-    @org.jetbrains.annotations.NotNull()
-    public static final NonExistentType INSTANCE = null;
+
+    private NonExistentType() {
+        super();
+    }
 
     @org.jetbrains.annotations.Nullable()
     public final ABCDEF getA() {
@@ -46,10 +50,6 @@ public final class NonExistentType {
     java.lang.String s) {
         return null;
     }
-
-    private NonExistentType() {
-        super();
-    }
 }
 
 ////////////////////
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt
index 660b3b0dcca..24062b67531 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt
@@ -77,6 +77,10 @@ public final class Test<G extends java.lang.Object> {
     public java.util.List<java.util.List<java.util.List<java.util.List<java.util.List<java.util.List<java.util.List<java.util.List<java.util.List<ABC>>>>>>>>> o10;
     public java.util.Calendar.Builder p;
 
+    public Test() {
+        super();
+    }
+
     @org.jetbrains.annotations.NotNull()
     public final ABC getA() {
         return null;
@@ -289,10 +293,6 @@ public final class Test<G extends java.lang.Object> {
     MyType<T> $this$f5) {
         return null;
     }
-
-    public Test() {
-        super();
-    }
 }
 
 ////////////////////
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.txt
index b3e1e450e83..e59b292bb5f 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.txt
@@ -12,6 +12,8 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class NonExistentType {
+    @org.jetbrains.annotations.NotNull()
+    public static final NonExistentType INSTANCE = null;
     @org.jetbrains.annotations.Nullable()
     private static final error.NonExistentClass a = null;
     @org.jetbrains.annotations.Nullable()
@@ -26,8 +28,10 @@ public final class NonExistentType {
     public static error.NonExistentClass coocoo21;
     public static error.NonExistentClass coocoo3;
     public static error.NonExistentClass coocoo31;
-    @org.jetbrains.annotations.NotNull()
-    public static final NonExistentType INSTANCE = null;
+
+    private NonExistentType() {
+        super();
+    }
 
     @org.jetbrains.annotations.Nullable()
     public final error.NonExistentClass getA() {
@@ -115,10 +119,6 @@ public final class NonExistentType {
     java.lang.String s) {
         return null;
     }
-
-    private NonExistentType() {
-        super();
-    }
 }
 
 ////////////////////
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.txt b/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.txt
index d662b8fdabc..94d1e56a9b7 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.txt
@@ -2,6 +2,8 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class PrimitiveTypes {
+    @org.jetbrains.annotations.NotNull()
+    public static final PrimitiveTypes INSTANCE = null;
     public static final boolean booleanFalse = false;
     public static final boolean booleanTrue = true;
     public static final int int0 = 0;
@@ -36,8 +38,10 @@ public final class PrimitiveTypes {
     public static final java.lang.String stringQuotes = "quotes \" \'\'quotes";
     @org.jetbrains.annotations.NotNull()
     public static final java.lang.String stringRN = "\r\n";
-    @org.jetbrains.annotations.NotNull()
-    public static final PrimitiveTypes INSTANCE = null;
+
+    private PrimitiveTypes() {
+        super();
+    }
 
     public final float getFloatMaxValue() {
         return 0.0F;
@@ -70,8 +74,4 @@ public final class PrimitiveTypes {
     public final double getDoubleNegativeInfinity() {
         return 0.0;
     }
-
-    private PrimitiveTypes() {
-        super();
-    }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt b/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt
index 4452a93f9e6..be5c8274a2a 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt
@@ -27,10 +27,8 @@ public final class Test {
     @org.jetbrains.annotations.NotNull()
     private final java.lang.String prop = "A";
 
-    @Anno2()
-    @Anno()
-    @java.lang.Deprecated()
-    public static void getProp$annotations() {
+    public Test() {
+        super();
     }
 
     @org.jetbrains.annotations.NotNull()
@@ -38,7 +36,9 @@ public final class Test {
         return null;
     }
 
-    public Test() {
-        super();
+    @Anno2()
+    @Anno()
+    @java.lang.Deprecated()
+    public static void getProp$annotations() {
     }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/recentlyNullable.txt b/plugins/kapt3/kapt3-compiler/testData/converter/recentlyNullable.txt
index 60e2db544c7..2a72982cfb7 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/recentlyNullable.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/recentlyNullable.txt
@@ -28,16 +28,16 @@ public final class KBox implements androidx.annotation.Box {
     @org.jetbrains.annotations.NotNull()
     private final androidx.annotation.Box delegate = null;
 
-    @org.jetbrains.annotations.NotNull()
-    public final androidx.annotation.Box getDelegate() {
-        return null;
-    }
-
     public KBox(@org.jetbrains.annotations.NotNull()
     androidx.annotation.Box delegate) {
         super();
     }
 
+    @org.jetbrains.annotations.NotNull()
+    public final androidx.annotation.Box getDelegate() {
+        return null;
+    }
+
     @androidx.annotation.RecentlyNullable()
     @java.lang.Override()
     public java.lang.String foo() {
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt b/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt
index 75af5872492..5f40685c50e 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt
@@ -186,11 +186,8 @@ public final class Test {
     @org.jetbrains.annotations.NotNull()
     private final java.lang.String value = "";
 
-    @lib.Anno(value = "3", construct = {"C"})
-    @lib.Anno(value = "2", construct = {"A", "B"})
-    @lib.Anno(value = "1")
-    @java.lang.Deprecated()
-    public static void getValue$annotations() {
+    public Test() {
+        super();
     }
 
     @org.jetbrains.annotations.NotNull()
@@ -198,8 +195,11 @@ public final class Test {
         return null;
     }
 
-    public Test() {
-        super();
+    @lib.Anno(value = "3", construct = {"C"})
+    @lib.Anno(value = "2", construct = {"A", "B"})
+    @lib.Anno(value = "1")
+    @java.lang.Deprecated()
+    public static void getValue$annotations() {
     }
 }
 
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt
index eac1a965387..92baa0075c2 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt
@@ -20,13 +20,13 @@ public enum StrangeEnum {
     @org.jetbrains.annotations.NotNull()
     private final java.lang.String size = null;
 
+    StrangeEnum(java.lang.String size) {
+    }
+
     @org.jetbrains.annotations.NotNull()
     public final java.lang.String getSize() {
         return null;
     }
-
-    StrangeEnum(java.lang.String size) {
-    }
 }
 
 ////////////////////
@@ -38,6 +38,10 @@ import java.lang.System;
 public final class Test {
     public java.lang.String simpleName;
 
+    public Test() {
+        super();
+    }
+
     @org.jetbrains.annotations.NotNull()
     public final java.lang.String getSimpleName() {
         return null;
@@ -56,8 +60,4 @@ public final class Test {
     java.lang.String a, @org.jetbrains.annotations.NotNull()
     java.lang.String p1_949560896) {
     }
-
-    public Test() {
-        super();
-    }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata.txt b/plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata.txt
index 030ac7a8089..cebb5bd4334 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata.txt
@@ -2,13 +2,13 @@ import java.lang.System;
 
 public abstract class BaseClass {
 
-    @org.jetbrains.annotations.NotNull()
-    public abstract Result doJob();
-
     public BaseClass(@org.jetbrains.annotations.NotNull()
     Context context, int num, boolean bool) {
         super();
     }
+
+    @org.jetbrains.annotations.NotNull()
+    public abstract Result doJob();
 }
 
 ////////////////////
@@ -26,16 +26,16 @@ import java.lang.System;
 
 public final class Inheritor extends BaseClass {
 
+    public Inheritor(@org.jetbrains.annotations.NotNull()
+    Context context) {
+        super(null, 0, false);
+    }
+
     @org.jetbrains.annotations.NotNull()
     @java.lang.Override()
     public Result doJob() {
         return null;
     }
-
-    public Inheritor(@org.jetbrains.annotations.NotNull()
-    Context context) {
-        super(null, 0, false);
-    }
 }
 
 ////////////////////
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/suspendErrorTypes.txt b/plugins/kapt3/kapt3-compiler/testData/converter/suspendErrorTypes.txt
index 6eab8beba61..7a89cb4c587 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/suspendErrorTypes.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/suspendErrorTypes.txt
@@ -3,13 +3,13 @@ import java.lang.System;
 @kotlin.Metadata()
 public final class Foo {
 
+    public Foo() {
+        super();
+    }
+
     @org.jetbrains.annotations.Nullable()
     public final java.lang.Object a(@org.jetbrains.annotations.NotNull()
     kotlin.coroutines.Continuation<ABC> p0) {
         return null;
     }
-
-    public Foo() {
-        super();
-    }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.txt
index b929d8e55a1..cbcb744c731 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.txt
@@ -2,10 +2,14 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class Boo {
-    @org.jetbrains.annotations.NotNull()
-    private static final java.lang.String z = null;
     @org.jetbrains.annotations.NotNull()
     public static final Boo INSTANCE = null;
+    @org.jetbrains.annotations.NotNull()
+    private static final java.lang.String z = null;
+
+    private Boo() {
+        super();
+    }
 
     @org.jetbrains.annotations.NotNull()
     public final java.lang.String getZ() {
@@ -16,10 +20,6 @@ public final class Boo {
     public final java.lang.String foo() {
         return null;
     }
-
-    private Boo() {
-        super();
-    }
 }
 
 ////////////////////
@@ -29,6 +29,8 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class Foo {
+    @org.jetbrains.annotations.NotNull()
+    public static final Foo INSTANCE = null;
     @org.jetbrains.annotations.NotNull()
     public static final java.lang.String aString = "foo";
     public static final int aInt = 3;
@@ -50,8 +52,10 @@ public final class Foo {
     private static final java.lang.String j = null;
     @org.jetbrains.annotations.NotNull()
     private static final java.lang.String k = null;
-    @org.jetbrains.annotations.NotNull()
-    public static final Foo INSTANCE = null;
+
+    private Foo() {
+        super();
+    }
 
     @org.jetbrains.annotations.NotNull()
     public final java.lang.String getBString() {
@@ -113,10 +117,6 @@ public final class Foo {
     public final java.lang.String getK() {
         return null;
     }
-
-    private Foo() {
-        super();
-    }
 }
 
 ////////////////////
@@ -152,6 +152,10 @@ public final class HavingState {
     @org.jetbrains.annotations.NotNull()
     private final kotlin.reflect.KClass<? extends java.lang.Object> anonymous = null;
 
+    public HavingState() {
+        super();
+    }
+
     @org.jetbrains.annotations.NotNull()
     public final State getState() {
         return null;
@@ -211,10 +215,6 @@ public final class HavingState {
     public final kotlin.reflect.KClass<? extends java.lang.Object> getAnonymous() {
         return null;
     }
-
-    public HavingState() {
-        super();
-    }
 }
 
 ////////////////////
diff --git a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/DefaultParameterValues.it.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/DefaultParameterValues.it.txt
index 17ea210a959..25db5a27ae6 100644
--- a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/DefaultParameterValues.it.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/DefaultParameterValues.it.txt
@@ -26,9 +26,8 @@ public final class User {
     @org.jetbrains.annotations.NotNull()
     private final java.lang.String name = "John";
 
-    @org.jetbrains.annotations.NotNull()
-    public final java.lang.String getName() {
-        return null;
+    public User() {
+        super();
     }
 
     public User(@org.jetbrains.annotations.NotNull()
@@ -36,7 +35,8 @@ public final class User {
         super();
     }
 
-    public User() {
-        super();
+    @org.jetbrains.annotations.NotNull()
+    public final java.lang.String getName() {
+        return null;
     }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.it.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.it.txt
index f4f708a7577..ba17fd805b6 100644
--- a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.it.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.it.txt
@@ -25,14 +25,14 @@ public final class Simple {
     @org.jetbrains.annotations.NotNull()
     public static final test.Simple.Companion Companion = null;
 
-    @MyAnnotation()
-    public final void myMethod() {
-    }
-
     public Simple() {
         super();
     }
 
+    @MyAnnotation()
+    public final void myMethod() {
+    }
+
     @kotlin.Metadata()
     public static final class NestedClass {
 
diff --git a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it.txt
index 9fb0cd3bbc5..4ad07e8b2c4 100644
--- a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it.txt
@@ -28,6 +28,15 @@ public final class State {
     @org.jetbrains.annotations.NotNull()
     private final java.lang.String someString = null;
 
+    public State(int someInt, long someLong) {
+        super();
+    }
+
+    public State(int someInt, long someLong, @org.jetbrains.annotations.NotNull()
+    java.lang.String someString) {
+        super();
+    }
+
     public final int getSomeInt() {
         return 0;
     }
@@ -40,13 +49,4 @@ public final class State {
     public final java.lang.String getSomeString() {
         return null;
     }
-
-    public State(int someInt, long someLong, @org.jetbrains.annotations.NotNull()
-    java.lang.String someString) {
-        super();
-    }
-
-    public State(int someInt, long someLong) {
-        super();
-    }
 }
diff --git a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.it.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.it.txt
index ce4fd90be1b..45c7f0d3344 100644
--- a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.it.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.it.txt
@@ -16,6 +16,10 @@ import java.lang.System;
 @kotlin.Metadata()
 public final class Simple {
 
+    public Simple() {
+        super();
+    }
+
     @MyAnnotation()
     public final void myMethod() {
     }
@@ -23,10 +27,6 @@ public final class Simple {
     public final int heavyMethod() {
         return 0;
     }
-
-    public Simple() {
-        super();
-    }
 }
 
 ////////////////////