diff --git a/input/src/test/scala-2.12/fix/scala213/Console212.scala b/input/src/test/scala-2.12/fix/scala213/Console212.scala
new file mode 100644
index 0000000..028a884
--- /dev/null
+++ b/input/src/test/scala-2.12/fix/scala213/Console212.scala
@@ -0,0 +1,21 @@
+/*
+rule = fix.scala213.Core
+*/
+package fix.scala213
+
+object Console212 {
+  def consoleReadBoolean                        = Console.readBoolean()
+  def consoleReadByte                           = Console.readByte()
+  def consoleReadChar                           = Console.readChar()
+  def consoleReadDouble                         = Console.readDouble()
+  def consoleReadFloat                          = Console.readFloat()
+  def consoleReadInt                            = Console.readInt()
+  def consoleReadLine                           = Console.readLine()
+  def consoleReadLine(text: String, args: Any*) = Console.readLine(text, args: _*)
+  def consoleReadLong                           = Console.readLong()
+  def consoleReadShort                          = Console.readShort()
+  def consoleReadf(format: String)              = Console.readf(format)
+  def consoleReadf1(format: String)             = Console.readf1(format)
+  def consoleReadf2(format: String)             = Console.readf2(format)
+  def consoleReadf3(format: String)             = Console.readf3(format)
+}
diff --git a/input/src/test/scala-2.12/fix/scala213/NullaryHashHash212.scala b/input/src/test/scala-2.12/fix/scala213/NullaryHashHash212.scala
new file mode 100644
index 0000000..8906144
--- /dev/null
+++ b/input/src/test/scala-2.12/fix/scala213/NullaryHashHash212.scala
@@ -0,0 +1,12 @@
+/*
+rule = fix.scala213.NullaryHashHash
+*/
+package fix.scala213
+
+object NullaryHashHash212 {
+  ("": Any).##()
+  ("": AnyRef).##()
+  ("": Object).##()
+  ("": String).##()
+  "".##()
+}
diff --git a/input/src/test/scala-2.12/fix/scala213/Varargs212.scala b/input/src/test/scala-2.12/fix/scala213/Varargs212.scala
new file mode 100644
index 0000000..b27a4f1
--- /dev/null
+++ b/input/src/test/scala-2.12/fix/scala213/Varargs212.scala
@@ -0,0 +1,8 @@
+/*
+rule = fix.scala213.Varargs
+*/
+package fix.scala213
+
+class Varargs212 {
+  def foo(xs: scala.collection.Seq[String]) = List(xs: _*)
+}
diff --git a/input/src/test/scala-2.12/fix/scala213/Core.scala b/input/src/test/scala/fix/scala213/Core.scala
similarity index 58%
rename from input/src/test/scala-2.12/fix/scala213/Core.scala
rename to input/src/test/scala/fix/scala213/Core.scala
index 5b9a267..c52e8a1 100644
--- a/input/src/test/scala-2.12/fix/scala213/Core.scala
+++ b/input/src/test/scala/fix/scala213/Core.scala
@@ -24,21 +24,6 @@ object Core {
   def arrayCopy2() = Platform.arraycopy(null, 0, null, 0, 0)
   def arrayCopy3() = scala.compat.Platform.arraycopy(null, 0, null, 0, 0)
 
-  def consoleReadBoolean                        = Console.readBoolean()
-  def consoleReadByte                           = Console.readByte()
-  def consoleReadChar                           = Console.readChar()
-  def consoleReadDouble                         = Console.readDouble()
-  def consoleReadFloat                          = Console.readFloat()
-  def consoleReadInt                            = Console.readInt()
-  def consoleReadLine                           = Console.readLine()
-  def consoleReadLine(text: String, args: Any*) = Console.readLine(text, args: _*)
-  def consoleReadLong                           = Console.readLong()
-  def consoleReadShort                          = Console.readShort()
-  def consoleReadf(format: String)              = Console.readf(format)
-  def consoleReadf1(format: String)             = Console.readf1(format)
-  def consoleReadf2(format: String)             = Console.readf2(format)
-  def consoleReadf3(format: String)             = Console.readf3(format)
-
   def arrow1: PartialFunction[Any, String] = {
     case 0      => "zero"
     case 1       ⇒ "one"
diff --git a/input/src/test/scala-2.12/fix/scala213/NullaryHashHash.scala b/input/src/test/scala/fix/scala213/NullaryHashHash.scala
similarity index 65%
rename from input/src/test/scala-2.12/fix/scala213/NullaryHashHash.scala
rename to input/src/test/scala/fix/scala213/NullaryHashHash.scala
index 570fc76..a24ed39 100644
--- a/input/src/test/scala-2.12/fix/scala213/NullaryHashHash.scala
+++ b/input/src/test/scala/fix/scala213/NullaryHashHash.scala
@@ -4,12 +4,6 @@ rule = fix.scala213.NullaryHashHash
 package fix.scala213
 
 object NullaryHashHash {
-  ("": Any).##()
-  ("": AnyRef).##()
-  ("": Object).##()
-  ("": String).##()
-  "".##()
-
   ("": Any).##
   ("": AnyRef).##
   ("": Object).##
diff --git a/input/src/test/scala-2.12/fix/scala213/Varargs.scala b/input/src/test/scala/fix/scala213/Varargs.scala
similarity index 79%
rename from input/src/test/scala-2.12/fix/scala213/Varargs.scala
rename to input/src/test/scala/fix/scala213/Varargs.scala
index 753a361..1221f09 100644
--- a/input/src/test/scala-2.12/fix/scala213/Varargs.scala
+++ b/input/src/test/scala/fix/scala213/Varargs.scala
@@ -4,7 +4,6 @@ rule = fix.scala213.Varargs
 package fix.scala213
 
 class Varargs {
-  def foo(xs: scala.collection.Seq[String]) = List(xs: _*)
   def bar = List(List(1,2,3): _*)
   def baz = List(scala.Seq(1,2,3): _*)
   // TODO
diff --git a/output/src/test/scala-2.12/fix/scala213/Console212.scala b/output/src/test/scala-2.12/fix/scala213/Console212.scala
new file mode 100644
index 0000000..1d99b5b
--- /dev/null
+++ b/output/src/test/scala-2.12/fix/scala213/Console212.scala
@@ -0,0 +1,19 @@
+package fix.scala213
+
+import scala.io.StdIn
+object Console212 {
+  def consoleReadBoolean                        = StdIn.readBoolean()
+  def consoleReadByte                           = StdIn.readByte()
+  def consoleReadChar                           = StdIn.readChar()
+  def consoleReadDouble                         = StdIn.readDouble()
+  def consoleReadFloat                          = StdIn.readFloat()
+  def consoleReadInt                            = StdIn.readInt()
+  def consoleReadLine                           = StdIn.readLine()
+  def consoleReadLine(text: String, args: Any*) = StdIn.readLine(text, args: _*)
+  def consoleReadLong                           = StdIn.readLong()
+  def consoleReadShort                          = StdIn.readShort()
+  def consoleReadf(format: String)              = StdIn.readf(format)
+  def consoleReadf1(format: String)             = StdIn.readf1(format)
+  def consoleReadf2(format: String)             = StdIn.readf2(format)
+  def consoleReadf3(format: String)             = StdIn.readf3(format)
+}
diff --git a/output/src/test/scala-2.12/fix/scala213/NullaryHashHash212.scala b/output/src/test/scala-2.12/fix/scala213/NullaryHashHash212.scala
new file mode 100644
index 0000000..fe1ad9c
--- /dev/null
+++ b/output/src/test/scala-2.12/fix/scala213/NullaryHashHash212.scala
@@ -0,0 +1,9 @@
+package fix.scala213
+
+object NullaryHashHash212 {
+  ("": Any).##
+  ("": AnyRef).##
+  ("": Object).##
+  ("": String).##
+  "".##
+}
diff --git a/output/src/test/scala-2.12/fix/scala213/Varargs212.scala b/output/src/test/scala-2.12/fix/scala213/Varargs212.scala
new file mode 100644
index 0000000..9056968
--- /dev/null
+++ b/output/src/test/scala-2.12/fix/scala213/Varargs212.scala
@@ -0,0 +1,5 @@
+package fix.scala213
+
+class Varargs212 {
+  def foo(xs: scala.collection.Seq[String]) = List(xs.toSeq: _*)
+}
diff --git a/output/src/test/scala/fix/scala213/Core.scala b/output/src/test/scala/fix/scala213/Core.scala
index 3470ec5..3f7a49c 100644
--- a/output/src/test/scala/fix/scala213/Core.scala
+++ b/output/src/test/scala/fix/scala213/Core.scala
@@ -1,7 +1,6 @@
 package fix.scala213
 
 import scala.compat.Platform
-import scala.io.StdIn
 
 object Core {
   def eol1 = "Hello World!" + System.lineSeparator
@@ -21,21 +20,6 @@ object Core {
   def arrayCopy2() = System.arraycopy(null, 0, null, 0, 0)
   def arrayCopy3() = System.arraycopy(null, 0, null, 0, 0)
 
-  def consoleReadBoolean                        = StdIn.readBoolean()
-  def consoleReadByte                           = StdIn.readByte()
-  def consoleReadChar                           = StdIn.readChar()
-  def consoleReadDouble                         = StdIn.readDouble()
-  def consoleReadFloat                          = StdIn.readFloat()
-  def consoleReadInt                            = StdIn.readInt()
-  def consoleReadLine                           = StdIn.readLine()
-  def consoleReadLine(text: String, args: Any*) = StdIn.readLine(text, args: _*)
-  def consoleReadLong                           = StdIn.readLong()
-  def consoleReadShort                          = StdIn.readShort()
-  def consoleReadf(format: String)              = StdIn.readf(format)
-  def consoleReadf1(format: String)             = StdIn.readf1(format)
-  def consoleReadf2(format: String)             = StdIn.readf2(format)
-  def consoleReadf3(format: String)             = StdIn.readf3(format)
-
   def arrow1: PartialFunction[Any, String] = {
     case 0      => "zero"
     case 1       => "one"
diff --git a/output/src/test/scala/fix/scala213/NullaryHashHash.scala b/output/src/test/scala/fix/scala213/NullaryHashHash.scala
index 74c31e3..e4c4ea4 100644
--- a/output/src/test/scala/fix/scala213/NullaryHashHash.scala
+++ b/output/src/test/scala/fix/scala213/NullaryHashHash.scala
@@ -6,10 +6,4 @@ object NullaryHashHash {
   ("": Object).##
   ("": String).##
   "".##
-
-  ("": Any).##
-  ("": AnyRef).##
-  ("": Object).##
-  ("": String).##
-  "".##
 }
diff --git a/output/src/test/scala/fix/scala213/Varargs.scala b/output/src/test/scala/fix/scala213/Varargs.scala
index a0db2ab..eda5980 100644
--- a/output/src/test/scala/fix/scala213/Varargs.scala
+++ b/output/src/test/scala/fix/scala213/Varargs.scala
@@ -1,7 +1,6 @@
 package fix.scala213
 
 class Varargs {
-  def foo(xs: scala.collection.Seq[String]) = List(xs.toSeq: _*)
   def bar = List(List(1,2,3): _*)
   def baz = List(scala.Seq(1,2,3): _*)
   // TODO