6 files changed, 25 insertions, 23 deletions
diff --git a/cask/src/cask/endpoints/FormEndpoint.scala b/cask/src/cask/endpoints/FormEndpoint.scala
index 6f65786..84ba618 100644
--- a/cask/src/cask/endpoints/FormEndpoint.scala
+++ b/cask/src/cask/endpoints/FormEndpoint.scala
@@ -1,13 +1,14 @@
 package cask.endpoints
 
-import cask.internal.{Router, Util}
-import cask.main.HttpEndpoint
+import cask.internal.Util
+import cask.router.HttpEndpoint
 import cask.model._
+import cask.router.{ArgReader, Result}
 import io.undertow.server.handlers.form.FormParserFactory
 
 import collection.JavaConverters._
 
-sealed trait FormReader[T] extends Router.ArgReader[Seq[FormEntry], T, Request]
+sealed trait FormReader[T] extends ArgReader[Seq[FormEntry], T, Request]
 object FormReader{
   implicit def paramFormReader[T: QueryParamReader] = new FormReader[T]{
     def arity = implicitly[QueryParamReader[T]].arity
@@ -49,7 +50,7 @@ class postForm(val path: String, override val subpath: Boolean = false)
   val methods = Seq("post")
   type InputParser[T] = FormReader[T]
   def wrapFunction(ctx: Request,
-                       delegate: Delegate): Router.Result[Response.Raw] = {
+                       delegate: Delegate): Result[Response.Raw] = {
     try {
       val formData = FormParserFactory.builder().build().createParser(ctx.exchange).parseBlocking()
       delegate(
@@ -60,7 +61,7 @@ class postForm(val path: String, override val subpath: Boolean = false)
           .toMap
       )
     } catch{case e: Exception =>
-      Router.Result.Success(cask.model.Response(
+      Result.Success(cask.model.Response(
         "Unable to parse form data: " + e + "\n" + Util.stackTraceString(e),
         statusCode = 400
       ))
diff --git a/cask/src/cask/endpoints/JsonEndpoint.scala b/cask/src/cask/endpoints/JsonEndpoint.scala
index 6d3db82..842eae6 100644
--- a/cask/src/cask/endpoints/JsonEndpoint.scala
+++ b/cask/src/cask/endpoints/JsonEndpoint.scala
@@ -2,14 +2,15 @@ package cask.endpoints
 
 import java.io.{ByteArrayOutputStream, InputStream, OutputStream, OutputStreamWriter}
 
-import cask.internal.{Router, Util}
-import cask.main.HttpEndpoint
+import cask.internal.Util
+import cask.router.HttpEndpoint
 import cask.model.Response.DataCompanion
 import cask.model.{Request, Response}
+import cask.router.{ArgReader, Result}
 
 import collection.JavaConverters._
 
-sealed trait JsReader[T] extends Router.ArgReader[ujson.Value, T, cask.model.Request]
+sealed trait JsReader[T] extends ArgReader[ujson.Value, T, cask.model.Request]
 object JsReader{
   implicit def defaultJsReader[T: upickle.default.Reader] = new JsReader[T]{
     def arity = 1
@@ -43,9 +44,9 @@ class postJson(val path: String, override val subpath: Boolean = false)
   extends HttpEndpoint[Response[JsonData], ujson.Value]{
   val methods = Seq("post")
   type InputParser[T] = JsReader[T]
-  override type OuterReturned = Router.Result[Response.Raw]
+  override type OuterReturned = Result[Response.Raw]
   def wrapFunction(ctx: Request,
-                   delegate: Delegate): Router.Result[Response.Raw] = {
+                   delegate: Delegate): Result[Response.Raw] = {
     val obj = for{
       str <-
         try {
@@ -71,7 +72,7 @@ class postJson(val path: String, override val subpath: Boolean = false)
         ))}
     } yield obj.toMap
     obj match{
-      case Left(r) => Router.Result.Success(r.map(Response.Data.StringData))
+      case Left(r) => Result.Success(r.map(Response.Data.StringData))
       case Right(params) => delegate(params)
     }
   }
@@ -82,8 +83,8 @@ class getJson(val path: String, override val subpath: Boolean = false)
   extends HttpEndpoint[Response[JsonData], Seq[String]]{
   val methods = Seq("get")
   type InputParser[T] = QueryParamReader[T]
-  override type OuterReturned = Router.Result[Response.Raw]
-  def wrapFunction(ctx: Request, delegate: Delegate): Router.Result[Response.Raw] = {
+  override type OuterReturned = Result[Response.Raw]
+  def wrapFunction(ctx: Request, delegate: Delegate): Result[Response.Raw] = {
 
     delegate(WebEndpoint.buildMapFromQueryParams(ctx))
   }
diff --git a/cask/src/cask/endpoints/ParamReader.scala b/cask/src/cask/endpoints/ParamReader.scala
index e43f482..4ac34f0 100644
--- a/cask/src/cask/endpoints/ParamReader.scala
+++ b/cask/src/cask/endpoints/ParamReader.scala
@@ -1,11 +1,11 @@
 package cask.endpoints
 
-import cask.internal.Router
+import cask.router.ArgReader
 import cask.model.{Cookie, Request}
 import io.undertow.server.HttpServerExchange
 import io.undertow.server.handlers.form.{FormData, FormParserFactory}
 
-abstract class ParamReader[T] extends Router.ArgReader[Unit, T, cask.model.Request]{
+abstract class ParamReader[T] extends ArgReader[Unit, T, cask.model.Request]{
   def arity: Int
   def read(ctx: cask.model.Request, label: String, v: Unit): T
 }
diff --git a/cask/src/cask/endpoints/StaticEndpoints.scala b/cask/src/cask/endpoints/StaticEndpoints.scala
index 0abfcf5..1e11055 100644
--- a/cask/src/cask/endpoints/StaticEndpoints.scala
+++ b/cask/src/cask/endpoints/StaticEndpoints.scala
@@ -1,6 +1,6 @@
 package cask.endpoints
 
-import cask.main.HttpEndpoint
+import cask.router.HttpEndpoint
 import cask.model.Request
 
 class staticFiles(val path: String) extends HttpEndpoint[String, Seq[String]]{
diff --git a/cask/src/cask/endpoints/WebEndpoints.scala b/cask/src/cask/endpoints/WebEndpoints.scala
index 8bb3bae..89ca421 100644
--- a/cask/src/cask/endpoints/WebEndpoints.scala
+++ b/cask/src/cask/endpoints/WebEndpoints.scala
@@ -1,8 +1,8 @@
 package cask.endpoints
 
-import cask.internal.Router
-import cask.main.HttpEndpoint
+import cask.router.HttpEndpoint
 import cask.model.{Request, Response}
+import cask.router.{ArgReader, Result}
 
 import collection.JavaConverters._
 
@@ -10,7 +10,7 @@ import collection.JavaConverters._
 trait WebEndpoint extends HttpEndpoint[Response.Raw, Seq[String]]{
   type InputParser[T] = QueryParamReader[T]
   def wrapFunction(ctx: Request,
-                       delegate: Delegate): Router.Result[Response.Raw] = {
+                       delegate: Delegate): Result[Response.Raw] = {
     delegate(WebEndpoint.buildMapFromQueryParams(ctx))
   }
   def wrapPathSegment(s: String) = Seq(s)
@@ -40,7 +40,7 @@ class put(val path: String, override val subpath: Boolean = false) extends WebEn
 class route(val path: String, val methods: Seq[String], override val subpath: Boolean = false) extends WebEndpoint
 
 abstract class QueryParamReader[T]
-  extends Router.ArgReader[Seq[String], T, cask.model.Request]{
+  extends ArgReader[Seq[String], T, cask.model.Request]{
   def arity: Int
   def read(ctx: cask.model.Request, label: String, v: Seq[String]): T
 }
diff --git a/cask/src/cask/endpoints/WebSocketEndpoint.scala b/cask/src/cask/endpoints/WebSocketEndpoint.scala
index fae7fde..6ca5def 100644
--- a/cask/src/cask/endpoints/WebSocketEndpoint.scala
+++ b/cask/src/cask/endpoints/WebSocketEndpoint.scala
@@ -2,8 +2,8 @@ package cask.endpoints
 
 import java.nio.ByteBuffer
 
-import cask.internal.Router
 import cask.model.Request
+import cask.router.Result
 import cask.util.Logger
 import io.undertow.websockets.WebSocketConnectionCallback
 import io.undertow.websockets.core.{AbstractReceiveListener, BufferedBinaryMessage, BufferedTextMessage, CloseMessage, WebSocketChannel, WebSockets}
@@ -21,10 +21,10 @@ object WebsocketResult{
 }
 
 class websocket(val path: String, override val subpath: Boolean = false)
-  extends cask.main.Endpoint[WebsocketResult, Seq[String]]{
+  extends cask.router.Endpoint[WebsocketResult, Seq[String]]{
   val methods = Seq("websocket")
   type InputParser[T] = QueryParamReader[T]
-  type OuterReturned = Router.Result[WebsocketResult]
+  type OuterReturned = Result[WebsocketResult]
   def wrapFunction(ctx: Request, delegate: Delegate): OuterReturned = {
     delegate(WebEndpoint.buildMapFromQueryParams(ctx))
   }