6 files changed, 19 insertions, 26 deletions
diff --git a/src/main/scala/xyz/driver/restquery/rest/Directives.scala b/src/main/scala/xyz/driver/restquery/rest/Directives.scala
index 2936f70..a8dcb3b 100644
--- a/src/main/scala/xyz/driver/restquery/rest/Directives.scala
+++ b/src/main/scala/xyz/driver/restquery/rest/Directives.scala
@@ -1,9 +1,9 @@
-package xyz.driver.restquery.http
+package xyz.driver.restquery.rest
 
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server._
-import xyz.driver.restquery.domain.{SearchFilterExpr, _}
-import xyz.driver.restquery.http.parsers._
+import xyz.driver.restquery.query.{SearchFilterExpr, _}
+import xyz.driver.restquery.rest.parsers._
 
 import scala.util._
 
@@ -41,15 +41,6 @@ trait Directives {
     }
   }
 
-  def StringIdInPath[T]: PathMatcher1[StringId[T]] =
-    PathMatchers.Segment.map((id) => StringId(id.toString))
-
-  def LongIdInPath[T]: PathMatcher1[LongId[T]] =
-    PathMatchers.LongNumber.map((id) => LongId(id))
-
-  def UuidIdInPath[T]: PathMatcher1[UuidId[T]] =
-    PathMatchers.JavaUUID.map((id) => UuidId(id))
-
 }
 
 object Directives extends Directives
diff --git a/src/main/scala/xyz/driver/restquery/rest/parsers/DimensionsParser.scala b/src/main/scala/xyz/driver/restquery/rest/parsers/DimensionsParser.scala
index 7e139db..3472e40 100644
--- a/src/main/scala/xyz/driver/restquery/rest/parsers/DimensionsParser.scala
+++ b/src/main/scala/xyz/driver/restquery/rest/parsers/DimensionsParser.scala
@@ -1,4 +1,4 @@
-package xyz.driver.restquery.http.parsers
+package xyz.driver.restquery.rest.parsers
 
 import scala.util.{Failure, Success, Try}
 
diff --git a/src/main/scala/xyz/driver/restquery/rest/parsers/PaginationParser.scala b/src/main/scala/xyz/driver/restquery/rest/parsers/PaginationParser.scala
index 2b4547b..6d8aaf8 100644
--- a/src/main/scala/xyz/driver/restquery/rest/parsers/PaginationParser.scala
+++ b/src/main/scala/xyz/driver/restquery/rest/parsers/PaginationParser.scala
@@ -1,6 +1,6 @@
-package xyz.driver.restquery.http.parsers
+package xyz.driver.restquery.rest.parsers
 
-import xyz.driver.restquery.domain.Pagination
+import xyz.driver.restquery.query.Pagination
 
 import scala.util._
 
@@ -16,8 +16,9 @@ object PaginationParser {
     }
 
     Try {
-      Pagination(validate("pageSize", Pagination.Default.pageSize),
-                 validate("pageNumber", Pagination.Default.pageNumber))
+      Pagination(
+        validate("pageSize", Pagination.Default.pageSize),
+        validate("pageNumber", Pagination.Default.pageNumber))
     }
   }
 }
diff --git a/src/main/scala/xyz/driver/restquery/rest/parsers/ParseQueryArgException.scala b/src/main/scala/xyz/driver/restquery/rest/parsers/ParseQueryArgException.scala
index 096c28f..456329e 100644
--- a/src/main/scala/xyz/driver/restquery/rest/parsers/ParseQueryArgException.scala
+++ b/src/main/scala/xyz/driver/restquery/rest/parsers/ParseQueryArgException.scala
@@ -1,3 +1,3 @@
-package xyz.driver.restquery.http.parsers
+package xyz.driver.restquery.rest.parsers
 
 class ParseQueryArgException(val errors: (String, String)*) extends Exception(errors.mkString(","))
diff --git a/src/main/scala/xyz/driver/restquery/rest/parsers/SearchFilterParser.scala b/src/main/scala/xyz/driver/restquery/rest/parsers/SearchFilterParser.scala
index ce3009b..52a31bf 100644
--- a/src/main/scala/xyz/driver/restquery/rest/parsers/SearchFilterParser.scala
+++ b/src/main/scala/xyz/driver/restquery/rest/parsers/SearchFilterParser.scala
@@ -1,10 +1,10 @@
-package xyz.driver.restquery.http.parsers
+package xyz.driver.restquery.rest.parsers
 
 import java.util.UUID
 
 import fastparse.all._
 import fastparse.core.Parsed
-import xyz.driver.restquery.domain.{SearchFilterBinaryOperation, SearchFilterExpr, SearchFilterNAryOperation}
+import xyz.driver.restquery.query.{SearchFilterBinaryOperation, SearchFilterExpr, SearchFilterNAryOperation}
 import xyz.driver.restquery.utils.Utils
 import xyz.driver.restquery.utils.Utils._
 
@@ -47,7 +47,7 @@ object SearchFilterParser {
     }
 
   private val operationsMapping = {
-    import xyz.driver.restquery.domain.SearchFilterBinaryOperation._
+    import xyz.driver.restquery.query.SearchFilterBinaryOperation._
 
     Map[String, SearchFilterBinaryOperation](
       "eq"    -> Eq,
diff --git a/src/main/scala/xyz/driver/restquery/rest/parsers/SortingParser.scala b/src/main/scala/xyz/driver/restquery/rest/parsers/SortingParser.scala
index f2a3c04..fce18d1 100644
--- a/src/main/scala/xyz/driver/restquery/rest/parsers/SortingParser.scala
+++ b/src/main/scala/xyz/driver/restquery/rest/parsers/SortingParser.scala
@@ -1,8 +1,8 @@
-package xyz.driver.restquery.http.parsers
+package xyz.driver.restquery.rest.parsers
 
 import fastparse.all._
 import fastparse.core.Parsed
-import xyz.driver.restquery.domain.{Sorting, SortingOrder}
+import xyz.driver.restquery.query.{Sorting, SortingOrder}
 import xyz.driver.restquery.utils.Utils._
 
 import scala.util.Try
@@ -21,9 +21,10 @@ object SortingParser {
         prefixedFields.size match {
           case 1 => Sorting.Dimension(None, toSnakeCase(field), sortingOrder)
           case 2 =>
-            Sorting.Dimension(Some(prefixedFields.head).map(toSnakeCase),
-                              toSnakeCase(prefixedFields.last),
-                              sortingOrder)
+            Sorting.Dimension(
+              Some(prefixedFields.head).map(toSnakeCase),
+              toSnakeCase(prefixedFields.last),
+              sortingOrder)
         }
     }
   }