diff --git a/collects/htdp/servlet.ss b/collects/htdp/servlet.ss
index 58ca1ff6d0..92abf71231 100644
--- a/collects/htdp/servlet.ss
+++ b/collects/htdp/servlet.ss
@@ -1,10 +1,10 @@
 ; Author: Paul Graunke
 #cs(module servlet mzscheme
-     (require (lib "servlet-env.ss" "web-server" "tools")
+     (require (lib "servlet-env.ss" "web-server")
               (lib "error.ss" "htdp")
               (lib "xml.ss" "xml")
               (lib "etc.ss"))
-     (provide (all-from (lib "servlet-env.ss" "web-server" "tools"))
+     (provide (all-from (lib "servlet-env.ss" "web-server"))
               (rename wrapped-build-suspender build-suspender))
      
      ; build-suspender : (listof html) (listof html) [(listof (cons sym str))] [(listof (cons sym str))] -> str -> response
diff --git a/collects/htdp/servlet2.ss b/collects/htdp/servlet2.ss
index a770b73016..1b74f19bb7 100644
--- a/collects/htdp/servlet2.ss
+++ b/collects/htdp/servlet2.ss
@@ -2,11 +2,11 @@
      #| TODO -----------------------------------------------------------------------
         buttons: multiple points of returns: continuation functions 
      |# 
-     (require (lib "servlet-env.ss" "web-server" "tools")
+     (require (lib "servlet-env.ss" "web-server")
               (lib "error.ss" "htdp")
               (lib "list.ss")
               (lib "etc.ss"))
-     (provide (all-from (lib "servlet-env.ss" "web-server" "tools"))
+     (provide (all-from (lib "servlet-env.ss" "web-server"))
               
               single-query        ; FormElement -> Answer
               
diff --git a/collects/web-server/tools/servlet-env.ss b/collects/web-server/servlet-env.ss
similarity index 90%
rename from collects/web-server/tools/servlet-env.ss
rename to collects/web-server/servlet-env.ss
index f5ba4e6cc0..81758cb9b4 100644
--- a/collects/web-server/tools/servlet-env.ss
+++ b/collects/web-server/servlet-env.ss
@@ -1,17 +1,16 @@
 (module servlet-env mzscheme
   (require (lib "sendurl.ss" "net")
            (lib "unit.ss"))
-  (require "../web-server.ss"
-           "../web-config-unit.ss"
-           "../web-config-sig.ss"
-           "../private/util.ss"
-           "../response-structs.ss"
-           "../managers/timeouts.ss"
-           "../private/servlet.ss"
-           "../private/cache-table.ss")
-  (require "../servlet.ss")
+  (require "web-server.ss"
+           "web-config-unit.ss"
+           "web-config-sig.ss"
+           "private/util.ss"
+           "managers/timeouts.ss"
+           "private/servlet.ss"
+           "private/cache-table.ss")
+  (require "servlet.ss")
   (provide (rename on-web:syntax on-web)
-           (all-from "../servlet.ss"))
+           (all-from "servlet.ss"))
   
   (define-syntax (on-web:syntax stx)
     (syntax-case stx ()