diff --git a/scala/src/main/java/quanto/util/RichCubicCurve.scala b/scala/src/main/scala/quanto/util/RichCubicCurve.scala
similarity index 100%
rename from scala/src/main/java/quanto/util/RichCubicCurve.scala
rename to scala/src/main/scala/quanto/util/RichCubicCurve.scala
diff --git a/scala/src/main/java/quanto/util/Scripting.scala b/scala/src/main/scala/quanto/util/Scripting.scala
similarity index 97%
rename from scala/src/main/java/quanto/util/Scripting.scala
rename to scala/src/main/scala/quanto/util/Scripting.scala
index 0114a9b5..10fd3ef9 100644
--- a/scala/src/main/java/quanto/util/Scripting.scala
+++ b/scala/src/main/scala/quanto/util/Scripting.scala
@@ -4,17 +4,13 @@ import java.io.File
 
 import akka.util.Timeout
 import org.python.core._
-import quanto.core._
 import quanto.data._
-import quanto.data.Names._
 import quanto.gui.QuantoDerive
 import quanto.rewrite.Simproc
 import quanto.util.json._
-import akka.pattern.ask
-import scala.concurrent.duration._
-import scala.concurrent.{Await, ExecutionContext}
-import ExecutionContext.Implicits.global
+
 import scala.collection.JavaConverters._
+import scala.concurrent.duration._
 
 
 // object providing functions specifically for python scripting