diff --git a/library/Option.scala b/library/collection/Option.scala
similarity index 98%
rename from library/Option.scala
rename to library/collection/Option.scala
index 6a687490aa75ebd22a6b1d038ce0a209aef61958..4263cc68ebe1a7be2ab1b1f959e1b760646fb677 100644
--- a/library/Option.scala
+++ b/library/collection/Option.scala
@@ -1,6 +1,6 @@
 /* Copyright 2009-2014 EPFL, Lausanne */
 
-package leon
+package leon.collection
 
 import leon.annotation._
 
diff --git a/src/test/resources/regression/repair/List1.scala b/src/test/resources/regression/repair/List1.scala
index 1e18ca898e18e18062da7189bd25093e7dc42311..cd2bc4044eb6bc3ba0bb654efdea4a37d8de5e24 100644
--- a/src/test/resources/regression/repair/List1.scala
+++ b/src/test/resources/regression/repair/List1.scala
@@ -5,6 +5,7 @@ package leon.custom
 import leon._
 import leon.lang._
 import leon.annotation._
+import leon.collection._
 
 sealed abstract class List0[T] {
   def size: Int = (this match {