diff --git a/collects/web-server/configuration.ss b/collects/web-server/configuration.ss
index 1a1be35b01..31b07feb27 100644
--- a/collects/web-server/configuration.ss
+++ b/collects/web-server/configuration.ss
@@ -2,12 +2,12 @@
   (require (lib "unitsig.ss")
            (lib "list.ss")
            (lib "contract.ss"))
-  (require "configuration-structures.ss"
-           "configuration-table-structs.ss"
-           "sig.ss"
-           "util.ss"
-           "parse-table.ss"
+  (require "private/configuration-structures.ss"
+           "private/configuration-table-structs.ss"
+           "private/util.ss"
+           "private/parse-table.ss"
            "private/cache-table.ss"
+           "sig.ss"
            "response.ss")
   
   (define default-configuration-table-path
diff --git a/collects/web-server/default-web-root/htdocs/Defaults/documentation/examples/add.ss b/collects/web-server/default-web-root/htdocs/Defaults/documentation/examples/add.ss
index e373c57a20..3a5af4374d 100644
--- a/collects/web-server/default-web-root/htdocs/Defaults/documentation/examples/add.ss
+++ b/collects/web-server/default-web-root/htdocs/Defaults/documentation/examples/add.ss
@@ -1,6 +1,5 @@
 (require (lib "unitsig.ss")
          (lib "servlet-sig.ss" "web-server")
-         (lib "servlet-helpers.ss" "web-server")
          (lib "date.ss"))
 
 (unit/sig () (import servlet^)
diff --git a/collects/web-server/default-web-root/servlets/configure.ss b/collects/web-server/default-web-root/servlets/configure.ss
index a62aea6ff3..e489783136 100644
--- a/collects/web-server/default-web-root/servlets/configure.ss
+++ b/collects/web-server/default-web-root/servlets/configure.ss
@@ -3,6 +3,6 @@
 ; The servlet accepts requests only from the *same machine* as the Web server
 ; for security purposes.
 
-(require (lib "configure.ss" "web-server"))
+(require (lib "configure.ss" "web-server" "private"))
 
 servlet
diff --git a/collects/web-server/default-web-root/servlets/tests/cut-module.ss b/collects/web-server/default-web-root/servlets/tests/cut-module.ss
index 6fdf62b460..285391b98a 100644
--- a/collects/web-server/default-web-root/servlets/tests/cut-module.ss
+++ b/collects/web-server/default-web-root/servlets/tests/cut-module.ss
@@ -1,9 +1,7 @@
 ; purpose: to test send/suspend, send/forward, send/back, and send/finish
 (module cut-module mzscheme
   (provide interface-version timeout start)
-  (require (lib "servlet.ss" "web-server")
-           (lib "servlet-helpers.ss" "web-server")
-           (lib "servlet-sig.ss" "web-server"))
+  (require (lib "servlet.ss" "web-server"))
   
   (define interface-version 'v1)
   
diff --git a/collects/web-server/default-web-root/servlets/tests/incremental.ss b/collects/web-server/default-web-root/servlets/tests/incremental.ss
index 72ba947100..d01748f4bf 100644
--- a/collects/web-server/default-web-root/servlets/tests/incremental.ss
+++ b/collects/web-server/default-web-root/servlets/tests/incremental.ss
@@ -1,5 +1,4 @@
 (require (lib "servlet-sig.ss" "web-server")
-;         (lib "servlet-helpers.ss" "web-server")
          (lib "unitsig.ss"))
 
 (unit/sig ()
diff --git a/collects/web-server/default-web-root/servlets/tests/module-suspended-init.ss b/collects/web-server/default-web-root/servlets/tests/module-suspended-init.ss
index 5f0456f04f..4384781ed8 100644
--- a/collects/web-server/default-web-root/servlets/tests/module-suspended-init.ss
+++ b/collects/web-server/default-web-root/servlets/tests/module-suspended-init.ss
@@ -1,8 +1,6 @@
 (module module-suspended-init mzscheme
   (provide interface-version timeout start)
-  (require (lib "servlet.ss" "web-server")
-           (lib "servlet-helpers.ss" "web-server")
-           (lib "servlet-sig.ss" "web-server"))
+  (require (lib "servlet.ss" "web-server"))
   
   (define interface-version 'v1)
   
diff --git a/collects/web-server/default-web-root/servlets/tests/suspended-module.ss b/collects/web-server/default-web-root/servlets/tests/suspended-module.ss
index fe174791d7..19bce6c8a6 100644
--- a/collects/web-server/default-web-root/servlets/tests/suspended-module.ss
+++ b/collects/web-server/default-web-root/servlets/tests/suspended-module.ss
@@ -1,7 +1,6 @@
 (module suspended-module mzscheme
   (provide interface-version timeout start)
   (require (lib "servlet.ss" "web-server")
-           (lib "servlet-helpers.ss" "web-server")
            (lib "servlet-sig.ss" "web-server"))
   
   (define interface-version 'v1)
diff --git a/collects/web-server/dispatchers/dispatch-files.ss b/collects/web-server/dispatchers/dispatch-files.ss
index f6254793e2..529ffbf586 100644
--- a/collects/web-server/dispatchers/dispatch-files.ss
+++ b/collects/web-server/dispatchers/dispatch-files.ss
@@ -8,10 +8,10 @@
   (require (lib "pretty.ss"))         
   (require "dispatch.ss"
            "../configuration.ss"
-           "../util.ss"
-           "../mime-types.ss"
+           "../private/util.ss"
+           "../private/mime-types.ss"
            "../private/request.ss"
-           "../servlet-helpers.ss"
+           "../private/servlet-helpers.ss"
            "../response.ss")
   (provide/contract
    [interface-version dispatcher-interface-version?])
diff --git a/collects/web-server/dispatchers/dispatch-host.ss b/collects/web-server/dispatchers/dispatch-host.ss
index f552ef7434..f85baf6a42 100644
--- a/collects/web-server/dispatchers/dispatch-host.ss
+++ b/collects/web-server/dispatchers/dispatch-host.ss
@@ -1,7 +1,7 @@
 (module dispatch-host mzscheme
   (require (lib "contract.ss"))
   (require "dispatch.ss"
-           "../servlet-helpers.ss")
+           "../private/servlet-helpers.ss")
   (provide/contract
    [interface-version dispatcher-interface-version?]
    [make ((symbol? . -> . dispatcher?) . -> . dispatcher?)])
diff --git a/collects/web-server/dispatchers/dispatch-log.ss b/collects/web-server/dispatchers/dispatch-log.ss
index 60c0ff3ac7..b811a1abc9 100644
--- a/collects/web-server/dispatchers/dispatch-log.ss
+++ b/collects/web-server/dispatchers/dispatch-log.ss
@@ -6,7 +6,7 @@
            (lib "plt-match.ss")
            (lib "contract.ss"))
   (require "dispatch.ss"
-           "../servlet-helpers.ss")  
+           "../private/servlet-helpers.ss")  
   (provide/contract
    [interface-version dispatcher-interface-version?])
   (provide ; XXX contract kw
diff --git a/collects/web-server/dispatchers/dispatch-passwords.ss b/collects/web-server/dispatchers/dispatch-passwords.ss
index 70feca3762..930f44a609 100644
--- a/collects/web-server/dispatchers/dispatch-passwords.ss
+++ b/collects/web-server/dispatchers/dispatch-passwords.ss
@@ -2,10 +2,10 @@
   (require (lib "kw.ss")
            (lib "contract.ss"))
   (require "dispatch.ss"
-           (all-except "../util.ss" translate-escapes)
+           (all-except "../private/util.ss" translate-escapes)
            "../configuration.ss"
-           "../servlet-helpers.ss"
-           "../connection-manager.ss"
+           "../private/servlet-helpers.ss"
+           "../private/connection-manager.ss"
            "../response.ss")  
   (provide/contract
    [interface-version dispatcher-interface-version?])
diff --git a/collects/web-server/dispatchers/dispatch-pathprocedure.ss b/collects/web-server/dispatchers/dispatch-pathprocedure.ss
index c1d052e6b5..ca35590709 100644
--- a/collects/web-server/dispatchers/dispatch-pathprocedure.ss
+++ b/collects/web-server/dispatchers/dispatch-pathprocedure.ss
@@ -1,7 +1,7 @@
 (module dispatch-pathprocedure mzscheme
   (require (lib "contract.ss"))
   (require "dispatch.ss"
-           "../util.ss"
+           "../private/util.ss"
            "../response.ss")
   (provide/contract
    [interface-version dispatcher-interface-version?]
diff --git a/collects/web-server/dispatchers/dispatch-servlets.ss b/collects/web-server/dispatchers/dispatch-servlets.ss
index 9b2dea26ae..4b15d1004d 100644
--- a/collects/web-server/dispatchers/dispatch-servlets.ss
+++ b/collects/web-server/dispatchers/dispatch-servlets.ss
@@ -5,13 +5,13 @@
            (lib "unitsig.ss")
            (lib "contract.ss"))
   (require "dispatch.ss"
-           "../web-server-structs.ss"
-           "../connection-manager.ss"
+           "../private/web-server-structs.ss"
+           "../private/connection-manager.ss"
            "../response.ss"
            "../servlet.ss"
            "../sig.ss"
            "../configuration.ss"
-           (all-except "../util.ss" translate-escapes)
+           (all-except "../private/util.ss" translate-escapes)
            "../managers/manager.ss"
            "../managers/timeouts.ss"
            "../managers/lru.ss"
diff --git a/collects/web-server/dispatchers/dispatch.ss b/collects/web-server/dispatchers/dispatch.ss
index 70f3c91dff..9900704d93 100644
--- a/collects/web-server/dispatchers/dispatch.ss
+++ b/collects/web-server/dispatchers/dispatch.ss
@@ -1,6 +1,6 @@
 (module dispatch mzscheme
   (require (lib "contract.ss"))
-  (require "../connection-structs.ss"
+  (require "../private/connection-structs.ss"
            "../request-structs.ss"
            "../response-structs.ss")
   
diff --git a/collects/web-server/gui-launch.ss b/collects/web-server/gui-launch.ss
index afe1839298..53408494bc 100644
--- a/collects/web-server/gui-launch.ss
+++ b/collects/web-server/gui-launch.ss
@@ -1,7 +1,7 @@
 (module gui-launch mzscheme
-  (require "launch.ss"
-	   (lib "class.ss")
+  (require (lib "class.ss")
 	   (lib "mred.ss" "mred"))
+  (require "private/launch.ss")
 
   (define shutdown (serve))
 
diff --git a/collects/web-server/managers/timeouts.ss b/collects/web-server/managers/timeouts.ss
index f6fdba05f9..270f880484 100644
--- a/collects/web-server/managers/timeouts.ss
+++ b/collects/web-server/managers/timeouts.ss
@@ -2,7 +2,7 @@
   (require (lib "plt-match.ss")
            (lib "contract.ss"))
   (require "manager.ss")
-  (require "../timer.ss"
+  (require "../private/timer.ss"
            "../servlet-structs.ss")
   (provide/contract
    [create-timeout-manager (expiration-handler? number? number? . -> . manager?)])
diff --git a/collects/web-server/monitor-launch.ss b/collects/web-server/monitor-launch.ss
index b2a1754081..671d1244cc 100644
--- a/collects/web-server/monitor-launch.ss
+++ b/collects/web-server/monitor-launch.ss
@@ -1,7 +1,7 @@
 ; The main program of the "web-server-monitor" launcher. 
 (module monitor-launch mzscheme
-  (require "monitor-server.ss"
-           "util.ss"
+  (require "private/monitor-server.ss"
+           "private/util.ss"
            (lib "cmdline.ss"))
   
   ; handle-numeric-flag : sym -> str str -> (cons sym num)
diff --git a/collects/web-server/bindings.ss b/collects/web-server/private/bindings.ss
similarity index 100%
rename from collects/web-server/bindings.ss
rename to collects/web-server/private/bindings.ss
diff --git a/collects/web-server/configuration-structures.ss b/collects/web-server/private/configuration-structures.ss
similarity index 96%
rename from collects/web-server/configuration-structures.ss
rename to collects/web-server/private/configuration-structures.ss
index 12582865ed..06baef16ee 100644
--- a/collects/web-server/configuration-structures.ss
+++ b/collects/web-server/private/configuration-structures.ss
@@ -2,8 +2,8 @@
   (require (lib "unitsig.ss")
            (lib "contract.ss")
            (lib "url.ss" "net"))
-  (require "response-structs.ss"
-           "configuration-table-structs.ss")
+  (require "configuration-table-structs.ss"
+           "../response-structs.ss")           
   
   ; configuration is now a unit.  See sig.ss
   ; XXX contract
diff --git a/collects/web-server/configuration-table-structs.ss b/collects/web-server/private/configuration-table-structs.ss
similarity index 100%
rename from collects/web-server/configuration-table-structs.ss
rename to collects/web-server/private/configuration-table-structs.ss
diff --git a/collects/web-server/configuration-util.ss b/collects/web-server/private/configuration-util.ss
similarity index 100%
rename from collects/web-server/configuration-util.ss
rename to collects/web-server/private/configuration-util.ss
diff --git a/collects/web-server/configure.ss b/collects/web-server/private/configure.ss
similarity index 99%
rename from collects/web-server/configure.ss
rename to collects/web-server/private/configure.ss
index 6c752b1322..db61a0dc51 100644
--- a/collects/web-server/configure.ss
+++ b/collects/web-server/private/configure.ss
@@ -9,10 +9,10 @@
            (lib "contract.ss")
            (only (lib "configuration.ss" "web-server")
                  default-configuration-table-path)
-           (lib "configuration-table-structs.ss" "web-server")
-           (lib "parse-table.ss" "web-server")
-           (lib "configuration-util.ss" "web-server")
-           (all-except (lib "util.ss" "web-server") translate-escapes))
+           (lib "configuration-table-structs.ss" "web-server" "private")
+           (lib "parse-table.ss" "web-server" "private")
+           (lib "configuration-util.ss" "web-server" "private")
+           (all-except (lib "util.ss" "web-server" "private") translate-escapes))
   (provide/contract
    [servlet unit/sig?]
    ; XXX contract
diff --git a/collects/web-server/connection-manager.ss b/collects/web-server/private/connection-manager.ss
similarity index 100%
rename from collects/web-server/connection-manager.ss
rename to collects/web-server/private/connection-manager.ss
diff --git a/collects/web-server/connection-structs.ss b/collects/web-server/private/connection-structs.ss
similarity index 100%
rename from collects/web-server/connection-structs.ss
rename to collects/web-server/private/connection-structs.ss
diff --git a/collects/web-server/dispatch-server-sig.ss b/collects/web-server/private/dispatch-server-sig.ss
similarity index 100%
rename from collects/web-server/dispatch-server-sig.ss
rename to collects/web-server/private/dispatch-server-sig.ss
diff --git a/collects/web-server/dispatch-server-unit.ss b/collects/web-server/private/dispatch-server-unit.ss
similarity index 100%
rename from collects/web-server/dispatch-server-unit.ss
rename to collects/web-server/private/dispatch-server-unit.ss
diff --git a/collects/web-server/launch.ss b/collects/web-server/private/launch.ss
similarity index 93%
rename from collects/web-server/launch.ss
rename to collects/web-server/private/launch.ss
index 9161ea9d83..e6f80f0b25 100644
--- a/collects/web-server/launch.ss
+++ b/collects/web-server/private/launch.ss
@@ -5,11 +5,11 @@
            (lib "contract.ss")
            (lib "unitsig.ss")
            (lib "tcp-sig.ss" "net"))
-  (require "util.ss"
-           "web-server-unit.ss"
-           "sig.ss"
-           "configuration.ss"
-           "configuration-structures.ss")
+  (require "util.ss"           
+           "configuration-structures.ss"
+           "../web-server-unit.ss"
+           "../sig.ss"
+           "../configuration.ss")
 
   (define configuration@
     (parse-command-line
diff --git a/collects/web-server/mime-types.ss b/collects/web-server/private/mime-types.ss
similarity index 100%
rename from collects/web-server/mime-types.ss
rename to collects/web-server/private/mime-types.ss
diff --git a/collects/web-server/monitor-emailer.ss b/collects/web-server/private/monitor-emailer.ss
similarity index 100%
rename from collects/web-server/monitor-emailer.ss
rename to collects/web-server/private/monitor-emailer.ss
diff --git a/collects/web-server/monitor-poke-web-server.ss b/collects/web-server/private/monitor-poke-web-server.ss
similarity index 100%
rename from collects/web-server/monitor-poke-web-server.ss
rename to collects/web-server/private/monitor-poke-web-server.ss
diff --git a/collects/web-server/monitor-server.ss b/collects/web-server/private/monitor-server.ss
similarity index 100%
rename from collects/web-server/monitor-server.ss
rename to collects/web-server/private/monitor-server.ss
diff --git a/collects/web-server/parse-table.ss b/collects/web-server/private/parse-table.ss
similarity index 100%
rename from collects/web-server/parse-table.ss
rename to collects/web-server/private/parse-table.ss
diff --git a/collects/web-server/private/request.ss b/collects/web-server/private/request.ss
index 070f57159f..1d097a4b63 100644
--- a/collects/web-server/private/request.ss
+++ b/collects/web-server/private/request.ss
@@ -3,8 +3,8 @@
            (lib "plt-match.ss")
            (lib "url.ss" "net")
            (lib "list.ss"))
-  (require "../util.ss"
-           "../connection-manager.ss"
+  (require "util.ss"
+           "connection-manager.ss"
            "../request-structs.ss")
   
   (provide/contract
diff --git a/collects/web-server/servlet-helpers.ss b/collects/web-server/private/servlet-helpers.ss
similarity index 97%
rename from collects/web-server/servlet-helpers.ss
rename to collects/web-server/private/servlet-helpers.ss
index 5c5a667510..5cccf0ea23 100644
--- a/collects/web-server/servlet-helpers.ss
+++ b/collects/web-server/private/servlet-helpers.ss
@@ -6,12 +6,12 @@
            (lib "base64.ss" "net")
            (lib "url.ss" "net"))
   (require "util.ss"
-           "response.ss"
-           "request-structs.ss"
            "bindings.ss"
-           "servlet-structs.ss")
+           "../servlet-structs.ss"
+           "../request-structs.ss"
+           "../response.ss")
   (provide (all-from "bindings.ss")
-           (all-from "request-structs.ss"))  
+           (all-from "../request-structs.ss"))  
   
   (define (request-headers request)
     (map (match-lambda
diff --git a/collects/web-server/servlet-language.ss b/collects/web-server/private/servlet-language.ss
similarity index 100%
rename from collects/web-server/servlet-language.ss
rename to collects/web-server/private/servlet-language.ss
diff --git a/collects/web-server/private/servlet.ss b/collects/web-server/private/servlet.ss
index 42091b8a9f..a915a77bbc 100644
--- a/collects/web-server/private/servlet.ss
+++ b/collects/web-server/private/servlet.ss
@@ -2,7 +2,7 @@
   (require (lib "contract.ss"))
   (require "../managers/manager.ss"
            "../servlet-structs.ss"
-           "../connection-structs.ss"
+           "connection-structs.ss"
            "../request-structs.ss")
   
   (define-struct (exn:fail:servlet:instance exn:fail) ())
diff --git a/collects/web-server/timer-structs.ss b/collects/web-server/private/timer-structs.ss
similarity index 100%
rename from collects/web-server/timer-structs.ss
rename to collects/web-server/private/timer-structs.ss
diff --git a/collects/web-server/timer.ss b/collects/web-server/private/timer.ss
similarity index 100%
rename from collects/web-server/timer.ss
rename to collects/web-server/private/timer.ss
diff --git a/collects/web-server/util.ss b/collects/web-server/private/util.ss
similarity index 99%
rename from collects/web-server/util.ss
rename to collects/web-server/private/util.ss
index 51b8564d80..3d28977342 100644
--- a/collects/web-server/util.ss
+++ b/collects/web-server/private/util.ss
@@ -6,7 +6,7 @@
            (lib "url.ss" "net")
            (lib "errortrace-lib.ss" "errortrace")
            (lib "uri-codec.ss" "net"))
-  (require "request-structs.ss")
+  (require "../request-structs.ss")
   
   ;; valid-port? : any/c -> boolean?
   (define (valid-port? p)
diff --git a/collects/web-server/web-cells.ss b/collects/web-server/private/web-cells.ss
similarity index 100%
rename from collects/web-server/web-cells.ss
rename to collects/web-server/private/web-cells.ss
diff --git a/collects/web-server/web-server-structs.ss b/collects/web-server/private/web-server-structs.ss
similarity index 100%
rename from collects/web-server/web-server-structs.ss
rename to collects/web-server/private/web-server-structs.ss
diff --git a/collects/web-server/response.ss b/collects/web-server/response.ss
index 6aeafa9bcb..3c421e61e3 100644
--- a/collects/web-server/response.ss
+++ b/collects/web-server/response.ss
@@ -5,9 +5,9 @@
            (lib "pretty.ss")
            (lib "xml.ss" "xml")
            (lib "string.ss" "srfi" "13")
-           "connection-manager.ss"
+           "private/connection-manager.ss"
            "response-structs.ss"
-           "util.ss")
+           "private/util.ss")
   (provide (all-from "response-structs.ss"))
   
   ;; Weak contracts for output-response because the response? is checked inside
diff --git a/collects/web-server/servlet-env.ss b/collects/web-server/servlet-env.ss
index cc63dea01b..f01baa00d3 100644
--- a/collects/web-server/servlet-env.ss
+++ b/collects/web-server/servlet-env.ss
@@ -4,7 +4,7 @@
   (require "configuration.ss"
            "web-server.ss"
            "sig.ss"
-           "util.ss"
+           "private/util.ss"
            "response.ss"
            "managers/timeouts.ss"
            "private/servlet.ss"
diff --git a/collects/web-server/servlet-sig.ss b/collects/web-server/servlet-sig.ss
index ba186a02eb..bc71109549 100644
--- a/collects/web-server/servlet-sig.ss
+++ b/collects/web-server/servlet-sig.ss
@@ -1,6 +1,6 @@
 ;; Default choice for writing signed-unit servlets
 (module servlet-sig mzscheme
   (require "sig.ss"
-           "servlet-helpers.ss")
+           "private/servlet-helpers.ss")
   (provide (all-from "sig.ss")
-           (all-from "servlet-helpers.ss")))
+           (all-from "private/servlet-helpers.ss")))
diff --git a/collects/web-server/servlet.ss b/collects/web-server/servlet.ss
index 7704644edc..21ade7579e 100644
--- a/collects/web-server/servlet.ss
+++ b/collects/web-server/servlet.ss
@@ -5,8 +5,8 @@
   (require "managers/manager.ss"
            "private/servlet.ss"
            "private/url.ss"
-           "servlet-helpers.ss"
-           "web-cells.ss"
+           "private/servlet-helpers.ss"
+           "private/web-cells.ss"
            "servlet-structs.ss")  
   
   ;; ************************************************************
@@ -41,8 +41,8 @@
    [send/suspend/callback (xexpr/callback? . -> . any/c)])
   
   (require "url.ss")
-  (provide (all-from "web-cells.ss")
-           (all-from "servlet-helpers.ss")
+  (provide (all-from "private/web-cells.ss")
+           (all-from "private/servlet-helpers.ss")
            (all-from "url.ss")
            (all-from "servlet-structs.ss"))
   
diff --git a/collects/web-server/setup-launch.ss b/collects/web-server/setup-launch.ss
index bdfd000be7..8dbab46699 100644
--- a/collects/web-server/setup-launch.ss
+++ b/collects/web-server/setup-launch.ss
@@ -3,9 +3,9 @@
            (lib "file.ss")
            (lib "struct.ss"))
   (require "configuration.ss"
-           "configuration-table-structs.ss"
-           "util.ss"
-           "configuration-util.ss")
+           "private/configuration-table-structs.ss"
+           "private/util.ss"
+           "private/configuration-util.ss")
   
   (parse-command-line
    "web-server-setup"
diff --git a/collects/web-server/sig.ss b/collects/web-server/sig.ss
index 12d21d48f4..fe119de4e8 100644
--- a/collects/web-server/sig.ss
+++ b/collects/web-server/sig.ss
@@ -1,6 +1,6 @@
 (module sig mzscheme
   (require (lib "unitsig.ss"))
-  (require "dispatch-server-sig.ss")
+  (require "private/dispatch-server-sig.ss")
   (provide ; XXX contract signature
    web-server^ servlet^ web-config^ web-config/pervasive^ web-config/local^)
 
diff --git a/collects/web-server/text-launch.ss b/collects/web-server/text-launch.ss
index b281c7afd9..624b4c0373 100644
--- a/collects/web-server/text-launch.ss
+++ b/collects/web-server/text-launch.ss
@@ -1,7 +1,4 @@
-
 (module text-launch mzscheme
-  (require "launch.ss")
-
+  (require "private/launch.ss")
   (serve)
-
-  (semaphore-wait (make-semaphore)))
+  (semaphore-wait (make-semaphore)))
\ No newline at end of file
diff --git a/collects/web-server/web-server-unit.ss b/collects/web-server/web-server-unit.ss
index 36e575c253..86f959bb45 100644
--- a/collects/web-server/web-server-unit.ss
+++ b/collects/web-server/web-server-unit.ss
@@ -3,10 +3,10 @@
            (lib "contract.ss")
            (lib "unitsig.ss"))
   (require "sig.ss"
-           "dispatch-server-unit.ss"
-           "dispatch-server-sig.ss"
-           "web-server-structs.ss"
-           "configuration-structures.ss"
+           "private/dispatch-server-unit.ss"
+           "private/dispatch-server-sig.ss"
+           "private/web-server-structs.ss"
+           "private/configuration-structures.ss"
            "private/cache-table.ss"
            (rename "private/request.ss" 
                    the-read-request read-request))
diff --git a/collects/web-server/web-server.ss b/collects/web-server/web-server.ss
index 6d4133e09e..6d8e21f8d7 100644
--- a/collects/web-server/web-server.ss
+++ b/collects/web-server/web-server.ss
@@ -5,7 +5,7 @@
            "sig.ss"
            "web-server-unit.ss"
 	   "configuration.ss"
-           "configuration-structures.ss")
+           "private/configuration-structures.ss")
   (provide/contract
    [serve (case-> [configuration? . -> . (-> void?)]
                   [configuration? natural-number/c . -> . (-> void?)]