diff --git a/scheme/packages.scm b/scheme/packages.scm
index 75eb325..34b74cf 100644
--- a/scheme/packages.scm
+++ b/scheme/packages.scm
@@ -52,36 +52,21 @@
 	  rfc822-time->string))
 
 (define-interface uri-interface 
-  (export uri-escaped-chars
-	  unescape-uri
-	  escape-uri
-	  split-uri
-	  uri-path->uri
-	  simplify-uri-path))
-
+  (export unescape
+	  escape))
+ 
 (define-interface url-interface
-  (export server?
-	  make-server
-
-	  server-user
-	  server-password
-	  server-host
-	  server-port
-
-	  parse-server
-	  server->string
+  (export escaped 
 
 	  http-url?
 	  make-http-url
-
-	  http-url-server
+	  http-url-host
+	  http-url-port
 	  http-url-path
-	  http-url-search
-	  http-url-fragment-identifier
+	  http-url-query
 
 	  parse-http-url
-	  parse-http-url-string
-	  http-url->string))
+	  http-url->uri-string))
 
 (define-interface ftp-library-interface
   (export copy-port->port-binary
@@ -473,19 +458,15 @@
 
 (define-structure uri uri-interface
   (open scheme-with-scsh
-	(subset srfi-13 (string-index string-index-right string-fold string-join))
-	let-opt
-	receiving
 	ascii
 	bitwise
-	field-reader-package)
+	(subset url (escaped)))
   (files (lib uri)))
 
 (define-structure url url-interface
   (open scheme-with-scsh
 	define-record-types
-	receiving
-	(subset srfi-13 (string-index))
+	(subset srfi-1 (fold-right))
 	uri
 	httpd-errors)
   (files (lib url)))