diff --git a/src/main/scala/leon/invariant/datastructure/ExprStructure.scala b/src/main/scala/leon/invariant/util/ExprStructure.scala
similarity index 96%
rename from src/main/scala/leon/invariant/datastructure/ExprStructure.scala
rename to src/main/scala/leon/invariant/util/ExprStructure.scala
index f597cd7734131a52d08b11a0d1661495d39ecfba..3907ac376e7098415a13cb762ca3ca36cbb1c0dc 100644
--- a/src/main/scala/leon/invariant/datastructure/ExprStructure.scala
+++ b/src/main/scala/leon/invariant/util/ExprStructure.scala
@@ -1,10 +1,10 @@
 package leon
 package invariant.util
 
-import purescala.Expressions._
 import purescala.ExprOps._
-import purescala.Extractors._
-import purescala.Types._
+import purescala.Expressions._
+import purescala.Extractors.Operator
+import purescala.Types.{ClassType, TypeParameter}
 
 /**
  * A class that looks for structural equality of expressions
diff --git a/src/test/scala/leon/unit/purescala/FunctionClosureSuite.scala b/src/test/scala/leon/unit/utils/FunctionClosureSuite.scala
similarity index 97%
rename from src/test/scala/leon/unit/purescala/FunctionClosureSuite.scala
rename to src/test/scala/leon/unit/utils/FunctionClosureSuite.scala
index 98132fd9a04574418f2efb7dc59b00cd5c2aa965..54f7844d5838b6431614dcf278df0f75e83bd446 100644
--- a/src/test/scala/leon/unit/purescala/FunctionClosureSuite.scala
+++ b/src/test/scala/leon/unit/utils/FunctionClosureSuite.scala
@@ -1,16 +1,15 @@
 /* Copyright 2009-2016 EPFL, Lausanne */
 
-package leon.unit.utils
-
-import leon.test._
-import leon.purescala.Common._
-import leon.purescala.Expressions._
-import leon.purescala.Types._
-import leon.purescala.TypeOps.isSubtypeOf
-import leon.purescala.Definitions._
-import leon.purescala.ExprOps._
-import leon.purescala.FunctionClosure
-
+package leon
+package unit.utils
+
+import purescala.Common._
+import purescala.Definitions._
+import purescala.ExprOps._
+import purescala.Expressions._
+import purescala.FunctionClosure
+import purescala.Types._
+import test._
 import org.scalatest._
 
 class FunctionClosureSuite extends FunSuite with helpers.ExpressionsDSL {