diff --git a/.gitignore b/.gitignore
index 416a12effd24..a34babd4f649 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,8 @@ project/boot/
 project/plugins/project/
 project/local-plugins.sbt
 .history
+.ensime
+.ensime_cache/
 
 # Scala-IDE specific
 .scala_dependencies
diff --git a/sandbox/scalajs/hello.scala b/sandbox/scalajs/src/main/scala/hello.scala
similarity index 100%
rename from sandbox/scalajs/hello.scala
rename to sandbox/scalajs/src/main/scala/hello.scala