10 files changed, 44 insertions, 31 deletions
diff --git a/core/src/main/scala/forge/Main.scala b/core/src/main/scala/forge/Main.scala
index d919d0e2..e3b89f60 100644
--- a/core/src/main/scala/forge/Main.scala
+++ b/core/src/main/scala/forge/Main.scala
@@ -2,6 +2,8 @@ package forge
 
 import ammonite.ops._
 import ammonite.util.{Name, Res}
+import forge.discover.Discovered
+import forge.eval.Evaluator
 import forge.util.OSet
 
 
@@ -12,7 +14,7 @@ object Main {
       case Right(interp) =>
         val result = ammonite.main.Scripts.runScript(pwd, Path(args(0), pwd), interp, Nil)
 
-        val (obj, discovered) = result.asInstanceOf[Res.Success[(Any, forge.Discovered[Any])]].s
+        val (obj, discovered) = result.asInstanceOf[Res.Success[(Any, Discovered[Any])]].s
         val mapping = Discovered.mapping(obj)(discovered)
         val workspacePath = pwd / 'target / 'javac
         val evaluator = new Evaluator(workspacePath, mapping)
diff --git a/core/src/main/scala/forge/Target.scala b/core/src/main/scala/forge/define/Target.scala
index 9aa4877e..1d8ecdee 100644
--- a/core/src/main/scala/forge/Target.scala
+++ b/core/src/main/scala/forge/define/Target.scala
@@ -1,14 +1,14 @@
-package forge
+package forge.define
 
-
-import ammonite.ops.{CommandResult, ls, mkdir}
-import forge.util.{Args, PathRef}
-import play.api.libs.json.{Format, JsValue, Json}
+import ammonite.ops.{CommandResult, mkdir}
+import forge.eval.PathRef
+import forge.util.{Args, JsonFormatters}
+import play.api.libs.json.{Format, Json}
 
 import scala.annotation.compileTimeOnly
-import language.experimental.macros
-import reflect.macros.blackbox.Context
 import scala.collection.mutable
+import scala.language.experimental.macros
+import scala.reflect.macros.blackbox.Context
 
 abstract class Target[T] extends Target.Ops[T]{
   /**
@@ -97,7 +97,9 @@ object Target{
   def wrapCached[T](c: Context)(t: c.Tree) = {
     import c.universe._
     val owner = c.internal.enclosingOwner
-    val ownerIsCacherClass = owner.owner.isClass && owner.owner.asClass.baseClasses.exists(_.fullName == "forge.Target.Cacher")
+    val ownerIsCacherClass =
+      owner.owner.isClass &&
+      owner.owner.asClass.baseClasses.exists(_.fullName == "forge.define.Target.Cacher")
 
     if (ownerIsCacherClass && !owner.isMethod){
       c.abort(
diff --git a/core/src/main/scala/forge/ZipTarget.scala b/core/src/main/scala/forge/define/ZipTarget.scala
index e02bbc19..1faef07e 100644
--- a/core/src/main/scala/forge/ZipTarget.scala
+++ b/core/src/main/scala/forge/define/ZipTarget.scala
@@ -1,4 +1,4 @@
-package forge
+package forge.define
 
 import forge.util.Args
 
diff --git a/core/src/main/scala/forge/Discovered.scala b/core/src/main/scala/forge/discover/Discovered.scala
index e3aa31f9..964732be 100644
--- a/core/src/main/scala/forge/Discovered.scala
+++ b/core/src/main/scala/forge/discover/Discovered.scala
@@ -1,10 +1,11 @@
-package forge
+package forge.discover
+
+import forge.define.Target
 
-import forge.util.Labelled
 import play.api.libs.json.Format
 
-import language.experimental.macros
-import reflect.macros.blackbox.Context
+import scala.language.experimental.macros
+import scala.reflect.macros.blackbox.Context
 
 class Discovered[T](val value: Seq[(Seq[String], Format[_], T => Target[_])]){
   def apply(t: T) = value.map{case (a, f, b) => (a, f, b(t)) }
@@ -53,9 +54,9 @@ object Discovered {
         q"$prefix.${TermName(name)}"
       )
 
-      q"forge.Discovered.makeTuple($segments, ($base: $tpe) => $ident)"
+      q"forge.discover.Discovered.makeTuple($segments, ($base: $tpe) => $ident)"
     }
 
-    c.Expr[Discovered[T]](q"new _root_.forge.Discovered($result)")
+    c.Expr[Discovered[T]](q"new _root_.forge.discover.Discovered($result)")
   }
 }
diff --git a/core/src/main/scala/forge/util/Labelled.scala b/core/src/main/scala/forge/discover/Labelled.scala
index a79d2d93..25c74e9f 100644
--- a/core/src/main/scala/forge/util/Labelled.scala
+++ b/core/src/main/scala/forge/discover/Labelled.scala
@@ -1,6 +1,6 @@
-package forge.util
+package forge.discover
 
-import forge.Target
+import forge.define.Target
 import play.api.libs.json.Format
 
 case class Labelled[T](target: Target[T],
diff --git a/core/src/main/scala/forge/Evaluator.scala b/core/src/main/scala/forge/eval/Evaluator.scala
index 3ef605b7..19cd3236 100644
--- a/core/src/main/scala/forge/Evaluator.scala
+++ b/core/src/main/scala/forge/eval/Evaluator.scala
@@ -1,11 +1,12 @@
-package forge
-
+package forge.eval
 
+import ammonite.ops._
+import forge.define.Target
+import forge.discover.Labelled
+import forge.util.{Args, MultiBiMap, OSet}
 import play.api.libs.json.{Format, JsValue, Json}
 
 import scala.collection.mutable
-import ammonite.ops._
-import forge.util.{Args, Labelled, MultiBiMap, OSet}
 class Evaluator(workspacePath: Path,
                 labeling: Map[Target[_], Labelled[_]]){
 
diff --git a/core/src/main/scala/forge/util/PathRef.scala b/core/src/main/scala/forge/eval/PathRef.scala
index 333f225e..1c9bc700 100644
--- a/core/src/main/scala/forge/util/PathRef.scala
+++ b/core/src/main/scala/forge/eval/PathRef.scala
@@ -1,13 +1,13 @@
-package forge
-package util
+package forge.eval
 
 import java.io.IOException
-import java.nio.file.{FileVisitResult, FileVisitor}
 import java.nio.file.attribute.BasicFileAttributes
-import java.security.MessageDigest
+import java.nio.file.{FileVisitResult, FileVisitor}
 import java.nio.{file => jnio}
+import java.security.MessageDigest
 
 import ammonite.ops.Path
+import forge.util.JsonFormatters
 import play.api.libs.json.{Format, Json}
 
 
diff --git a/core/src/main/scala/forge/Tarjans.scala b/core/src/main/scala/forge/eval/Tarjans.scala
index 9831fe7f..15d6779c 100644
--- a/core/src/main/scala/forge/Tarjans.scala
+++ b/core/src/main/scala/forge/eval/Tarjans.scala
@@ -1,6 +1,7 @@
-package forge
+package forge.eval
+
+import scala.collection.mutable
 
-import collection.mutable
 // Adapted from
 // https://github.com/indy256/codelibrary/blob/c52247216258e84aac442a23273b7d8306ef757b/java/src/SCCTarjan.java
 object Tarjans {
@@ -47,4 +48,4 @@ object Tarjans {
     }
     components
   }
-}
-\ No newline at end of file
+}
diff --git a/core/src/main/scala/forge/package.scala b/core/src/main/scala/forge/package.scala
index 4163237e..58401c64 100644
--- a/core/src/main/scala/forge/package.scala
+++ b/core/src/main/scala/forge/package.scala
@@ -1 +1,7 @@
-package object forge extends ZipTarget with JsonFormatters
+import forge.define.ZipTarget
+import forge.util.JsonFormatters
+
+package object forge extends ZipTarget with JsonFormatters{
+  val Target = define.Target
+  type Target[T] = define.Target[T]
+}
diff --git a/core/src/main/scala/forge/JsonFormatters.scala b/core/src/main/scala/forge/util/JsonFormatters.scala
index 4e772128..d9f07fc8 100644
--- a/core/src/main/scala/forge/JsonFormatters.scala
+++ b/core/src/main/scala/forge/util/JsonFormatters.scala
@@ -1,4 +1,4 @@
-package forge
+package forge.util
 
 import ammonite.ops.{Bytes, Path}
 import play.api.libs.json._