 
     let parser = EpubParser()
 
-    // FIXME: probably get rid of the server serving multiple epub at a given time
-    //          better to implement indexing for multibook search etc
-    /// The dictionary of EPUB containers keyed by prefix.
-    var containers = [String: Container]()
-
-    /// The dictionaty of publications keyed by prefix.
-    var publications = [String: Publication]()
+    // Dictionnary of the (container, publication) tuples keyed by endpoints.
+    var epubs = [String: (Container, Publication)]()
 
     /// The running HTTP server listening port.
     public var port: UInt? {

    }

    /// The base URL of the server
    public var baseURL: URL? {
        get { return webServer.serverURL }
    }


            throw EpubServerError.epubFetcher(underlyingError: error)
        }

        /// Webserver HTTP GET ressources request handler
        func ressourcesHandler(request: GCDWebServerRequest?) -> GCDWebServerResponse? {
            let response: GCDWebServerResponse
