diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..eb5a316
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+target
diff --git a/build.sbt b/build.sbt
index e376511..492b0c0 100644
--- a/build.sbt
+++ b/build.sbt
@@ -2,11 +2,13 @@ name := "sbt-example"
 organization := "org.scalamacros"
 version := "2.0.0"
 
-scalaVersion in ThisBuild := "2.11.8"
-run <<= run in Compile in core
+crossScalaVersions in ThisBuild := Seq("2.11.8", "2.12.1")
+scalaVersion in ThisBuild := crossScalaVersions.value.head
 
-lazy val macros = (project in file("macros")).settings(
+run := (run in Compile in core).evaluated
+
+lazy val macros = project settings (
  libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value
 )
 
-lazy val core = (project in file("core")) dependsOn macros
+lazy val core = project dependsOn macros
diff --git a/core/src/main/scala/Test.scala b/core/Test.scala
similarity index 95%
rename from core/src/main/scala/Test.scala
rename to core/Test.scala
index 137fadd..921158c 100644
--- a/core/src/main/scala/Test.scala
+++ b/core/Test.scala
@@ -1,3 +1,3 @@
 object Test extends App {
   Macros.hello
-}
\ No newline at end of file
+}
diff --git a/macros/src/main/scala/Macros.scala b/macros/Macros.scala
similarity index 100%
rename from macros/src/main/scala/Macros.scala
rename to macros/Macros.scala
diff --git a/project/build.properties b/project/build.properties
index 43b8278..27e88aa 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.11
+sbt.version=0.13.13