diff --git a/core/pom.xml b/core/pom.xml
index 04cd3a1..794c9f5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<artifactId>org.dorest</artifactId>
 		<groupId>org.dorest</groupId>
-		<version>0.0.0-SNAPSHOT</version>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.dorest.core</artifactId>
diff --git a/core/src/main/scala/org/dorest/server/DoRestApp.scala b/core/src/main/scala/org/dorest/server/DoRestApp.scala
index 95c41d8..6ec2dbb 100644
--- a/core/src/main/scala/org/dorest/server/DoRestApp.scala
+++ b/core/src/main/scala/org/dorest/server/DoRestApp.scala
@@ -17,19 +17,20 @@ package org.dorest.server
 
 import collection.mutable.Buffer
 
-/** Enables the registration of [[org.dorest.server.HandlerFactory]] objects.
-  *
-  * This trait is implemented by DoRest servers.
-  *
-  * @author Michael Eichberg
-  */
+/**
+ * Enables the registration of [[org.dorest.server.HandlerFactory]] objects.
+ *
+ * This trait is to be implemented by DoRest servers.
+ *
+ * @author Michael Eichberg
+ */
 trait DoRestApp {
 
-    private var _factories: Buffer[HandlerCreator] = Buffer()
+    private var _factories: Buffer[HandlerFactory] = Buffer()
 
     def factories = _factories
 
-    def register(handlerFactory: HandlerCreator) {
+    def register(handlerFactory: HandlerFactory) {
         _factories += handlerFactory
     }
 
diff --git a/core/src/main/scala/org/dorest/server/HandlerFactory.scala b/core/src/main/scala/org/dorest/server/HandlerFactory.scala
index 634ab66..896988e 100644
--- a/core/src/main/scala/org/dorest/server/HandlerFactory.scala
+++ b/core/src/main/scala/org/dorest/server/HandlerFactory.scala
@@ -17,229 +17,19 @@ package org.dorest.server
 
 import java.lang.Long
 
-/** HandlerCreators are responsible for matching URIs and – if the URI matches – to create a new Handler
-  * that will then handle the request. 
-  *
-  * '''Thread Safety'''
-  * Handler factories have to be thread safe. I.e., handler factories have to support the simultaneous
-  * matching of URIs; the DoRest framework use a single Handler factory for matching URIs.
-  *
-  * @author Michael Eichberg
-  */
-trait HandlerCreator {
+/**
+ * HandlerCreators are responsible for matching URIs and – if the URI matches – to create a new Handler
+ * that will then handle the request.
+ *
+ * '''Thread Safety'''
+ * Handler factories have to be thread safe. I.e., handler factories have to support the simultaneous
+ * matching of URIs; the DoRest framework use a single Handler factory for matching URIs.
+ *
+ * @author Michael Eichberg
+ */
+trait HandlerFactory {
 
     def matchURI(path: String, query: String): Option[Handler]
 
 }
 
-/** @author Michael Eichberg
-  */
-abstract class HandlerFactory[T <: Handler] extends HandlerCreator {
-
-    protected implicit def namedSegmentToPathSegment(name: String): Named = new Named(name)
-
-    /** A function that does nothing.
-      */
-    // Used to avoid that we have to deal with Option objects or have to deal with null values.
-    final def DoNothing(t: T): Unit = {
-        /*do nothing*/
-    }
-
-    // TODO merge path and pathelement; i.e., make pathelement itself a list
-    /** The (URI) path of this resource.
-      */
-    trait PathMatcher {
-
-        /** Prepends the given path element to this path and returns a new path object.
-          */
-        def ::(p: PathElement): PathMatcher
-
-        /** Tries to match the path. If the path matches, a list of functions is returned which
-          * will then be called; e.g., to complete the initialization of the resource's parameters.
-          */
-        def matchSegment(path: String): Option[List[(T) ⇒ Unit]]
-    }
-
-    class ComplexPath(val pe: PathElement, val tail: PathMatcher) extends PathMatcher {
-
-        def ::(pe: PathElement): PathMatcher = new ComplexPath(pe, this)
-
-        def matchSegment(path: String): Option[List[(T) ⇒ Unit]] = {
-            pe.matchSegment(path) match {
-                case Some((pathRest, f)) ⇒ {
-                    // this segment matched, but what about the rest of the path?
-                    tail.matchSegment(pathRest) map (fs ⇒ f :: fs)
-                }
-                case _ ⇒ None
-            }
-        }
-    }
-
-    object EmptyPath extends PathMatcher {
-
-        def ::(p: PathElement): PathMatcher = new ComplexPath(p, this)
-
-        def matchSegment(path: String): Option[List[(T) ⇒ Unit]] =
-            if (path.size == 0) Some(Nil) else None
-    }
-
-    trait PathElement {
-
-        /** Constructs a new path that consists of the given path element and this element.
-          */
-        def ::(ps: PathElement): PathMatcher = {
-            new ComplexPath(ps, new ComplexPath(this, EmptyPath))
-        }
-
-        /** Tries to match a maximum length segment of the given path. If the match is successful
-          * the rest of the path and a function is returned that – if the whole path can be matched –
-          * is called.
-          *
-          * The primary purpose of the function is to enable the initialization of a resource's variable
-          * path parameters.
-          */
-        def matchSegment(path: String): Option[(String, (T) ⇒ Unit)]
-
-    }
-
-    /** Can be used to match a path (segment) that is optional and which extends until the end of a given
-      * concrete path.
-      *
-      * If the given path is not empty and does not match the match is considered to have failed
-      * unless {link #failOnMatchError} is set to false.
-      *
-      * Cannot be used to match an optional sub-part of a path. E.g., matching something like
-      * {{{"/user"::{"/"userid}::"/tag"}}} where {{{"/"userid"}}} is optional is not possible.
-      */
-    class Optional(val p: PathMatcher, val failOnMatchError: Boolean) extends PathElement {
-
-        def matchSegment(path: String): Option[(String, (T) ⇒ Unit)] = {
-            if (path.size == 0) {
-                return Some(("", DoNothing))
-            }
-
-            p.matchSegment(path) match {
-                case Some(fs) ⇒ Some(("", (t: T) ⇒ {
-                    fs.foreach(_(t))
-                }))
-                case _ ⇒ if (failOnMatchError) None else Some(("", DoNothing))
-            }
-        }
-
-    }
-
-    object Optional {
-        def apply(pe: PathElement, failOnMatchError: Boolean = true) = {
-            new Optional(new ComplexPath(pe, EmptyPath), failOnMatchError)
-        }
-    }
-
-    /** Matches a segment that defines a long value.
-      */
-    class LongValue(val set: Long ⇒ T ⇒ Unit) extends PathElement {
-
-        def matchSegment(path: String): Option[(String, (T) ⇒ Unit)] = {
-            LongValue.matcher.findFirstIn(path).map(s ⇒ {
-                (path.substring(s.length), set(s.toLong))
-            }
-            )
-        }
-    }
-
-    object LongValue {
-
-        private val matcher = """^-?\d+""".r
-
-        def apply(set: Long ⇒ T ⇒ Unit): PathElement = new LongValue(set)
-
-        def apply(set: (T, Long) ⇒ Unit): PathElement = apply((v: Long) ⇒ (t: T) ⇒ set(t, v.toLong))
-
-    }
-
-    /** Matches a string segment that contains a word character or "@".
-      */
-    class StringValue(set: String ⇒ T ⇒ Unit) extends PathElement {
-
-        def matchSegment(path: String): Option[(String, (T) ⇒ Unit)] = {
-            StringValue.matcher.findFirstIn(path).map((s) ⇒ {
-                (path.substring(s.length), set(s))
-            }
-            )
-        }
-    }
-
-    object StringValue {
-
-        private val matcher = """^(\w|@|-|\.)+""".r
-
-        def apply(set: (String) ⇒ (T) ⇒ Unit) = new StringValue(set)
-
-        def apply(set: (T, String) ⇒ Unit): PathElement = apply((v: String) ⇒ (t: T) ⇒ set(t, v))
-
-    }
-
-    class AnyPath(set: String ⇒ T ⇒ Unit) extends PathElement {
-        def matchSegment(path: String): Option[(String, T ⇒ Unit)] = {
-            Some("" /* The (empty) rest of the path. */ , set(path))
-        }
-    }
-
-    object AnyPath {
-        def apply(set: (String) ⇒ (T) ⇒ Unit) = new AnyPath(set)
-    }
-
-    class Named(val name: String) extends PathElement {
-
-        def matchSegment(path: String): Option[(String, (T) ⇒ Unit)] = {
-            if (path.startsWith(name)) {
-                val pathRest = path.substring(name.length)
-                Some((pathRest, DoNothing))
-            }
-            else {
-                None
-            }
-        }
-    }
-
-    def matchURI(path: String, query: String): Option[T] = {
-        pathMatcher matchSegment (path) map { create(_) }
-        /*this.pathMatcher.matchSegment(path) match {
-            case Some(fs) ⇒ {
-                Some(create(fs))
-            }
-            case _ ⇒ None
-        }*/
-    }
-
-    private def create(fs: List[(T) ⇒ Unit]): T = {
-        val t = create()
-        fs.foreach(_(t))
-        t
-    }
-
-    trait QueryMatcher
-
-    object NoQuery extends QueryMatcher
-
-    private var pathMatcher: PathMatcher = EmptyPath
-
-    def path(f: ⇒ PathMatcher) {
-        pathMatcher = f
-    }
-
-    def path(staticPath: String) {
-        path {
-            staticPath :: EmptyPath
-        }
-    }
-
-    private[this] var queryMatcher: QueryMatcher = NoQuery
-
-    def query(f: ⇒ QueryMatcher) {
-        queryMatcher = f
-    }
-
-    /** Creates a new handler object that will be further initialized using the segments extracted by the path matchers.
-      */
-    def create(): T
-}
diff --git a/core/src/main/scala/org/dorest/server/MappedDirectory.scala b/core/src/main/scala/org/dorest/server/MappedDirectory.scala
index a4ded02..99aa0f5 100644
--- a/core/src/main/scala/org/dorest/server/MappedDirectory.scala
+++ b/core/src/main/scala/org/dorest/server/MappedDirectory.scala
@@ -23,13 +23,11 @@ import java.lang.Boolean
  *
  * @author Michael Eichberg (mail at michael-eichberg.de)
  */
-class MappedDirectory(val baseDirectory: String, enableIndexHTMLDeliveryOnDirectoryAccess: Boolean = false) extends Handler {
+class MappedDirectory(val baseDirectory: String, val path: String, enableIndexHTMLDeliveryOnDirectoryAccess: Boolean = false) extends Handler {
 
     import java.io._
 
-    var path: String = _
-
-    def processRequest(requestBody: => InputStream): Response = {
+    def processRequest(requestBody: ⇒ InputStream): Response = {
         if (method != GET) {
             return new SupportedMethodsResponse(GET)
         }
@@ -53,7 +51,7 @@ class MappedDirectory(val baseDirectory: String, enableIndexHTMLDeliveryOnDirect
         val fileName = file.getName
         val fileType = {
             val fileSuffix = fileName.substring(fileName.lastIndexOf('.') + 1)
-            Some((
+            Some((// TODO move to some extensible table
                 fileSuffix match {
                     case "css"        ⇒ MediaType.TEXT_CSS
                     case "javascript" ⇒ MediaType.APPLICATION_JAVASCRIPT
@@ -87,20 +85,10 @@ class MappedDirectory(val baseDirectory: String, enableIndexHTMLDeliveryOnDirect
                 def length = file.length.asInstanceOf[Int]
 
                 def write(responseBody: OutputStream) {
-                    // TODO Read blocks and not just single bytes.
-                    // TODO Think about caching files.
-                    /*val in = new FileInputStream(file)
-                    try {
-                        while (in.available > 0)
-                            responseBody.write(in.read)
-                    } finally {
-                        if (in != null)
-                            in.close
-                    }*/
                     responseBody.write(readFully(file))
                 }
 
-                def readFully(file: File) : Array[Byte] = {
+                def readFully(file: File): Array[Byte] = {
                     val in = new FileInputStream(file)
                     try {
                         val length = file.length.asInstanceOf[Int];
diff --git a/core/src/main/scala/org/dorest/server/jdk/Demo.scala b/core/src/main/scala/org/dorest/server/jdk/Demo.scala
index c2e22e4..b26fe93 100644
--- a/core/src/main/scala/org/dorest/server/jdk/Demo.scala
+++ b/core/src/main/scala/org/dorest/server/jdk/Demo.scala
@@ -36,25 +36,25 @@ class Time
     }
 
     get returns HTML {
-        "<html><body>The current (server) time is: "+new java.util.Date().toString+"</body></html>"
+        "<html><body>The current (server) time is: " + new java.util.Date().toString + "</body></html>"
     }
 
     get returns XML {
         <time>{ new java.util.Date().toString }</time>
     }
 }
+object Time extends Time with PerformanceMonitor
 
-class User extends RESTInterface with TEXTSupport {
-
-    var user: String = _
+class User(var user: String) extends RESTInterface with TEXTSupport {
 
     get returns TEXT {
-        "Welcome "+user
+        "Welcome " + user
     }
 }
 
-/** Implementation of a very primitive, thread-safe key-value store.
-  */
+/**
+ * Implementation of a very primitive, thread-safe key-value store.
+ */
 object KVStore {
 
     private val ds = new scala.collection.mutable.HashMap[Long, String]()
@@ -112,7 +112,7 @@ class Keys extends RESTInterface with XMLSupport {
         // convenience method: Location(URI)
         // Alternatively, it is possible to directly set the response headers
         // using the corresponding response headers data structure.
-        Location(new URL("http://"+InetAddress.getLocalHost.getHostName+":9000/keys/"+id.toString)) // TODO enable to specify the relative path
+        Location(new URL("http://" + InetAddress.getLocalHost.getHostName + ":9009/keys/" + id.toString)) // TODO enable to specify the relative path
 
         // the "response body"
         <value id={ id.toString }>{ value }</value>
@@ -120,17 +120,14 @@ class Keys extends RESTInterface with XMLSupport {
 
 }
 
-class Key extends RESTInterface with XMLSupport {
-
-    var id: Long = _
+class Key(val id: Long) extends RESTInterface with XMLSupport {
 
     get returns XML {
         KVStore.synchronized {
             if (!KVStore.contains(id)) {
                 responseCode = 404 // 404 = NOT FOUND
                 None // EMPTY BODY
-            }
-            else {
+            } else {
                 val value = KVStore(id)
                 <value id={ id.toString }>{ value }</value>
             }
@@ -142,8 +139,7 @@ class Key extends RESTInterface with XMLSupport {
             if (!KVStore.contains(id)) {
                 responseCode = 404 // NOT FOUND
                 None
-            }
-            else {
+            } else {
                 KVStore.updated(id, XMLRequestBody.text)
                 <value id={ id.toString }>{ XMLRequestBody.text }</value>
             }
@@ -156,95 +152,55 @@ class Key extends RESTInterface with XMLSupport {
 
 }
 
-object Key {
-
-    def setId(key: Key, id: Long) {
-        key.id = id
-    }
-}
-
-class MonitoredMappedDirectory(baseDirectory: String)
-    extends MappedDirectory(baseDirectory)
+class MonitoredMappedDirectory(baseDirectory: String, path: String, enableIndexHTMLDeliveryOnDirectoryAccess: Boolean = false)
+    extends MappedDirectory(baseDirectory, path, enableIndexHTMLDeliveryOnDirectoryAccess)
     with ConsoleLogging // TODO needs to exchanged
     with PerformanceMonitor
 
 class Demo
 
-/** To test the restful web serice you can use, e.g., curl. For example, to
-  * add a value to the simple key-value store you can use:
-  *
-  * curl -v -X POST -d "<value>Test</value>" -H content-type:application/xml http://localhost:9009/keys
-  * curl http://localhost:9009/keys
-  */
+/**
+ * To test the restful web serice you can use, e.g., curl. For example, to
+ * add a value to the simple key-value store you can use:
+ *
+ * curl -v -X POST -d "<value>Test</value>" -H content-type:application/xml http://localhost:9009/keys
+ * curl http://localhost:9009/keys
+ */
 object Demo
         extends JDKServer(9009)
         with scala.App
         with ConsoleLogging // TODO needs to exchanged
         {
 
-    this register new HandlerFactory[Keys] {
-        path {
-            "/keys"
-        }
-
-        def create = new Keys
-    }
-
-    this register new HandlerFactory[Key] {
-        path {
-            // "/keys/" :: LongValue(v => _.id = v)
-
-            //"/keys/" :: LongValue(Key.setId _)
-            //"/keys/" :: LongValue((k,l) => k.id = l)
-            "/keys/" :: LongValue(_.id = _)
-        }
-
-        def create = new Key
-    }
-
-    this register new HandlerFactory[User] {
-        path {
-            "/user/" :: StringValue(_.user = _)
-        }
-
-        def create = new User with PerformanceMonitor with ConsoleLogging // TODO needs to exchanged
-    }
-
-    register(
-        new HandlerFactory[Time] {
-            path {
-                "/time" :: EmptyPath
+    addPathMatcher {
+        / {
+            case "keys" ⇒ / {
+                case MATCHED() ⇒ new Keys
+                case LONG(id)  ⇒ new Key(id)
             }
-            query {
-                NoQuery
-            }
-
-            /** Reusing one instance of a resource to handle all requests requires that the resource is thread safe.
-              * If you are unsure, just create a new instance for each request!
-              *
-              * If your resource is not trivially thread-safe, we recommend that you do not try to make it thread safe
-              * and instead just create a new instance. (i.e., you don't write "lazy val" but write "def" in following.)
-              *
-              * In general, whenever you have to extract path parameters or have to process a request body or your
-              * object representing the resource has some kind of mutable state, it is relatively certain that you
-              * have to create a new instance to handle a request.
-              */
-            lazy val create = new Time() with PerformanceMonitor
-        })
-
-    // ("timezone",StringValue(v => _.timeZone = v))
-
-    register(
-        new HandlerFactory[MappedDirectory] {
-            path {
-                "/static" :: AnyPath(
-                    v ⇒ _.path = {
-                        if (v startsWith "/") v else "/"+v
-                    })
+            case "user" ⇒ / {
+                case STRING(userId) ⇒ new User(userId) with PerformanceMonitor with ConsoleLogging
             }
-
-            def create = new MonitoredMappedDirectory(System.getProperty("user.home"))
-        })
+            case "time" ⇒
+                /**
+                 * Reusing one instance of a resource to handle all requests requires that the resource is thread safe.
+                 * If you are unsure, just create a new instance for each request!
+                 *
+                 * If your resource is not trivially thread-safe, we recommend that you do not try to make it thread safe
+                 * and instead just create a new instance.
+                 *
+                 * In general, whenever you have to extract path parameters or have to process a request body or your
+                 * object representing the resource has some kind of mutable state, it is relatively certain that you
+                 * have to create a new instance to handle a request.
+                 */
+                Time
+            case "static" ⇒ (path) ⇒
+                if (path eq null)
+                    None
+                else
+                    Some(new MonitoredMappedDirectory(System.getProperty("user.home"), path))
+        }
+    }
 
     // start the server
     start()
diff --git a/core/src/main/scala/org/dorest/server/jdk/JDKServer.scala b/core/src/main/scala/org/dorest/server/jdk/JDKServer.scala
index 5dba637..52f7ba7 100644
--- a/core/src/main/scala/org/dorest/server/jdk/JDKServer.scala
+++ b/core/src/main/scala/org/dorest/server/jdk/JDKServer.scala
@@ -16,9 +16,11 @@
 package org.dorest.server
 package jdk
 
+import log._
+import rest._
+
 import com.sun.net.httpserver._
 import java.net._
-import log._
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors
 
@@ -39,6 +41,7 @@ import java.util.concurrent.Executors
 class JDKServer(val port : Int,val executor : Executor = Executors.newCachedThreadPool())
         extends DoRestServer
         with DoRestApp
+        with URIsMatcher
         {
 
     private[this] val logger = Logger(classOf[JDKServer])
diff --git a/core/src/main/scala/org/dorest/server/rest/URIsMatcher.scala b/core/src/main/scala/org/dorest/server/rest/URIsMatcher.scala
index bc69454..4e71254 100644
--- a/core/src/main/scala/org/dorest/server/rest/URIsMatcher.scala
+++ b/core/src/main/scala/org/dorest/server/rest/URIsMatcher.scala
@@ -21,10 +21,20 @@ package rest
  *
  * @author Michael Eichberg
  */
-trait RESTURIsMatcher {
+trait URIsMatcher {
+
+    type PathMatcher = (String) ⇒ Option[Handler]
 
     // NEEDS TO BE PROVIDED BY THE CLASS WHERE THIS CLASS IS MIXED IN
-    //    def register(handlerFactory: HandlerFactory[Handler])
+    def register(handlerFactory: HandlerFactory): Unit
+
+    def addPathMatcher(pathMatcher: PathMatcher) {
+        register(new HandlerFactory {
+            def matchURI(path: String, query: String): Option[Handler] = {
+                pathMatcher(path)
+            }
+        })
+    }
 
     /**
      * Use ROOT to match a URI that ends with "/" and where all previous segments have been successfully
@@ -71,13 +81,11 @@ trait RESTURIsMatcher {
         }
     }
 
-    type PathMatcher = (String) ⇒ Option[Handler]
-
     case class /(matcher: PartialFunction[String, PathMatcher]) extends PathMatcher {
 
         /**
          * @param completePath A valid URI path (or the yet unmatched part of the URI).
-         *		The completePath is either null or is a string that starts with a "/".
+         * 		The completePath is either null or is a string that starts with a "/".
          * 		The semantics of null is that the complete path was matched; i.e., there
          * 		is no remaining part.
          */
@@ -112,24 +120,6 @@ trait RESTURIsMatcher {
         /(matcher)
     }
 
-    //    def addPath(pathMatcher: PathMatcher) {
-    //
-    //    }
-
-    //    this addPath (
-    //        / {
-    //            case ROOT() ⇒ new Handler {}
-    //            case "lectures" ⇒ / {
-    //                case EOL()  ⇒ new Handler {} /* General information about lectures */
-    //                case ROOT() ⇒ new Handler {} /* The lectures */
-    //                case STRING(lectureId) ⇒ / {
-    //                    //case NIL        ⇒ null /* General Information about the lecture */
-    //                    case "slides" ⇒ new Handler {}
-    //                }
-    //            }
-    //            case "users" ⇒ new Handler {}
-    //        }
-    //    )
 }
 
 
diff --git a/core/src/test/scala/org/dorest/server/rest/URIsMatcherTest.scala b/core/src/test/scala/org/dorest/server/rest/URIsMatcherTest.scala
index 6d1504b..aece6a5 100644
--- a/core/src/test/scala/org/dorest/server/rest/URIsMatcherTest.scala
+++ b/core/src/test/scala/org/dorest/server/rest/URIsMatcherTest.scala
@@ -22,10 +22,12 @@ import org.scalatest.FlatSpec
 import org.scalatest.matchers.ShouldMatchers
 
 /**
+ * Tests the matching of URIs.
+ *
  * @author Michael Eichberg
  */
 @RunWith(classOf[JUnitRunner])
-class RESTURIsMatcherTest extends FlatSpec with ShouldMatchers {
+class URIsMatcherTest extends FlatSpec with ShouldMatchers {
 
     // just some dummy handlers
     class DummyHandler extends Handler {
@@ -42,35 +44,43 @@ class RESTURIsMatcherTest extends FlatSpec with ShouldMatchers {
     object GHandler extends DummyHandler
 
     case class LongHandler(l: Long) extends DummyHandler
+    case class PathHandler(p: String) extends DummyHandler
 
     // some URIMatcher instance
-    val URIMatcher = new RESTURIsMatcher {}
+    val URIMatcher = new URIsMatcher {
+
+        def register(handlerFactory: HandlerFactory) { throw new Error() }
+
+    }
 
     import URIMatcher._
 
-    val exhaustiveMatcher =  / {
+    val exhaustiveMatcher = / {
         case ""         ⇒ AHandler
         case "lectures" ⇒ BHandler
         case "users" ⇒ / {
-            case MATCHED()   ⇒ CHandler
-            case ROOT() ⇒ DHandler
+            case MATCHED() ⇒ CHandler
+            case ROOT()    ⇒ DHandler
             case LONG(userId) if userId > 0 ⇒ / {
                 case EOL()      ⇒ LongHandler(userId)
                 case ROOT()     ⇒ FHandler
                 case "comments" ⇒ GHandler
             }
-
         }
+        case "static" ⇒ (path: String) ⇒ Some(PathHandler(path))
     }
 
     "A RESTURIsMatcher" should "correctly match valid URIs" in {
-        exhaustiveMatcher("/") should be (Some(AHandler))
+        exhaustiveMatcher("/") should be(Some(AHandler))
         exhaustiveMatcher("/lectures") should be(Some(BHandler))
         exhaustiveMatcher("/users") should be(Some(CHandler))
         exhaustiveMatcher("/users/") should be(Some(DHandler))
         exhaustiveMatcher("/users/121212") should be(Some(LongHandler(121212)))
         exhaustiveMatcher("/users/23233321212/") should be(Some(FHandler))
         exhaustiveMatcher("/users/23233321212/comments") should be(Some(GHandler))
+        exhaustiveMatcher("/static") should be(Some(PathHandler(null)))
+        exhaustiveMatcher("/static/") should be(Some(PathHandler("/")))
+        exhaustiveMatcher("/static/index.html") should be(Some(PathHandler("/index.html")))
     }
 
     it should "handle URIs that do not match without throwing exceptions" in {
diff --git a/demo/HelloWorld/pom.xml b/demo/HelloWorld/pom.xml
index 620d90d..2e1f8e3 100644
--- a/demo/HelloWorld/pom.xml
+++ b/demo/HelloWorld/pom.xml
@@ -20,7 +20,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.somegroup</groupId>
 	<artifactId>helloworld</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1.0.0</version>
 	<name>${project.artifactId}</name>
 
 	<properties>
@@ -56,7 +56,7 @@
 		<dependency>
 			<groupId>org.dorest</groupId>
 			<artifactId>org.dorest.core</artifactId>
-			<version>0.0.0-SNAPSHOT</version>
+			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Test-Dependencies -->
@@ -69,7 +69,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.8.2</version>
+			<version>4.10</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/demo/HelloWorld/src/main/scala/helloworld/HelloWorldServer.scala b/demo/HelloWorld/src/main/scala/helloworld/HelloWorldServer.scala
index 10f60e9..5c9ffd0 100644
--- a/demo/HelloWorld/src/main/scala/helloworld/HelloWorldServer.scala
+++ b/demo/HelloWorld/src/main/scala/helloworld/HelloWorldServer.scala
@@ -18,22 +18,16 @@ package helloworld
 import org.dorest.server.jdk.JDKServer
 import org.dorest.server.rest.RESTInterface
 import org.dorest.server.rest.TEXTSupport
-import org.dorest.server.HandlerFactory
 
-// server object
-object HelloWorldServer extends JDKServer(9000) with App {
+object HelloWorldServer extends JDKServer(9010) with App {
 
-   // registering the handler
-  this register new HandlerFactory[HelloWorldHandler] {
-    path { "/hello" }
-    def create = new HelloWorldHandler
-  }
-  
-  // handler
-  class HelloWorldHandler extends RESTInterface with TEXTSupport {
-    get returns TEXT { "Hello World!" }
-  }
-
-  start()
+    this addPathMatcher {
+        / {
+            case "hello" ⇒ new RESTInterface with TEXTSupport {
+                get returns TEXT { "Hello World!" }
+            }
+        }
+    }
 
+    start()
 }
diff --git a/demo/iSmallNotes/pom.xml b/demo/iSmallNotes/pom.xml
index e2d24d2..958246c 100644
--- a/demo/iSmallNotes/pom.xml
+++ b/demo/iSmallNotes/pom.xml
@@ -21,13 +21,13 @@
 	<parent>
 		<groupId>org.dorest</groupId>
 		<artifactId>org.dorest.demos</artifactId>
-		<version>0.0.0-SNAPSHOT</version>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 
 	<groupId>de.smallnotes</groupId>
 	<artifactId>de.smallnotes</artifactId>
 	<name>iSmallNotes</name>
-	
+
 	<build>
 		<plugins>
 			<plugin>
@@ -40,7 +40,7 @@
 			</plugin>
 		</plugins>
 	</build>
-	
+
 	<dependencies>
 		<dependency>
 			<groupId>org.dorest</groupId>
diff --git a/demo/iSmallNotes/src/main/scala/de/smallnotes/Notes.scala b/demo/iSmallNotes/src/main/scala/de/smallnotes/Notes.scala
index c727f77..f2d71f9 100644
--- a/demo/iSmallNotes/src/main/scala/de/smallnotes/Notes.scala
+++ b/demo/iSmallNotes/src/main/scala/de/smallnotes/Notes.scala
@@ -2,16 +2,14 @@ package de.smallnotes
 
 import org.dorest.server.rest.RESTInterface
 import org.dorest.server.rest.representation.orgjson.ORGJSONSupport
-import org.json.{JSONObject, JSONArray}
+import org.json.{ JSONObject, JSONArray }
 
-class Notes
+class Notes(var tagId: Long)
         extends RESTInterface
         with SmallNotesAuthorization
         with JDBCTransactionProvider
         with ORGJSONSupport {
 
-    var t_id: Long = _
-
     get returns JSON {
         val stmt = connection.prepareStatement(
             """
@@ -21,7 +19,7 @@ class Notes
             """
         )
         stmt.setString(1, authenticatedUser)
-        stmt.setLong(2, t_id)
+        stmt.setLong(2, tagId)
         val rs = stmt.executeQuery()
         val ja = new JSONArray()
         while (rs.next()) {
@@ -38,7 +36,7 @@ class Notes
         val call = connection.prepareCall("{call add_note(?,?,?,?)}")
         call.registerOutParameter(4, java.sql.Types.BIGINT)
         call.setString(1, authenticatedUser)
-        call.setLong(2, t_id)
+        call.setLong(2, tagId)
         call.setString(3, note)
         call.execute()
         val jo = new JSONObject()
diff --git a/demo/iSmallNotes/src/main/scala/de/smallnotes/SmallNotesApplication.scala b/demo/iSmallNotes/src/main/scala/de/smallnotes/SmallNotesApplication.scala
index db75abf..c1cbf85 100644
--- a/demo/iSmallNotes/src/main/scala/de/smallnotes/SmallNotesApplication.scala
+++ b/demo/iSmallNotes/src/main/scala/de/smallnotes/SmallNotesApplication.scala
@@ -1,53 +1,38 @@
 package de.smallnotes
 
-import org.dorest.server.{MappedDirectory, HandlerFactory}
+import org.dorest.server.{ MappedDirectory, HandlerFactory }
 import org.dorest.server.jdk.JDKServer
 
 class SmallNotesApplication
 
 object SmallNotesApplication extends JDKServer(8182) with App {
 
-    this register new HandlerFactory[Notes] {
-        path {
-            "/api/tags/" :: LongValue((v) => _.t_id = v) :: "/notes" :: Optional("/")
-        }
-
-        def create = new Notes
-    }
-
-    this register new HandlerFactory[Tag] {
-        path {
-            "/tags/" :: LongValue((v) => _.id = v)
-        }
-
-        def create = new Tag
-    }
-
-    this register new HandlerFactory[Tags] {
-        path {
-            "/api/tags"
-        }
-
-        def create(): Tags = new Tags
+    val rootWebappFolder = {
+        var rwf = System.getProperty("de.smallnotes.resources.webapp")
+        if (!(rwf eq null))
+            rwf
+        else
+            "src/main/resources/webapp"
     }
 
-    this register new HandlerFactory[MappedDirectory] {
-        path {
-            "/webapp" :: AnyPath((v) => _.path = v)
+    this addPathMatcher (
+        / {
+            case "api" ⇒ / {
+                case "tags" ⇒ / {
+                    case MATCHED() ⇒ new Tags
+                    case LONG(tagId) ⇒ / {
+                        case "notes" ⇒ new Notes(tagId)
+                    }
+                }
+            }
+            case "tags" ⇒ / {
+                case LONG(id) ⇒ new Tag(id)
+            }
+            case "webapp" ⇒ (path) ⇒ Some(new MappedDirectory(rootWebappFolder, path, true))
         }
-
-        def create(): MappedDirectory = new MappedDirectory({
-
-            val dir = System.getProperty("de.smallnotes.resources.webapp")
-            if (!(dir eq null))
-                dir
-            else
-                "src/main/resources/webapp"
-        },true)
-    }
+    )
 
     start()
-
 }
 
 
diff --git a/demo/iSmallNotes/src/main/scala/de/smallnotes/Tag.scala b/demo/iSmallNotes/src/main/scala/de/smallnotes/Tag.scala
index 149276c..0d59938 100644
--- a/demo/iSmallNotes/src/main/scala/de/smallnotes/Tag.scala
+++ b/demo/iSmallNotes/src/main/scala/de/smallnotes/Tag.scala
@@ -3,14 +3,12 @@ package de.smallnotes
 import org.dorest.server.rest.RESTInterface
 import org.dorest.server.rest.representation.orgjson.ORGJSONSupport
 
-class Tag
+class Tag(val id: Long)
         extends RESTInterface
         with SmallNotesAuthorization
         with JDBCTransactionProvider
         with ORGJSONSupport {
 
-    var id: Long = _
-
     delete {
         // TODO model as function... delete_user_tag
         val stmt = connection.prepareStatement("delete from \"TAGS\" where id=?")
diff --git a/demo/pom.xml b/demo/pom.xml
index acad7cc..609e847 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  Copyright 2011 Michael Eichberg et al
- 
+
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
- 
+
  http://www.apache.org/licenses/LICENSE-2.0
- 
+
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,16 +21,16 @@
     <parent>
         <artifactId>org.dorest</artifactId>
         <groupId>org.dorest</groupId>
-        <version>0.0.0-SNAPSHOT</version>
+        <version>0.0.1-SNAPSHOT</version>
     </parent>
 
 	<artifactId>org.dorest.demos</artifactId>
 	<packaging>pom</packaging>
 	<name>DoRest-Demos</name>
-	
+
 	<modules>
         <module>iSmallNotes</module>
         <module>HelloWorld</module>
 	</modules>
-            
+
 </project>
\ No newline at end of file
diff --git a/ext/auth/pom.xml b/ext/auth/pom.xml
index dbf0f64..0e92ddc 100644
--- a/ext/auth/pom.xml
+++ b/ext/auth/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  Copyright 2011 Michael Eichberg et al
- 
+
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
- 
+
  http://www.apache.org/licenses/LICENSE-2.0
- 
+
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,16 +17,16 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-    
+
 	<parent>
         <groupId>org.dorest</groupId>
         <artifactId>org.dorest.ext</artifactId>
-        <version>0.0.0-SNAPSHOT</version>
+        <version>0.0.1-SNAPSHOT</version>
     </parent>
 
 	<artifactId>org.dorest.ext.auth</artifactId>
 	<name>DoRest-Ext-Auth</name>
-	
+
 	<build>
 		<plugins>
 			<plugin>
@@ -39,5 +39,5 @@
 			</plugin>
 		</plugins>
 	</build>
-	
+
 </project>
\ No newline at end of file
diff --git a/ext/basicauth/pom.xml b/ext/basicauth/pom.xml
index 9e177f0..d4571cd 100644
--- a/ext/basicauth/pom.xml
+++ b/ext/basicauth/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  Copyright 2011 Michael Eichberg et al
- 
+
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
- 
+
  http://www.apache.org/licenses/LICENSE-2.0
- 
+
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,12 +21,12 @@
 	<parent>
 		<groupId>org.dorest</groupId>
 		<artifactId>org.dorest.ext</artifactId>
-		<version>0.0.0-SNAPSHOT</version>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.dorest.ext.basicauth</artifactId>
 	<name>DoRest-Ext-BasicAuth</name>
-	
+
 	<build>
 		 <plugins>
 		 	<plugin>
diff --git a/ext/basicauth/src/main/scala/org/dorest/server/auth/Demo.scala b/ext/basicauth/src/main/scala/org/dorest/server/auth/Demo.scala
index 302f45a..9fa9f2b 100644
--- a/ext/basicauth/src/main/scala/org/dorest/server/auth/Demo.scala
+++ b/ext/basicauth/src/main/scala/org/dorest/server/auth/Demo.scala
@@ -28,21 +28,20 @@ import rest._
  * of the {{{SimpleAuthenticator}}} trait.
  */
 trait Authorization
-  extends BasicAuthentication
-   {
-
-  def authenticationRealm = "Demo App"
-    
-  /**
-   * If you require the authentication of the user against, e.g. a database, just mix in an appropriate trait
-   * which implements the {{{Authentication}}} trait including this method.
-   */
-  def password(username: String): Option[String] = {
-    username match {
-      case "max" => Option("safe")
-      case _ => None
+        extends BasicAuthentication {
+
+    def authenticationRealm = "Demo App"
+
+    /**
+     * If you require the authentication of the user against, e.g. a database, just mix in an appropriate trait
+     * which implements the {{{Authentication}}} trait including this method.
+     */
+    def password(username: String): Option[String] = {
+        username match {
+            case "max" ⇒ Option("safe")
+            case _     ⇒ None
+        }
     }
-  }
 
 }
 
@@ -64,73 +63,56 @@ trait Authorization
  * basically just complement the possibilities offered by the Time resource.
  */
 class Time
-  extends RESTInterface
-  with ConsoleLogging
-  with Authorization
-  with PerformanceMonitor
-  with TEXTSupport
-  with HTMLSupport
-  with XMLSupport {
-
-  val dateString = new java.util.Date().toString
-
-  get returns TEXT {
-    dateString
-  }
-
-  get returns HTML {
-    "<html><body>The current (server) time is: " + dateString + "</body></html>"
-  }
-
-  get returns XML {
-    <time>{ dateString }</time>
-  }
-}
-
-class Info extends RESTInterface with Authorization with TEXTSupport {
+        extends RESTInterface
+        with ConsoleLogging
+        with Authorization
+        with PerformanceMonitor
+        with TEXTSupport
+        with HTMLSupport
+        with XMLSupport {
+
+    val dateString = new java.util.Date().toString
+
+    get returns TEXT {
+        dateString
+    }
 
-  var info: String = _
+    get returns HTML {
+        "<html><body>The current (server) time is: " + dateString + "</body></html>"
+    }
 
-  get returns TEXT {
-    "Info: " + info + " [user=" + authenticatedUser.get + "]"
-  }
+    get returns XML {
+        <time>{ dateString }</time>
+    }
 }
 
-class Demo
-
-object Demo
-  extends JDKServer(9000)
-  with ConsoleLogging
-  with App {
+class Info(var info: String) extends RESTInterface with Authorization with TEXTSupport {
 
-  register(new HandlerFactory[Time] {
-    path {
-      "/time"
+    get returns TEXT {
+        "Info: " + info + " [user=" + authenticatedUser.get + "]"
     }
+}
 
-    def create = new Time()
-  })
+class Demo
 
-  register(new HandlerFactory[MappedDirectory] {
+object Demo
+        extends JDKServer(9011)
+        with ConsoleLogging
+        with App {
 
     val userHomeDir = System.getProperty("user.home")
 
-    path {
-      "/static" :: AnyPath(v => _.path = if (v startsWith "/") v else "/" + v)
-    }
-
-    def create = new MappedDirectory(userHomeDir) with Authorization
-  })
-
-  this register new HandlerFactory[Info] {
-    path {
-      "/info/" :: StringValue(_.info = _)
-    }
-
-    def create = new Info with PerformanceMonitor with ConsoleLogging // TODO needs to exchanged
-  }
-
-  start()
+    addPathMatcher(
+        / {
+            case "time" ⇒ new Time
+            case "info" ⇒ / {
+                case STRING(info) ⇒ new Info(info) with PerformanceMonitor with ConsoleLogging
+            }
+            case "static" ⇒ (path) ⇒ Some(new MappedDirectory(userHomeDir, path) with Authorization)
+        }
+    )
+
+    start()
 }
 
 
diff --git a/ext/client/pom.xml b/ext/client/pom.xml
index 30494fa..de4f71c 100644
--- a/ext/client/pom.xml
+++ b/ext/client/pom.xml
@@ -21,12 +21,12 @@
 	<parent>
 		<groupId>org.dorest</groupId>
 		<artifactId>org.dorest.ext</artifactId>
-		<version>0.0.0-SNAPSHOT</version>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.dorest.ext.client</artifactId>
 	<name>DoRest-Ext-Client</name>
-	
+
 	<build>
 		 <plugins>
 		 	<plugin>
@@ -39,7 +39,7 @@
 		 	</plugin>
 		 </plugins>
 	</build>
-	
+
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
diff --git a/ext/digestauth/pom.xml b/ext/digestauth/pom.xml
index 9672068..7162ae1 100644
--- a/ext/digestauth/pom.xml
+++ b/ext/digestauth/pom.xml
@@ -21,12 +21,12 @@
 	<parent>
 		<groupId>org.dorest</groupId>
 		<artifactId>org.dorest.ext</artifactId>
-		<version>0.0.0-SNAPSHOT</version>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.dorest.ext.digestauth</artifactId>
 	<name>DoRest-Ext-DigestAuth</name>
-	
+
 	<build>
 		 <plugins>
 		 	<plugin>
diff --git a/ext/digestauth/src/test/scala/org/dorest/server/auth/DigestAuthenticationTest.scala b/ext/digestauth/src/test/scala/org/dorest/server/auth/DigestAuthenticationTest.scala
index 3cacbfa..18bf401 100644
--- a/ext/digestauth/src/test/scala/org/dorest/server/auth/DigestAuthenticationTest.scala
+++ b/ext/digestauth/src/test/scala/org/dorest/server/auth/DigestAuthenticationTest.scala
@@ -41,37 +41,25 @@ import scala.xml.{ XML, Utility }
  */
 object DigestAuthTestServer extends JDKServer(9999) {
 
-  this register new HandlerFactory[RootResource] {
-    path { "/" }
-    def create = new RootResource
-  }
-
-  this register new HandlerFactory[RestrictedResource] {
-    path { "/restricted" }
-    def create = new RestrictedResource
-  }
-
-  start()
-
-  class RootResource extends RESTInterface with XMLSupport {
-
-    get returns XML { <hello>"Hello!"</hello> }
-
-  }
-
-  class RestrictedResource extends RESTInterface with DigestAuthentication with DigestAuthenticatorMock with XMLSupport {
-
-    get returns XML {<hello>{ "Hello " + authenticatedUser + "!" }</hello>}
-
-  }
-
+    addPathMatcher(
+        / {
+            case ROOT() ⇒ new RESTInterface with XMLSupport {
+                get returns XML { <hello>"Hello!"</hello> }
+            }
+            case "restricted" ⇒ new RESTInterface with DigestAuthentication with DigestAuthenticatorMock with XMLSupport {
+                get returns XML { <hello>{ "Hello " + authenticatedUser + "!" }</hello> }
+            }
+        }
+    )
+
+    start()
 }
 
 trait DigestAuthenticatorMock {
 
-  def authenticationRealm = "http://www.somewhere.org"
+    def authenticationRealm = "http://www.somewhere.org"
 
-  def password(username: String): Option[String] = Some("password")
+    def password(username: String): Option[String] = Some("password")
 
 }
 
@@ -81,31 +69,31 @@ trait DigestAuthenticatorMock {
 @RunWith(classOf[JUnitRunner])
 class DigestAuthenticationTest extends FlatSpec with ShouldMatchers with BeforeAndAfterAll {
 
-  override def beforeAll(configMap: Map[String, Any]) {
-    println("Starting tests")
-    DigestAuthTestServer
-  }
+    override def beforeAll(configMap: Map[String, Any]) {
+        println("Starting tests")
+        DigestAuthTestServer
+    }
 
-  import org.apache.http._
-  val get = SimpleClient.get(Map("ACCEPT" -> "application/xml")) _
-  val authGet = SimpleClient.get(Map("ACCEPT" -> "application/xml"), new DigestAuth("somebody", "password")) _
-  val falseAuthGet = SimpleClient.get(Map("ACCEPT" -> "application/xml"), new DigestAuth("somebody", "falsePassword")) _
+    import org.apache.http._
+    val get = SimpleClient.get(Map("ACCEPT" -> "application/xml")) _
+    val authGet = SimpleClient.get(Map("ACCEPT" -> "application/xml"), new DigestAuth("somebody", "password")) _
+    val falseAuthGet = SimpleClient.get(Map("ACCEPT" -> "application/xml"), new DigestAuth("somebody", "falsePassword")) _
 
-  "RestrictedResource" should "return 401 for unauthorized (no credentials)" in {
-    get("http://localhost:9999/restricted").statusCode should equal { 401 }
-  }
+    "RestrictedResource" should "return 401 for unauthorized (no credentials)" in {
+        get("http://localhost:9999/restricted").statusCode should equal { 401 }
+    }
 
-   it should "return 401 for wrong credentials" in {
-    falseAuthGet("http://localhost:9999/restricted").statusCode should equal { 401 }
-  }
+    it should "return 401 for wrong credentials" in {
+        falseAuthGet("http://localhost:9999/restricted").statusCode should equal { 401 }
+    }
 
-  it should "return 200 for authorized" in {
-    authGet("http://localhost:9999/restricted").statusCode should equal { 200 }
-  }
+    it should "return 200 for authorized" in {
+        authGet("http://localhost:9999/restricted").statusCode should equal { 200 }
+    }
 
 }
 
 object MyApp extends scala.App {
-  DigestAuthTestServer
+    DigestAuthTestServer
 }
 
diff --git a/ext/gson/pom.xml b/ext/gson/pom.xml
index f6322dc..5f885cd 100644
--- a/ext/gson/pom.xml
+++ b/ext/gson/pom.xml
@@ -21,12 +21,12 @@
 	<parent>
 		<groupId>org.dorest</groupId>
 		<artifactId>org.dorest.ext</artifactId>
-		<version>0.0.0-SNAPSHOT</version>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.dorest.ext.gson</artifactId>
 	<name>DoRest-Ext-GSON</name>
-	
+
 	<build>
 		 <plugins>
 		 	<plugin>
diff --git a/ext/gson/src/main/scala/org/dorest/server/rest/representation/gson/Demo.scala b/ext/gson/src/main/scala/org/dorest/server/rest/representation/gson/Demo.scala
index cab20ac..fd03716 100644
--- a/ext/gson/src/main/scala/org/dorest/server/rest/representation/gson/Demo.scala
+++ b/ext/gson/src/main/scala/org/dorest/server/rest/representation/gson/Demo.scala
@@ -65,12 +65,7 @@ class Demo
 
 object Demo extends JDKServer(9000) with App {
 
-    register(new HandlerFactory[DemosResource] {
-        path { "/demos" }
-
-        def create = new DemosResource()
-
-    })
+    addPathMatcher((path) ⇒ if ("/demos" == path) Some(new DemosResource) else None)
 
     start()
 }
diff --git a/ext/multipart/pom.xml b/ext/multipart/pom.xml
index 9e6fa7a..58db264 100644
--- a/ext/multipart/pom.xml
+++ b/ext/multipart/pom.xml
@@ -21,12 +21,12 @@
 	<parent>
 		<groupId>org.dorest</groupId>
 		<artifactId>org.dorest.ext</artifactId>
-		<version>0.0.0-SNAPSHOT</version>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.dorest.ext.multipart</artifactId>
 	<name>DoRest-Ext-Multipart</name>
-	
+
 	<build>
 		 <plugins>
 		 	<plugin>
diff --git a/ext/multipart/src/test/scala/org/dorest/server/rest/representation/multipart/MultipartSupportTest.scala b/ext/multipart/src/test/scala/org/dorest/server/rest/representation/multipart/MultipartSupportTest.scala
index eb0df38..144a2ab 100644
--- a/ext/multipart/src/test/scala/org/dorest/server/rest/representation/multipart/MultipartSupportTest.scala
+++ b/ext/multipart/src/test/scala/org/dorest/server/rest/representation/multipart/MultipartSupportTest.scala
@@ -38,43 +38,41 @@ import org.scalatest.FlatSpec
  */
 object MultipartSupportTestServer extends JDKServer(9998) {
 
-  import org.apache.commons.io.{ IOUtils, FileUtils }
-  this register new HandlerFactory[UploadResource] {
-    path { "/upload" }
-    def create = new UploadResource
-  }
+    import org.apache.commons.io.{ IOUtils, FileUtils }
 
-  start()
+    this addPathMatcher ((path) ⇒ if ("/upload" == path) Some(new UploadResource) else None)
 
-  class UploadResource extends RESTInterface with XMLSupport with MultipartSupport {
+    start()
 
-    def writeByteStream(inputStream: InputStream, file: String) = {
-      val outputStream = new FileOutputStream(file)
-      IOUtils.copy(inputStream, outputStream)
-      outputStream.close()
-    }
+    class UploadResource extends RESTInterface with XMLSupport with MultipartSupport {
+
+        def writeByteStream(inputStream: InputStream, file: String) = {
+            val outputStream = new FileOutputStream(file)
+            IOUtils.copy(inputStream, outputStream)
+            outputStream.close()
+        }
 
-    post of Multipart returns XML {
-      for (part <- multipartIterator) {
-        part match {
-          case part @ FormField("someString") => println(part.content)
-          case part @ Data("someFile", MediaType.APPLICATION_PDF) => {
-            val fos = new FileOutputStream(new File("target/test-uploaded.pdf"))
-            var read: Int = 0
-            val stream = part.openStream
-            while ({ read = stream.read; read != -1 }) {
-              fos.write(read)
+        post of Multipart returns XML {
+            for (part ← multipartIterator) {
+                part match {
+                    case part @ FormField("someString") ⇒ println(part.content)
+                    case part @ Data("someFile", MediaType.APPLICATION_PDF) ⇒ {
+                        val fos = new FileOutputStream(new File("target/test-uploaded.pdf"))
+                        var read: Int = 0
+                        val stream = part.openStream
+                        while ({ read = stream.read; read != -1 }) {
+                            fos.write(read)
+                        }
+                        stream.close()
+                        fos.flush()
+                        fos.close()
+                    }
+                }
             }
-            stream.close()
-            fos.flush()
-            fos.close()
-          }
+            <success/>
         }
-      }
-      <success/>
-    }
 
-  }
+    }
 
 }
 
@@ -84,18 +82,18 @@ object MultipartSupportTestServer extends JDKServer(9998) {
 @RunWith(classOf[JUnitRunner])
 class MultipartSupportTest extends FlatSpec with ShouldMatchers with BeforeAndAfterAll {
 
-  override def beforeAll(configMap: Map[String, Any]) {
-    println("Starting MultipartSupportTest")
-    MultipartSupportTestServer
-  }
+    override def beforeAll(configMap: Map[String, Any]) {
+        println("Starting MultipartSupportTest")
+        MultipartSupportTestServer
+    }
 
-  val post = SimpleClient.post(Map("Accept" -> "application/xml"), new DigestAuth("somebody", "password")) _
+    val post = SimpleClient.post(Map("Accept" -> "application/xml"), new DigestAuth("somebody", "password")) _
 
-  "MultipartSupport" should "allow a client to POST a pdf" in {
-    val response = post("http://localhost:9998/upload",
-      Entity("someString" -> Part("foo"),
-        "someFile" -> Part(new File("src/test/resources/test.pdf"), "application/pdf")))
-  }
+    "MultipartSupport" should "allow a client to POST a pdf" in {
+        val response = post("http://localhost:9998/upload",
+            Entity("someString" -> Part("foo"),
+                "someFile" -> Part(new File("src/test/resources/test.pdf"), "application/pdf")))
+    }
 
 }
 
diff --git a/ext/orgjson/pom.xml b/ext/orgjson/pom.xml
index 6fb2ffc..ded6b72 100644
--- a/ext/orgjson/pom.xml
+++ b/ext/orgjson/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  Copyright 2011 Michael Eichberg et al
- 
+
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
- 
+
  http://www.apache.org/licenses/LICENSE-2.0
- 
+
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,12 +21,12 @@
 	<parent>
         <groupId>org.dorest</groupId>
         <artifactId>org.dorest.ext</artifactId>
-        <version>0.0.0-SNAPSHOT</version>
+        <version>0.0.1-SNAPSHOT</version>
     </parent>
 
 	<artifactId>org.dorest.ext.orgjson</artifactId>
 	<name>DoRest-Ext-ORGJSON</name>
-	
+
 	<build>
 		 <plugins>
 		 	<plugin>
@@ -39,7 +39,7 @@
 		 	</plugin>
 		 </plugins>
 	</build>
-    
+
 	<dependencies>
         <dependency>
         	<groupId>org.json</groupId>
diff --git a/ext/orgjson/src/main/scala/org/dorest/server/rest/representation/orgjson/Demo.scala b/ext/orgjson/src/main/scala/org/dorest/server/rest/representation/orgjson/Demo.scala
index 913ecb8..a0d751f 100644
--- a/ext/orgjson/src/main/scala/org/dorest/server/rest/representation/orgjson/Demo.scala
+++ b/ext/orgjson/src/main/scala/org/dorest/server/rest/representation/orgjson/Demo.scala
@@ -98,20 +98,12 @@ class Demo
 
 object Demo extends JDKServer(9000) with App {
 
-    register(new HandlerFactory[Echo] {
-        path { "/echo" }
-
-        def create = new Echo()
-
-    })
-
-    register(new HandlerFactory[Time] {
-
-        path { "/time" }
-
-        def create = new Time() with PerformanceMonitor with ConsoleLogging
-
-    })
+    addPathMatcher(
+        / {
+            case "echo" ⇒ new Echo()
+            case "time" ⇒ new Time() with PerformanceMonitor with ConsoleLogging
+        }
+    )
 
     start()
 }
diff --git a/ext/pom.xml b/ext/pom.xml
index 17777b4..39eba1e 100644
--- a/ext/pom.xml
+++ b/ext/pom.xml
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2011 Michael Eichberg et al
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
+<!-- Copyright 2011 Michael Eichberg et al Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+	this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+	Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS
+	IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
+	governing permissions and limitations under the License. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +11,7 @@
 	<parent>
 		<artifactId>org.dorest</artifactId>
 		<groupId>org.dorest</groupId>
-		<version>0.0.0-SNAPSHOT</version>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.dorest.ext</artifactId>
@@ -35,7 +25,6 @@
 		<module>orgjson</module>
 		<module>gson</module>
 		<module>servlet</module>
-		<module>tiscaf</module>
 		<module>client</module>
 		<module>stream</module>
 		<module>multipart</module>
@@ -78,11 +67,6 @@
 				<artifactId>org.dorest.ext.servlet</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.dorest</groupId>
-				<artifactId>org.dorest.ext.tiscaf</artifactId>
-				<version>${project.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.dorest</groupId>
 				<artifactId>org.dorest.ext.client</artifactId>
diff --git a/ext/servlet/pom.xml b/ext/servlet/pom.xml
index fa26f01..d78d6c8 100644
--- a/ext/servlet/pom.xml
+++ b/ext/servlet/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  Copyright 2011 Michael Eichberg et al
- 
+
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
- 
+
  http://www.apache.org/licenses/LICENSE-2.0
- 
+
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.dorest</groupId>
 		<artifactId>org.dorest.ext</artifactId>
-		<version>0.0.0-SNAPSHOT</version>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.dorest.ext.servlet</artifactId>
diff --git a/ext/servlet/src/main/scala/org/dorest/server/servlet/Demo.scala b/ext/servlet/src/main/scala/org/dorest/server/servlet/Demo.scala
index 353f8b4..d803745 100644
--- a/ext/servlet/src/main/scala/org/dorest/server/servlet/Demo.scala
+++ b/ext/servlet/src/main/scala/org/dorest/server/servlet/Demo.scala
@@ -26,46 +26,43 @@ import utils._
 /**
  * After the start go to: "http://localhost:8080/time"
  */
-object TimeServer extends JettyServer(8080) {
+object TimeServer extends JettyServer(8080) with URIsMatcher {
 
-  register(new HandlerFactory[Time] {
-    path {
-      "/time"
-    }
-
-    def create = new Time() with PerformanceMonitor
-  })
+    addPathMatcher({ // we match the entire path in one step
+        case "/time" ⇒ Some(new Time() with PerformanceMonitor)
+        case _       ⇒ None
+    })
 
 }
 
 class Time
-  extends RESTInterface
-  with PerformanceMonitor
-  with ConsoleLogging
-  with TEXTSupport
-  with HTMLSupport
-  with XMLSupport {
+        extends RESTInterface
+        with PerformanceMonitor
+        with ConsoleLogging
+        with TEXTSupport
+        with HTMLSupport
+        with XMLSupport {
 
-  val dateString = new java.util.Date().toString
+    val dateString = new java.util.Date().toString
 
-  get returns TEXT {
-    dateString
-  }
+    get returns TEXT {
+        dateString
+    }
 
-  get returns HTML {
-    "<html><body>The current (server) time is: " + dateString + "</body></html>"
-  }
+    get returns HTML {
+        "<html><body>The current (server) time is: " + dateString + "</body></html>"
+    }
 
-  get returns XML {
-    <time>
+    get returns XML {
+        <time>
       { dateString }
     </time>
-  }
+    }
 }
 
 object MyApp extends scala.App {
 
-  TimeServer
+    TimeServer
 
 }
 
diff --git a/ext/servlet/src/main/scala/org/dorest/server/servlet/DoRestServlet.scala b/ext/servlet/src/main/scala/org/dorest/server/servlet/DoRestServlet.scala
index b8c38f6..f6da7a7 100644
--- a/ext/servlet/src/main/scala/org/dorest/server/servlet/DoRestServlet.scala
+++ b/ext/servlet/src/main/scala/org/dorest/server/servlet/DoRestServlet.scala
@@ -30,11 +30,11 @@ import org.dorest.server.log.Logger
  */
 object DoRestServlet {
 
-  private var _factories: Buffer[HandlerFactory[_ <: Handler]] = Buffer()
+  private var _factories: Buffer[HandlerFactory] = Buffer()
 
   def factories = _factories
 
-  def register(handlerFactory: HandlerFactory[_ <: Handler]) {
+  def register(handlerFactory: HandlerFactory) {
     _factories += handlerFactory
   }
 
@@ -76,7 +76,7 @@ class DoRestServlet extends javax.servlet.http.HttpServlet with DoRestServer {
             }
           }
 
-          // try to process a request and yield a response 
+          // try to process a request and yield a response
           // (unpacking RequestExceptions to responses in case of throw)
           val response: Response = {
             try {
@@ -85,7 +85,7 @@ class DoRestServlet extends javax.servlet.http.HttpServlet with DoRestServer {
               case ex: RequestException => ex.response
             }
           }
-          
+
           try {
             res.setStatus(response.code);
             response.body match {
diff --git a/ext/servlet/src/main/scala/org/dorest/server/servlet/JettyServer.scala b/ext/servlet/src/main/scala/org/dorest/server/servlet/JettyServer.scala
index 3f7c4b5..a35b4f9 100644
--- a/ext/servlet/src/main/scala/org/dorest/server/servlet/JettyServer.scala
+++ b/ext/servlet/src/main/scala/org/dorest/server/servlet/JettyServer.scala
@@ -72,7 +72,7 @@ class JettyServer(val port: Int) extends DoRestServer {
     resourceHandler.setResourceBase("./");
 
     // recall that Jetty takes into account
-    // the first handler which matches the requested URI    
+    // the first handler which matches the requested URI
     mainHandler.addHandler(resourceHandler);
     mainHandler.addHandler(servletHandler);
     server.setHandler(mainHandler);
@@ -108,7 +108,7 @@ class JettyServer(val port: Int) extends DoRestServer {
   /**
    * Delegated to the global registry.
    */
-  def register(handlerFactory: HandlerFactory[_ <: Handler]) {
+  def register(handlerFactory: HandlerFactory) {
     DoRestServlet.register(handlerFactory)
   }
 
diff --git a/ext/stream/pom.xml b/ext/stream/pom.xml
index 62a2a56..636540d 100644
--- a/ext/stream/pom.xml
+++ b/ext/stream/pom.xml
@@ -21,12 +21,12 @@
 	<parent>
 		<groupId>org.dorest</groupId>
 		<artifactId>org.dorest.ext</artifactId>
-		<version>0.0.0-SNAPSHOT</version>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.dorest.ext.stream</artifactId>
 	<name>DoRest-Ext-Stream</name>
-	
+
 	<build>
 		 <plugins>
 		 	<plugin>
diff --git a/ext/stream/src/test/scala/org/dorest/server/rest/representation/stream/StreamSupportTest.scala b/ext/stream/src/test/scala/org/dorest/server/rest/representation/stream/StreamSupportTest.scala
index c71252a..a752be6 100644
--- a/ext/stream/src/test/scala/org/dorest/server/rest/representation/stream/StreamSupportTest.scala
+++ b/ext/stream/src/test/scala/org/dorest/server/rest/representation/stream/StreamSupportTest.scala
@@ -24,190 +24,185 @@ import org.apache.commons.io.{ IOUtils, FileUtils }
  */
 object StreamSupportTestServer extends JDKServer(9999) {
 
-  this register new HandlerFactory[ByteStreamResource] {
-    path { "/bytestream" }
-    def create = new ByteStreamResource
-  }
+    addPathMatcher(
+        / {
+            case "bytestream" ⇒ / {
+                case MATCHED() ⇒ new ByteStreamResource
+                case "bytes"   ⇒ new ByteStreamBytesResource
+            }
+            case "characterstream" ⇒ / {
+                case STRING(encoding) ⇒ new CharacterStreamResource(encoding)
+            }
+        }
+    )
+
+    start()
+
+    class ByteStreamResource extends RESTInterface with XMLSupport with StreamSupport {
+
+        def byteStream(filePath: String): Option[(InputStream, Int)] = {
+            val file = new File(filePath);
+            Some((new BufferedInputStream(new FileInputStream(file)), file.length.toInt))
+        }
+
+        get returns ByteStream(MediaType.APPLICATION_PDF) {
+            byteStream("src/test/resources/test.pdf")
+        }
+
+        get returns ByteStream(MediaType.IMAGE_PNG) {
+            byteStream("src/test/resources/test.png")
+        }
+
+        def writeByteStream(inputStream: InputStream, file: String) = {
+            val outputStream = new FileOutputStream(file)
+            IOUtils.copy(inputStream, outputStream)
+            outputStream.close()
+        }
+
+        put of InputStream(MediaType.APPLICATION_PDF) returns XML {
+            writeByteStream(inputStream, "temp/uploaded (bytestream).pdf")
+            <success/>
+        }
+
+        put of InputStream(MediaType.IMAGE_PNG) returns XML {
+            writeByteStream(inputStream, "temp/uploaded (bytestream).png")
+            <success/>
+        }
 
-  this register new HandlerFactory[ByteStreamBytesResource] {
-    path { "/bytestream/bytes" }
-    def create = new ByteStreamBytesResource
-  }
-
-  this register new HandlerFactory[CharacterStreamResource] {
-    path { "/characterstream/" :: StringValue((cs, enc) => cs.encoding = enc) }
-    def create = new CharacterStreamResource
-  }
+    }
 
-  start()
+    class ByteStreamBytesResource extends RESTInterface with XMLSupport with StreamSupport {
 
-  class ByteStreamResource extends RESTInterface with XMLSupport with StreamSupport {
+        put of InputStream(MediaType.APPLICATION_PDF) returns XML {
+            FileUtils.writeByteArrayToFile(new java.io.File("temp/uploaded (bytes).pdf"), bytes)
+            <success/>
+        }
 
-    def byteStream(filePath: String): Option[(InputStream, Int)] = {
-      val file = new File(filePath); 
-      Some((new BufferedInputStream(new FileInputStream(file)), file.length.toInt))
+        put of InputStream(MediaType.IMAGE_PNG) returns XML {
+            FileUtils.writeByteArrayToFile(new java.io.File("temp/uploaded (bytes).png"), bytes)
+            <success/>
+        }
     }
 
-    get returns ByteStream(MediaType.APPLICATION_PDF) {
-      byteStream("src/test/resources/test.pdf")
-    }
+    /**
+     * We write files with different encodings as UTF-8
+     */
+    class CharacterStreamResource(var encoding: String) extends RESTInterface with XMLSupport with StreamSupport {
+
+        put of InputStream(MediaType.APPLICATION_XML) returns XML {
+            FileUtils.writeStringToFile(new File("temp/uploaded_%s->utf-8 (characterStream).xml" format encoding),
+                IOUtils.toString(reader), "UTF-8")
+            <success/>
+        }
+
+        put of InputStream(MediaType.TEXT_PLAIN) returns XML {
+            FileUtils.writeStringToFile(new File("temp/uploaded_%s->utf-8 (characterStream).txt" format encoding),
+                IOUtils.toString(reader), "UTF-8")
+            <success/>
+        }
+
+        get returns CharacterStream(MediaType.APPLICATION_XML) {
+            val fis = new FileInputStream("src/test/resources/test_utf-8.xml");
+            val isr = new InputStreamReader(fis, "UTF-8");
+            val bsr = new BufferedReader(isr);
+            (bsr, 60)
+        }
 
-    get returns ByteStream(MediaType.IMAGE_PNG) {
-      byteStream("src/test/resources/test.png")
     }
 
-    def writeByteStream(inputStream: InputStream, file: String) = {
-      val outputStream= new FileOutputStream(file)
-      IOUtils.copy(inputStream, outputStream)
-      outputStream.close()
-    }
+}
 
-    put of InputStream(MediaType.APPLICATION_PDF) returns XML {
-      writeByteStream(inputStream, "temp/uploaded (bytestream).pdf")
-      <success/>
-    }
+/**
+ * PDFs, PNGs and textfiles located in test/resources are up- and downloaded via SimpleClient and stored in /temp.
+ * The "/temp"-directory is not deleted after the test, to enable control additional of results and proper charset-conversions.
+ *
+ * @author Mateusz Parzonka
+ */
+@RunWith(classOf[JUnitRunner])
+class StreamSupportTest extends FlatSpec with ShouldMatchers with BeforeAndAfterAll {
 
-    put of InputStream(MediaType.IMAGE_PNG) returns XML {
-      writeByteStream(inputStream, "temp/uploaded (bytestream).png")
-      <success/>
+    override def beforeAll(configMap: Map[String, Any]) {
+        println("Starting StreamSupportTest")
+        StreamSupportTestServer
     }
 
-  }
+    def get(contentType: String) = SimpleClient.get(Map("Accept" -> contentType)) _
+    val put = SimpleClient.put(Map("Accept" -> "application/xml")) _
 
-  class ByteStreamBytesResource extends RESTInterface with XMLSupport with StreamSupport {
+    "StreamSupport with bytestream" should "allow a client to GET a pdf" in {
+        val response = get("application/pdf")("http://localhost:9999/bytestream")
+        response.statusCode should equal { 200 }
+        response.contentType should equal { "application/pdf; charset=UTF-8" }
+        org.apache.commons.io.FileUtils.writeByteArrayToFile(new java.io.File("temp/downloaded.pdf"), response.bytes)
+    }
 
-    put of InputStream(MediaType.APPLICATION_PDF) returns XML {
-      FileUtils.writeByteArrayToFile(new java.io.File("temp/uploaded (bytes).pdf"), bytes)
-      <success/>
+    it should "allow a client to GET a png" in {
+        val response = get("image/png")("http://localhost:9999/bytestream")
+        response.statusCode should equal { 200 }
+        response.contentType should equal { "image/png; charset=UTF-8" }
+        FileUtils.writeByteArrayToFile(new java.io.File("temp/downloaded.png"), response.bytes)
     }
 
-    put of InputStream(MediaType.IMAGE_PNG) returns XML {
-      FileUtils.writeByteArrayToFile(new java.io.File("temp/uploaded (bytes).png"), bytes)
-      <success/>
+    it should "allow a client to PUT a pdf" in {
+        val response = put("http://localhost:9999/bytestream", Entity(new File("src/test/resources/test.pdf"), "application/pdf"))
+        response.statusCode should equal { 200 }
+        response.contentType should equal { "application/xml; charset=UTF-8" }
     }
-  }
 
-  /**
-   * We write files with different encodings as UTF-8
-   */
-  class CharacterStreamResource extends RESTInterface with XMLSupport with StreamSupport {
+    it should "allow a client to PUT a 2 MB pdf" in {
+        val response = put("http://localhost:9999/bytestream", Entity(new File("src/test/resources/Better Builds With Maven.pdf"), "application/pdf"))
+        response.statusCode should equal { 200 }
+        response.contentType should equal { "application/xml; charset=UTF-8" }
+    }
 
-    var encoding: String = _
+    it should "allow a client to PUT a png" in {
+        val response = put("http://localhost:9999/bytestream", Entity(new File("src/test/resources/test.png"), "image/png"))
+        response.statusCode should equal { 200 }
+        response.contentType should equal { "application/xml; charset=UTF-8" }
+    }
 
-    put of InputStream(MediaType.APPLICATION_XML) returns XML {
-      FileUtils.writeStringToFile(new File("temp/uploaded_%s->utf-8 (characterStream).xml" format encoding),
-        IOUtils.toString(reader), "UTF-8")
-      <success/>
+    "StreamSupport with bytes" should "allow a client to PUT a pdf" in {
+        val response = put("http://localhost:9999/bytestream/bytes", Entity(new File("src/test/resources/test.pdf"), "application/pdf"))
+        response.statusCode should equal { 200 }
+        response.contentType should equal { "application/xml; charset=UTF-8" }
     }
 
-    put of InputStream(MediaType.TEXT_PLAIN) returns XML {
-      FileUtils.writeStringToFile(new File("temp/uploaded_%s->utf-8 (characterStream).txt" format encoding),
-        IOUtils.toString(reader), "UTF-8")
-      <success/>
+    it should "allow a client to PUT a png" in {
+        val response = put("http://localhost:9999/bytestream/bytes", Entity(new File("src/test/resources/test.png"), "image/png"))
+        response.statusCode should equal { 200 }
+        response.contentType should equal { "application/xml; charset=UTF-8" }
     }
 
-    get returns CharacterStream(MediaType.APPLICATION_XML) {
-      val fis = new FileInputStream("src/test/resources/test_utf-8.xml");
-      val isr = new InputStreamReader(fis, "UTF-8");
-      val bsr = new BufferedReader(isr);
-      (bsr, 60)
+    "StreamSupport with characterStream" should "allow a client to PUT xml using UTF-8" in {
+        val response = put("http://localhost:9999/characterstream/UTF-8", Entity(new File("src/test/resources/test_utf-8.xml"), "application/xml; charset=UTF-8"))
+        response.statusCode should equal { 200 }
+        response.contentType should equal { "application/xml; charset=UTF-8" }
     }
 
-  }
+    it should "allow a client to PUT xml using ISO-8859-1" in {
+        val response = put("http://localhost:9999/characterstream/ISO-8859-1", Entity(new File("src/test/resources/test_ISO-8859-1.xml"), "application/xml; charset=ISO-8859-1"))
+        response.statusCode should equal { 200 }
+        response.contentType should equal { "application/xml; charset=UTF-8" }
+    }
 
-}
+    it should "allow a client to PUT text using UTF-8" in {
+        val response = put("http://localhost:9999/characterstream/UTF-8", Entity(new File("src/test/resources/test_utf-8.txt"), "text/plain; charset=UTF-8"))
+        response.statusCode should equal { 200 }
+        response.contentType should equal { "application/xml; charset=UTF-8" }
+    }
 
-/**
- * PDFs, PNGs and textfiles located in test/resources are up- and downloaded via SimpleClient and stored in /temp.
- * The "/temp"-directory is not deleted after the test, to enable control additional of results and proper charset-conversions.
- * 
- * @author Mateusz Parzonka
- */
-@RunWith(classOf[JUnitRunner])
-class StreamSupportTest extends FlatSpec with ShouldMatchers with BeforeAndAfterAll {
+    it should "allow a client to PUT text using ISO-8859-1" in {
+        val response = put("http://localhost:9999/characterstream/ISO-8859-1", Entity(new File("src/test/resources/test_ISO-8859-1.txt"), "text/plain; charset=ISO-8859-1"))
+        response.statusCode should equal { 200 }
+        response.contentType should equal { "application/xml; charset=UTF-8" }
+    }
 
-  override def beforeAll(configMap: Map[String, Any]) {
-    println("Starting StreamSupportTest")
-    StreamSupportTestServer
-  }
-
-  def get(contentType: String) = SimpleClient.get(Map("Accept" -> contentType)) _
-  val put = SimpleClient.put(Map("Accept" -> "application/xml")) _
-
-  "StreamSupport with bytestream" should "allow a client to GET a pdf" in {
-    val response = get("application/pdf")("http://localhost:9999/bytestream")
-    response.statusCode should equal { 200 }
-    response.contentType should equal { "application/pdf; charset=UTF-8" }
-    org.apache.commons.io.FileUtils.writeByteArrayToFile(new java.io.File("temp/downloaded.pdf"), response.bytes)
-  }
-
-  it should "allow a client to GET a png" in {
-    val response = get("image/png")("http://localhost:9999/bytestream")
-    response.statusCode should equal { 200 }
-    response.contentType should equal { "image/png; charset=UTF-8" }
-    FileUtils.writeByteArrayToFile(new java.io.File("temp/downloaded.png"), response.bytes)
-  }
-
-  it should "allow a client to PUT a pdf" in {
-    val response = put("http://localhost:9999/bytestream", Entity(new File("src/test/resources/test.pdf"), "application/pdf"))
-    response.statusCode should equal { 200 }
-    response.contentType should equal { "application/xml; charset=UTF-8" }
-  }
-  
-  it should "allow a client to PUT a 2 MB pdf" in {
-    val response = put("http://localhost:9999/bytestream", Entity(new File("src/test/resources/Better Builds With Maven.pdf"), "application/pdf"))
-    response.statusCode should equal { 200 }
-    response.contentType should equal { "application/xml; charset=UTF-8" }
-  }
-
-  it should "allow a client to PUT a png" in {
-    val response = put("http://localhost:9999/bytestream", Entity(new File("src/test/resources/test.png"), "image/png"))
-    response.statusCode should equal { 200 }
-    response.contentType should equal { "application/xml; charset=UTF-8" }
-  }
-
-  "StreamSupport with bytes" should "allow a client to PUT a pdf" in {
-    val response = put("http://localhost:9999/bytestream/bytes", Entity(new File("src/test/resources/test.pdf"), "application/pdf"))
-    response.statusCode should equal { 200 }
-    response.contentType should equal { "application/xml; charset=UTF-8" }
-  }
-
-  it should "allow a client to PUT a png" in {
-    val response = put("http://localhost:9999/bytestream/bytes", Entity(new File("src/test/resources/test.png"), "image/png"))
-    response.statusCode should equal { 200 }
-    response.contentType should equal { "application/xml; charset=UTF-8" }
-  }
-
-  "StreamSupport with characterStream" should "allow a client to PUT xml using UTF-8" in {
-    val response = put("http://localhost:9999/characterstream/UTF-8", Entity(new File("src/test/resources/test_utf-8.xml"), "application/xml; charset=UTF-8"))
-    response.statusCode should equal { 200 }
-    response.contentType should equal { "application/xml; charset=UTF-8" }
-  }
-
-  it should "allow a client to PUT xml using ISO-8859-1" in {
-    val response = put("http://localhost:9999/characterstream/ISO-8859-1", Entity(new File("src/test/resources/test_ISO-8859-1.xml"), "application/xml; charset=ISO-8859-1"))
-    response.statusCode should equal { 200 }
-    response.contentType should equal { "application/xml; charset=UTF-8" }
-  }
-
-  it should "allow a client to PUT text using UTF-8" in {
-    val response = put("http://localhost:9999/characterstream/UTF-8", Entity(new File("src/test/resources/test_utf-8.txt"), "text/plain; charset=UTF-8"))
-    response.statusCode should equal { 200 }
-    response.contentType should equal { "application/xml; charset=UTF-8" }
-  }
-
-  it should "allow a client to PUT text using ISO-8859-1" in {
-    val response = put("http://localhost:9999/characterstream/ISO-8859-1", Entity(new File("src/test/resources/test_ISO-8859-1.txt"), "text/plain; charset=ISO-8859-1"))
-    response.statusCode should equal { 200 }
-    response.contentType should equal { "application/xml; charset=UTF-8" }
-  }
-
-  it should "allow a client to GET xml using UTF-8" in {
-    val response = get("application/xml")("http://localhost:9999/characterstream/UTF-8")
-    response.statusCode should equal { 200 }
-    response.contentType should equal { "application/xml; charset=UTF-8" }
-    println(response.body)
-  }
+    it should "allow a client to GET xml using UTF-8" in {
+        val response = get("application/xml")("http://localhost:9999/characterstream/UTF-8")
+        response.statusCode should equal { 200 }
+        response.contentType should equal { "application/xml; charset=UTF-8" }
+        println(response.body)
+    }
 
 }
 
diff --git a/pom.xml b/pom.xml
index da8c091..81cafc8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
 	<groupId>org.dorest</groupId>
 	<artifactId>org.dorest</artifactId>
 	<inceptionYear>2011</inceptionYear>
-	<version>0.0.0-SNAPSHOT</version>
+	<version>0.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>DoRest</name>