diff --git a/collects/algol60/bd-tool.ss b/collects/algol60/bd-tool.ss
index 7696ffae0e..731de43fc3 100644
--- a/collects/algol60/bd-tool.ss
+++ b/collects/algol60/bd-tool.ss
@@ -1,5 +1,5 @@
 (module bd-tool mzscheme
-  (require (lib "encode-decode.ss" "framework" "private"))
+  (require framework/private/encode-decode)
   (decode 05c1dd6edc460c06d057f9226301b2e86c5c23690103a9835c
           e53a0f50602852d2ecce8f324379adb7ef3924b6a60aeaf6fb
           48dd403909a6d24daf634c984a379d189493609a731ce33ac6
diff --git a/collects/algol60/cfg-parser.ss b/collects/algol60/cfg-parser.ss
index a8d77eeb07..ab6744896e 100644
--- a/collects/algol60/cfg-parser.ss
+++ b/collects/algol60/cfg-parser.ss
@@ -35,7 +35,7 @@
            mzlib/etc)
   (require-for-syntax syntax/boundmap
                       mzlib/list
-		      (lib "token-syntax.ss" "parser-tools" "private-lex"))
+		      parser-tools/private-lex/token-syntax)
 
   (provide cfg-parser)
   
diff --git a/collects/algol60/tool.ss b/collects/algol60/tool.ss
index 0d680827d3..e990917e26 100644
--- a/collects/algol60/tool.ss
+++ b/collects/algol60/tool.ss
@@ -1,5 +1,5 @@
 (module tool mzscheme
-  (require (lib "tool.ss" "drscheme")
+  (require drscheme/tool
            mred
            mzlib/unit
            mzlib/class
diff --git a/collects/browser/browser-unit.ss b/collects/browser/browser-unit.ss
index c278a95423..58ed88adb4 100644
--- a/collects/browser/browser-unit.ss
+++ b/collects/browser/browser-unit.ss
@@ -1,7 +1,7 @@
 (module browser-unit mzscheme
   (require mzlib/unit
-           (lib "mred-sig.ss" "mred")
-           (lib "plt-installer-sig.ss" "setup")
+           mred/mred-sig
+           setup/plt-installer-sig
            net/tcp-sig
            net/url-sig
            net/url-unit
diff --git a/collects/browser/browser.ss b/collects/browser/browser.ss
index 2de0b16f76..33cd0a4b74 100644
--- a/collects/browser/browser.ss
+++ b/collects/browser/browser.ss
@@ -1,9 +1,9 @@
 (module browser mzscheme
   (require mzlib/unit
            mred
-           (lib "mred-sig.ss" "mred")
-           (lib "plt-installer-sig.ss" "setup")
-           (lib "plt-installer.ss" "setup")
+           mred/mred-sig
+           setup/plt-installer-sig
+           setup/plt-installer
            net/tcp-sig
            net/url-sig
            net/url
diff --git a/collects/browser/htmltext.ss b/collects/browser/htmltext.ss
index 094c5c941f..74f1512a97 100644
--- a/collects/browser/htmltext.ss
+++ b/collects/browser/htmltext.ss
@@ -9,9 +9,9 @@
 	   net/url
 	   net/url-sig
            mred
-           (lib "mred-unit.ss" "mred")
-           (lib "mred-sig.ss" "mred")
-	   (lib "external.ss" "browser"))
+           mred/mred-unit
+           mred/mred-sig
+	   browser/external)
            
   (define-unit-from-context url@ url^)
   
diff --git a/collects/browser/private/html.ss b/collects/browser/private/html.ss
index fd05d8b1c8..742b2f6869 100644
--- a/collects/browser/private/html.ss
+++ b/collects/browser/private/html.ss
@@ -1,13 +1,12 @@
 #lang scheme/unit
 
 (require "sig.ss"
-         (lib "mred-sig.ss" "mred")
+         mred/mred-sig
          scheme/file
          mzlib/port
          net/url-sig
-         (only-in (lib "html.ss" "html")
-                  read-html-as-xml read-html-comments use-html-spec)
-         (except-in (lib "xml.ss" "xml") read-comments)
+         (only-in html read-html-as-xml read-html-comments use-html-spec)
+         (except-in xml/xml read-comments)
          mzlib/class
          "bullet.ss"
          "option-snip.ss"
diff --git a/collects/browser/private/hyper.ss b/collects/browser/private/hyper.ss
index 2910dec8c2..83f967f038 100644
--- a/collects/browser/private/hyper.ss
+++ b/collects/browser/private/hyper.ss
@@ -34,10 +34,10 @@ A test case:
          net/url-sig
          net/url-structs
          net/head
-         (lib "mred-sig.ss" "mred")
+         mred/mred-sig
          framework
          string-constants
-         (lib "plt-installer-sig.ss" "setup"))
+         setup/plt-installer-sig)
 
    
 (import html^
diff --git a/collects/browser/tool.ss b/collects/browser/tool.ss
index 732dc35b0c..a567317609 100644
--- a/collects/browser/tool.ss
+++ b/collects/browser/tool.ss
@@ -1,7 +1,7 @@
 (module tool mzscheme
-  (require (lib "external.ss" "browser")
+  (require browser/external
            mzlib/unit
-           (lib "tool.ss" "drscheme"))
+           drscheme/tool)
   (provide tool@)
 
   ;; to add a preference pannel to drscheme that sets the browser preference
diff --git a/collects/combinator-parser/private-combinator/parser-sigs.ss b/collects/combinator-parser/private-combinator/parser-sigs.ss
index 612f8f9f03..435d677d84 100644
--- a/collects/combinator-parser/private-combinator/parser-sigs.ss
+++ b/collects/combinator-parser/private-combinator/parser-sigs.ss
@@ -1,8 +1,8 @@
 (module parser-sigs scheme
   
-  (require (only-in (lib "etc.ss") opt-lambda))    ; Required for expansion
-  (require (lib "lex.ss" "parser-tools")
-           (lib "string.ss"))
+  (require (only-in mzlib/etc opt-lambda))    ; Required for expansion
+  (require parser-tools/lex
+           mzlib/string)
   
   (provide (all-defined-out))
   
diff --git a/collects/compiler/distribute.ss b/collects/compiler/distribute.ss
index 012230dd5d..4f598f9cea 100644
--- a/collects/compiler/distribute.ss
+++ b/collects/compiler/distribute.ss
@@ -4,7 +4,7 @@
            scheme/path
            setup/dirs
 	   mzlib/list
-	   (lib "variant.ss" "setup")
+	   setup/variant
 	   dynext/filename-version
 	   "private/macfw.ss"
 	   "private/windlldir.ss"
diff --git a/collects/compiler/main.ss b/collects/compiler/main.ss
index 9e6f0cae62..642e758a7d 100644
--- a/collects/compiler/main.ss
+++ b/collects/compiler/main.ss
@@ -30,8 +30,8 @@
          dynext/compile
          dynext/link
          scheme/pretty
-         (lib "pack.ss" "setup")
-         (lib "getinfo.ss" "setup")
+         setup/pack
+         setup/getinfo
          setup/dirs)
 
 (define dest-dir (make-parameter #f))
@@ -511,11 +511,11 @@
    (unless (= 1 (length source-files))
      (error 'mzc "expected a single module source file to embed; given: ~e"
             source-files))
-   (let ([dest ((dynamic-require '(lib "embed.ss" "compiler" "private")
+   (let ([dest ((dynamic-require 'compiler/private/embed
                                  'mzc:embedding-executable-add-suffix)
                 (exe-output)
                 (eq? mode 'gui-exe))])
-     ((dynamic-require '(lib "embed.ss" "compiler" "private")
+     ((dynamic-require 'compiler/private/embed
                        'mzc:create-embedding-executable)
       dest
       #:mred? (eq? mode 'gui-exe)
@@ -542,7 +542,7 @@
    (let ([dest (mods-output)])
      (let-values ([(in out) (make-pipe)])
        (parameterize ([current-output-port out])
-         ((dynamic-require '(lib "embed.ss" "compiler") 'write-module-bundle)
+         ((dynamic-require 'compiler/embed 'write-module-bundle)
           #:modules
           (append (map (lambda (l) `(#f (file ,l))) source-files)
              (map (lambda (l) `(#t (lib ,l))) (exe-embedded-libraries)))))
diff --git a/collects/drscheme/drscheme.ss b/collects/drscheme/drscheme.ss
index fedf1a14d5..38b97f8946 100644
--- a/collects/drscheme/drscheme.ss
+++ b/collects/drscheme/drscheme.ss
@@ -17,13 +17,13 @@
                   (parameterize ([current-namespace (make-namespace)]
                                  [use-compiled-file-paths '()])
                     (values
-                     (dynamic-require '(lib "zo-compile.ss" "errortrace") 'zo-compile)
+                     (dynamic-require 'errortrace/zo-compile 'zo-compile)
                      (dynamic-require 'mzlib/cm 'make-compilation-manager-load/use-compiled-handler)
                      (dynamic-require 'mzlib/cm 'manager-trace-handler)))])
       (current-compile zo-compile)
       (use-compiled-file-paths (list (build-path "compiled" "errortrace")))
       (current-load/use-compiled (make-compilation-manager-load/use-compiled-handler))
-      (error-display-handler (dynamic-require '(lib "errortrace-lib.ss" "errortrace")
+      (error-display-handler (dynamic-require 'errortrace/errortrace-lib
                                               'errortrace-error-display-handler))
       (when cm-trace?
         (printf "PLTDRDEBUG: enabling CM tracing\n")
diff --git a/collects/drscheme/private/app.ss b/collects/drscheme/private/app.ss
index 818d068dc6..89dc8d469f 100644
--- a/collects/drscheme/private/app.ss
+++ b/collects/drscheme/private/app.ss
@@ -6,8 +6,8 @@
          string-constants
          mred
          framework
-         (lib "external.ss" "browser")
-         (lib "getinfo.ss" "setup")
+         browser/external
+         setup/getinfo
          "drsig.ss"
          "../acks.ss")
 
diff --git a/collects/drscheme/private/bindings-browser.ss b/collects/drscheme/private/bindings-browser.ss
index aea142053f..b6f2599bef 100644
--- a/collects/drscheme/private/bindings-browser.ss
+++ b/collects/drscheme/private/bindings-browser.ss
@@ -14,7 +14,7 @@ Marshalling (and hence the 'read' method of the snipclass omitted for fast proto
            mred
            mzlib/match
            mzlib/string
-           (lib "marks.ss" "stepper" "private")
+           stepper/private/marks
            mzlib/contract)
   
   (provide render-bindings/snip)
diff --git a/collects/drscheme/private/debug.ss b/collects/drscheme/private/debug.ss
index 33c4a8da54..fe3161de92 100644
--- a/collects/drscheme/private/debug.ss
+++ b/collects/drscheme/private/debug.ss
@@ -2010,7 +2010,6 @@ profile todo:
               (on-paint))))))
       
       (super-instantiate ())))
-  
-  
-  
-  (define-values/invoke-unit/infer stacktrace@))
\ No newline at end of file
+
+
+  (define-values/invoke-unit/infer stacktrace@))
diff --git a/collects/drscheme/private/drscheme-normal.ss b/collects/drscheme/private/drscheme-normal.ss
index 8265cf880c..9ed389a095 100644
--- a/collects/drscheme/private/drscheme-normal.ss
+++ b/collects/drscheme/private/drscheme-normal.ss
@@ -78,8 +78,8 @@
       (set! key-codes (take key-codes longest-magic-string))))
   
   (let ([set-splash-bitmap
-         (dynamic-require '(lib "splash.ss" "framework") 'set-splash-bitmap)])
-    ((dynamic-require '(lib "splash.ss" "framework") 'set-splash-char-observer)
+         (dynamic-require 'framework/splash 'set-splash-bitmap)])
+    ((dynamic-require 'framework/splash 'set-splash-char-observer)
      (λ (evt)
        (let ([ch (send evt get-key-code)])
          (when (char? ch)
@@ -137,7 +137,7 @@
           [(< angle 0) (normalize-angle (+ angle (* 2 pi)))]
           [else (normalize-angle (- angle (* 2 pi)))]))
       
-      (define splash-canvas ((dynamic-require '(lib "splash.ss" "framework") 'get-splash-canvas)))
+      (define splash-canvas ((dynamic-require 'framework/splash 'get-splash-canvas)))
       (define (draw-single-step dc offset)
         (send bdc draw-bitmap eli 0 0)
         (draw-single-loop omega-str bdc offset (/ main-size 2) (/ main-size 2) 120 32 outer-color)
@@ -184,7 +184,7 @@
       (define (eli-event evt)
         (cond
           [(send evt leaving?)
-           ((dynamic-require '(lib "splash.ss" "framework") 'set-splash-paint-callback) orig-paint)
+           ((dynamic-require 'framework/splash 'set-splash-paint-callback) orig-paint)
            (when gc-b
              (unregister-collecting-blit splash-canvas))
            (send splash-canvas refresh)
@@ -192,7 +192,7 @@
              (kill-thread draw-thread)
              (set! draw-thread #f))]
           [(send evt entering?)
-           ((dynamic-require '(lib "splash.ss" "framework") 'set-splash-paint-callback) eli-paint)
+           ((dynamic-require 'framework/splash 'set-splash-paint-callback) eli-paint)
            (when gc-b
              (register-collecting-blit splash-canvas 
                                        (floor (- (/ main-size 2)
@@ -206,7 +206,7 @@
            (unless draw-thread
              (start-thread))]))
       
-      (define splash-eventspace ((dynamic-require '(lib "splash.ss" "framework") 'get-splash-eventspace)))
+      (define splash-eventspace ((dynamic-require 'framework/splash 'get-splash-eventspace)))
       (define draw-next-state
         (let ([o 0])
           (lambda ()
@@ -231,13 +231,13 @@
                    (draw-next-state)
                    (sleep .01)
                    (loop))))))
-      (define orig-paint ((dynamic-require '(lib "splash.ss" "framework") 'get-splash-paint-callback)))
+      (define orig-paint ((dynamic-require 'framework/splash 'get-splash-paint-callback)))
       
       (draw-next-state)
-      ((dynamic-require '(lib "splash.ss" "framework") 'set-splash-event-callback) eli-event)
+      ((dynamic-require 'framework/splash 'set-splash-event-callback) eli-event)
       (send splash-canvas refresh)))
   
-  ((dynamic-require '(lib "splash.ss" "framework") 'start-splash)
+  ((dynamic-require 'framework/splash 'start-splash)
    (build-path (collection-path "icons") 
                (cond
                  [texas-independence-day?
@@ -267,8 +267,8 @@
                        (label "Break All Threads")
                        (callback
                         (λ (x y)
-                          ((dynamic-require '(lib "key.ss" "drscheme" "private") 'break-threads))))
+                          ((dynamic-require 'drscheme/private/key 'break-threads))))
                        (parent f))])
           (send f show #t)))))
 
-  (dynamic-require '(lib "tool-lib.ss" "drscheme") #f))
+  (dynamic-require 'drscheme/tool-lib #f))
diff --git a/collects/drscheme/private/eval.ss b/collects/drscheme/private/eval.ss
index a8dd32adca..d4bc45a968 100644
--- a/collects/drscheme/private/eval.ss
+++ b/collects/drscheme/private/eval.ss
@@ -10,7 +10,7 @@
   
   ;; to ensure this guy is loaded (and the snipclass installed) in the drscheme namespace & eventspace
   ;; these things are for effect only!
-  (require (lib "cache-image-snip.ss" "mrlib")
+  (require mrlib/cache-image-snip
            #;
            (prefix foo htdp/matrix))
   
diff --git a/collects/drscheme/private/frame.ss b/collects/drscheme/private/frame.ss
index 12b55a20ee..b64ce0e559 100644
--- a/collects/drscheme/private/frame.ss
+++ b/collects/drscheme/private/frame.ss
@@ -10,8 +10,8 @@
            framework
            net/url
            net/head
-           (lib "plt-installer.ss" "setup")
-           (lib "bug-report.ss" "help")
+           setup/plt-installer
+           help/bug-report
            scheme/file)
   
   (import [prefix drscheme:unit: drscheme:unit^]
diff --git a/collects/drscheme/private/language-configuration.ss b/collects/drscheme/private/language-configuration.ss
index f087310708..2b9ecbb854 100644
--- a/collects/drscheme/private/language-configuration.ss
+++ b/collects/drscheme/private/language-configuration.ss
@@ -1,7 +1,7 @@
 
 (module language-configuration mzscheme
   (require mzlib/unit
-           (lib "hierlist.ss" "hierlist")
+           mrlib/hierlist
            mzlib/class
            mzlib/contract
            mzlib/kw
@@ -14,7 +14,7 @@
            mzlib/list
            mzlib/etc
            mzlib/file
-           (lib "getinfo.ss" "setup")
+           setup/getinfo
            syntax/toplevel)
   
   (define original-output (current-output-port))
diff --git a/collects/drscheme/private/language.ss b/collects/drscheme/private/language.ss
index 5e2a61b409..bd8be4fd07 100644
--- a/collects/drscheme/private/language.ss
+++ b/collects/drscheme/private/language.ss
@@ -17,7 +17,7 @@
            launcher
            mred
            framework
-           (lib "syntax-browser.ss" "mrlib")
+           mrlib/syntax-browser
            compiler/distribute
            compiler/bundle-dist
            "rep.ss")
@@ -464,7 +464,7 @@
                 (print-convert value))]))
        
        ,(if (memq (simple-settings-annotations setting) '(debug debug/profile test-coverage))
-            `(require (lib "errortrace.ss" "errortrace"))
+            `(require errortrace)
             `(void))
        
        (define (init-code)
diff --git a/collects/drscheme/private/launcher-bootstrap.ss b/collects/drscheme/private/launcher-bootstrap.ss
index d7ce4e81ab..13e63f0313 100644
--- a/collects/drscheme/private/launcher-bootstrap.ss
+++ b/collects/drscheme/private/launcher-bootstrap.ss
@@ -47,4 +47,4 @@
   ;; safe to do this earlier?
   (delete-file init-code-tmp-filename)
   
-  (load program-filename))
\ No newline at end of file
+  (load program-filename))
diff --git a/collects/drscheme/private/main.ss b/collects/drscheme/private/main.ss
index 1bbf06ea4f..6ee1aedec7 100644
--- a/collects/drscheme/private/main.ss
+++ b/collects/drscheme/private/main.ss
@@ -8,8 +8,8 @@
          mzlib/class
          mzlib/list
          scheme/path
-         (lib "external.ss" "browser")
-         (lib "plt-installer.ss" "setup"))
+         browser/external
+         setup/plt-installer)
 
 (import [prefix drscheme:app: drscheme:app^]
         [prefix drscheme:unit: drscheme:unit^]
diff --git a/collects/drscheme/private/recon.ss b/collects/drscheme/private/recon.ss
index 19993c224e..6c9a7f1822 100644
--- a/collects/drscheme/private/recon.ss
+++ b/collects/drscheme/private/recon.ss
@@ -16,4 +16,4 @@
           (datum->syntax #'src
                          (loop (syntax-e (sloc-inside stx)))
                          (syntax->datum (sloc-loc stx)))]
-         [else stx]))]))
\ No newline at end of file
+         [else stx]))]))
diff --git a/collects/drscheme/private/time-keystrokes.ss b/collects/drscheme/private/time-keystrokes.ss
index b0d75e70c7..a2c0fd9a33 100644
--- a/collects/drscheme/private/time-keystrokes.ss
+++ b/collects/drscheme/private/time-keystrokes.ss
@@ -1,6 +1,6 @@
 (module time-keystrokes mzscheme
   
-  (require (lib "tool.ss" "drscheme")
+  (require drscheme/tool
            mzlib/list
            mzlib/unit
            mzlib/class
diff --git a/collects/drscheme/private/tools.ss b/collects/drscheme/private/tools.ss
index f59afc7178..5c02b1dc99 100644
--- a/collects/drscheme/private/tools.ss
+++ b/collects/drscheme/private/tools.ss
@@ -1,7 +1,7 @@
 
 #lang scheme/unit
 
-(require (lib "getinfo.ss" "setup")
+(require setup/getinfo
          mred
          scheme/class
          scheme/list
@@ -350,9 +350,9 @@
       (unless (and (is-a? bitmap bitmap%)
                    (send bitmap ok?))
         (k #f))
-      (let ([splash-eventspace ((dynamic-require '(lib "framework/splash.ss") 'get-splash-eventspace))]
-            [splash-bitmap ((dynamic-require '(lib "framework/splash.ss") 'get-splash-bitmap))]
-            [splash-canvas ((dynamic-require '(lib "framework/splash.ss") 'get-splash-canvas))])
+      (let ([splash-eventspace ((dynamic-require 'framework/splash 'get-splash-eventspace))]
+            [splash-bitmap ((dynamic-require 'framework/splash 'get-splash-bitmap))]
+            [splash-canvas ((dynamic-require 'framework/splash 'get-splash-canvas))])
         
         (unless (and (eventspace? splash-eventspace)
                      (is-a? splash-bitmap bitmap%)
@@ -387,7 +387,7 @@
                    (send bdc set-bitmap #f)
                    (set! bitmap new-b)))
                
-               ((dynamic-require '(lib "framework/splash.ss") 'add-splash-icon)
+               ((dynamic-require 'framework/splash 'add-splash-icon)
                 bitmap tool-bitmap-x translated-tool-bitmap-y)
                (set! tool-bitmap-x (+ tool-bitmap-x tool-bitmap-size tool-bitmap-gap))
                (when ((+ tool-bitmap-x tool-bitmap-gap tool-bitmap-size) . > . (send splash-bitmap get-width))
diff --git a/collects/drscheme/private/unit.ss b/collects/drscheme/private/unit.ss
index 12dc905d0d..8888e7bae1 100644
--- a/collects/drscheme/private/unit.ss
+++ b/collects/drscheme/private/unit.ss
@@ -21,9 +21,9 @@ module browser threading seems wrong.
            (only-in mzlib/etc compose)
            string-constants
            framework
-           (lib "name-message.ss" "mrlib")
-           (lib "bitmap-label.ss" "mrlib")
-           (lib "include-bitmap.ss" "mrlib")
+           mrlib/name-message
+           mrlib/bitmap-label
+           mrlib/include-bitmap
            "drsig.ss"
            "auto-language.ss"
            "insert-large-letters.ss"
@@ -3592,9 +3592,9 @@ module browser threading seems wrong.
         (set! newest-frame this)
         (send definitions-canvas focus)))
     
-    (define running-bitmap (include-bitmap (lib "b-run.png" "icons")))
-    (define waiting-bitmap (include-bitmap (lib "b-wait.png" "icons")))
-    (define waiting2-bitmap (include-bitmap (lib "b-wait2.png" "icons")))
+    (define running-bitmap (include-bitmap (lib "icons/b-run.png")))
+    (define waiting-bitmap (include-bitmap (lib "icons/b-wait.png")))
+    (define waiting2-bitmap (include-bitmap (lib "icons/b-wait2.png")))
     (define running/waiting-bitmaps (list running-bitmap waiting-bitmap waiting2-bitmap))
     (define running-canvas%
       (class canvas%
diff --git a/collects/drscheme/tool-lib.ss b/collects/drscheme/tool-lib.ss
index 2c5962a3ef..b4f57e657d 100644
--- a/collects/drscheme/tool-lib.ss
+++ b/collects/drscheme/tool-lib.ss
@@ -74,11 +74,7 @@ all of the names in the tools library, for use defining keybindings
        created empty namespace. This namespace has the following modules 
        copied (with @scheme[namespace-attach-module])
        from DrScheme's original namespace:
-       @itemize{
-       @item{ @scheme['mzscheme]
-       }@item{ @scheme['(lib "mred.ss" "mred")]
-       }}
-     
+       @itemize{@item{@scheme['mzscheme]}@item{@scheme['mred]}}
      }@item{
        @scheme[read-curly-brace-as-paren]
        is @scheme[#t],
diff --git a/collects/embedded-gui/private/aligned-pasteboard.ss b/collects/embedded-gui/private/aligned-pasteboard.ss
index e2aa618c7e..363b9d27fc 100644
--- a/collects/embedded-gui/private/aligned-pasteboard.ss
+++ b/collects/embedded-gui/private/aligned-pasteboard.ss
@@ -5,21 +5,21 @@
 |#
 
 (module aligned-pasteboard mzscheme
-  
+
   (provide aligned-pasteboard%)
-  
+
   (require
    mzlib/class
    mred
    mzlib/etc
-   (lib "click-forwarding-editor.ss" "mrlib")
+   mrlib/click-forwarding-editor
    "on-show-pasteboard.ss"
    "really-resized-pasteboard.ss"
    "interface.ss"
    "locked-pasteboard.ss"
    "suppress-modify-editor.ss"
    "on-show-editor.ss")
-  
+
   (define aligned-pasteboard%
     (class* (click-forwarding-editor-mixin
              (suppress-modify-editor-mixin
diff --git a/collects/embedded-gui/private/button-snip.ss b/collects/embedded-gui/private/button-snip.ss
index 66dcda3de9..45812d801f 100644
--- a/collects/embedded-gui/private/button-snip.ss
+++ b/collects/embedded-gui/private/button-snip.ss
@@ -205,8 +205,8 @@
   ;; tests
   #|
   (require
-   (lib "locked-pasteboard.ss" "mrlib" "private" "aligned-pasteboard")
-   (lib "click-forwarding-editor.ss" "mrlib"))
+   mrlib/private/aligned-pasteboard/locked-pasteboard
+   mrlib/click-forwarding-editor)
   
   (define (test)
     (define f (new frame% (label "test") (width 200) (height 200)))
diff --git a/collects/embedded-gui/private/grid-alignment.ss b/collects/embedded-gui/private/grid-alignment.ss
index 47933e3428..0dce40df64 100644
--- a/collects/embedded-gui/private/grid-alignment.ss
+++ b/collects/embedded-gui/private/grid-alignment.ss
@@ -13,7 +13,7 @@
    mzlib/list
    mzlib/match
    (prefix a: "alignment.ss")
-   (lib "click-forwarding-editor.ss" "mrlib")
+   mrlib/click-forwarding-editor
    
    "on-show-pasteboard.ss"
    "really-resized-pasteboard.ss"
diff --git a/collects/embedded-gui/private/tests/not-stetching.ss b/collects/embedded-gui/private/tests/not-stetching.ss
index 1763151af9..ace952c96f 100644
--- a/collects/embedded-gui/private/tests/not-stetching.ss
+++ b/collects/embedded-gui/private/tests/not-stetching.ss
@@ -1,13 +1,13 @@
 (module not-stetching mzscheme
   
   (require
-   (lib "debug.ss" "mike-lib")
+   mike-lib/debug
    mzlib/class
    mzlib/etc
    mred
-   (lib "aligned-pasteboard.ss" "embedded-gui")
-   (lib "stretchable-editor-snip.ss" "embedded-gui")
-   (lib "verthoriz-alignment.ss" "embedded-gui"))
+   embedded-gui/aligned-pasteboard
+   embedded-gui/stretchable-editor-snip
+   embedded-gui/verthoriz-alignment)
   
   (define traced-ses%
     #;(override/trace stretchable-editor-snip%
diff --git a/collects/embedded-gui/private/tests/only-one-child.ss b/collects/embedded-gui/private/tests/only-one-child.ss
index 444620ae78..260839bc90 100644
--- a/collects/embedded-gui/private/tests/only-one-child.ss
+++ b/collects/embedded-gui/private/tests/only-one-child.ss
@@ -7,7 +7,7 @@
  (prefix a: "../alignment.ss")
  "../alignment-helpers.ss"
  "../dllist.ss"
- (lib "click-forwarding-editor.ss" "mrlib")
+ mrlib/click-forwarding-editor
  "../on-show-pasteboard.ss"
  "../really-resized-pasteboard.ss"
  "../interface.ss"
diff --git a/collects/embedded-gui/private/tests/stretching-in-alignment.ss b/collects/embedded-gui/private/tests/stretching-in-alignment.ss
index 8d41e0a33d..b8ab0e435c 100644
--- a/collects/embedded-gui/private/tests/stretching-in-alignment.ss
+++ b/collects/embedded-gui/private/tests/stretching-in-alignment.ss
@@ -4,15 +4,15 @@
    mred
    mzlib/etc
    mzlib/class
-   (lib "interface.ss" "mrlib" "private" "aligned-pasteboard")
-   (lib "debug.ss" "mike-lib")
+   mrlib/private/aligned-pasteboard/interface
+   mike-lib/debug
    mzlib/list
    mzlib/match
    (prefix a: "alignment.ss")
-   (lib "click-forwarding-editor.ss" "mrlib")
-   (lib "snip-lib.ss" "mrlib" "private" "aligned-pasteboard")
-   (lib "aligned-pasteboard.ss" "embedded-gui")
-   (lib "stretchable-editor-snip.ss" "embedded-gui"))
+   mrlib/click-forwarding-editor
+   mrlib/private/aligned-pasteboard/snip-lib
+   embedded-gui/aligned-pasteboard
+   embedded-gui/stretchable-editor-snip)
   
   (define f (new frame% (label "f") (width 400) (height 400)))
   (define e (new text%))
diff --git a/collects/embedded-gui/private/tests/test-case-box.ss b/collects/embedded-gui/private/tests/test-case-box.ss
index f4e0a24f8c..4b966bec61 100644
--- a/collects/embedded-gui/private/tests/test-case-box.ss
+++ b/collects/embedded-gui/private/tests/test-case-box.ss
@@ -3,7 +3,7 @@
  mzlib/list
  mred
  mzlib/unitsig
- (lib "tool.ss" "drscheme")
+ drscheme/tool
  mzlib/etc
  mzlib/match
  framework
diff --git a/collects/embedded-gui/private/tests/test-show-feature.ss b/collects/embedded-gui/private/tests/test-show-feature.ss
index ab37df7d70..44880cbc76 100644
--- a/collects/embedded-gui/private/tests/test-show-feature.ss
+++ b/collects/embedded-gui/private/tests/test-show-feature.ss
@@ -14,7 +14,7 @@
  "../snip-lib.ss"
  "../interface.ss"
  "../alignment-helpers.ss"
- (lib "click-forwarding-editor.ss" "mrlib")
+ mrlib/click-forwarding-editor
  "../on-show-pasteboard.ss"
  "../really-resized-pasteboard.ss"
  "../interface.ss"
@@ -23,7 +23,7 @@
  "../verthoriz-alignment.ss"
  "../suppress-modify-editor.ss")
   
-(require (lib "print-debug.ss" "mike-lib"))
+(require mike-lib/print-debug)
   
 (define aligned-pasteboard%
   (class (click-forwarding-editor-mixin
diff --git a/collects/embedded-gui/private/tests/unaligned-childless-redux.ss b/collects/embedded-gui/private/tests/unaligned-childless-redux.ss
index 7db231f77f..a1c6ab25e5 100644
--- a/collects/embedded-gui/private/tests/unaligned-childless-redux.ss
+++ b/collects/embedded-gui/private/tests/unaligned-childless-redux.ss
@@ -1,5 +1,5 @@
-(require (lib "aligned-pasteboard.ss" "embedded-gui")
-         (lib "debug.ss" "mike-lib"))
+(require embedded-gui/aligned-pasteboard
+         mike-lib/debug)
 
 (define f (new frame% (label "f") (width 100) (height 100)))
 (define e (new text%))
diff --git a/collects/eopl/eopl-tool.ss b/collects/eopl/eopl-tool.ss
index 80bae05834..330d90ddb0 100644
--- a/collects/eopl/eopl-tool.ss
+++ b/collects/eopl/eopl-tool.ss
@@ -11,7 +11,7 @@ wraps the load of the module.)
 (module eopl-tool mzscheme
   (require mzlib/unit
 	   mzlib/class
-	   (lib "tool.ss" "drscheme")
+	   drscheme/tool
            string-constants)
   
   (provide tool@)
@@ -28,7 +28,7 @@ wraps the load of the module.)
 	    (list (string-constant teaching-languages)
                   "Essentials of Programming Languages (2nd ed.)"))
 	  (define/public (get-module)
-	    '(lib "eopl.ss" "eopl"))
+	    '(lib "eopl/eopl.ss"))
 	  (define/public (get-one-line-summary)
 	    "Based on the Friedman, Wand, and Haynes text")
           (define/public (get-language-url)
diff --git a/collects/eopl/lang/reader.ss b/collects/eopl/lang/reader.ss
index 48dbf6ad6d..89aada5118 100644
--- a/collects/eopl/lang/reader.ss
+++ b/collects/eopl/lang/reader.ss
@@ -1,2 +1,2 @@
 (module reader syntax/module-reader
-  eopl/eopl)
\ No newline at end of file
+  eopl/eopl)
diff --git a/collects/errortrace/errortrace-key-syntax.ss b/collects/errortrace/errortrace-key-syntax.ss
index 658380434e..ee59a3969e 100644
--- a/collects/errortrace/errortrace-key-syntax.ss
+++ b/collects/errortrace/errortrace-key-syntax.ss
@@ -1,7 +1,5 @@
 (module errortrace-key-syntax mzscheme
-  (require (lib "errortrace-key.ss" "errortrace"))
-  (require-for-syntax (lib "errortrace-key.ss"  "errortrace"))
+  (require errortrace/errortrace-key)
+  (require-for-syntax errortrace/errortrace-key)
   (define errortrace-key-syntax #'errortrace-key)
   (provide errortrace-key-syntax))
-
-
diff --git a/collects/errortrace/errortrace-lib.ss b/collects/errortrace/errortrace-lib.ss
index 5e545521d4..b7db3a923c 100644
--- a/collects/errortrace/errortrace-lib.ss
+++ b/collects/errortrace/errortrace-lib.ss
@@ -327,10 +327,9 @@
                        #,(syntax-recertify
 			  #`(#%plain-module-begin
 			     #,((make-syntax-introducer)
-				#'(#%require (lib "errortrace-key.ss" "errortrace")))
+				#'(#%require errortrace/errortrace-key))
 			     #,((make-syntax-introducer)
-				#'(#%require (for-syntax
-                                              (lib "errortrace-key.ss" "errortrace"))))
+				#'(#%require (for-syntax errortrace/errortrace-key)))
 			     body ...)
 			  (list-ref (syntax->list top-e) 3)
 			  orig-inspector
diff --git a/collects/ffi/examples/sndfile.ss b/collects/ffi/examples/sndfile.ss
index d6d8262008..bddca62c71 100755
--- a/collects/ffi/examples/sndfile.ss
+++ b/collects/ffi/examples/sndfile.ss
@@ -4,7 +4,7 @@
 
 (require ffi/sndfile)
 
-;; (require (lib "swindle.ss" "swindle"))
+;; (require swindle)
 
 (define (add-half x y)
   (/ (+ x (* y 0.5)) 1.5))
diff --git a/collects/framework/framework-unit.ss b/collects/framework/framework-unit.ss
index a8dc67348e..d9433fefaa 100644
--- a/collects/framework/framework-unit.ss
+++ b/collects/framework/framework-unit.ss
@@ -1,7 +1,7 @@
 #lang scheme/base
 
 (require mzlib/unit
-         (lib "mred-sig.ss" "mred"))
+         mred/mred-sig)
 
 (require "private/sig.ss"
          "private/number-snip.ss"
@@ -94,4 +94,4 @@
     (prefix handler: framework:handler^)
     (prefix scheme: framework:scheme^)
     (prefix main: framework:main^))
-   framework-separate@ mred^))
\ No newline at end of file
+   framework-separate@ mred^))
diff --git a/collects/framework/gui-utils.ss b/collects/framework/gui-utils.ss
index f3e6281f5b..b11bd38e53 100644
--- a/collects/framework/gui-utils.ss
+++ b/collects/framework/gui-utils.ss
@@ -557,4 +557,4 @@
          a delta suitable for use on a black background.
          
          See also
-         @scheme[gui-utils:get-clicked-clickback-delta].}))
\ No newline at end of file
+         @scheme[gui-utils:get-clicked-clickback-delta].}))
diff --git a/collects/framework/main.ss b/collects/framework/main.ss
index 91615efd78..3c01d1a44b 100644
--- a/collects/framework/main.ss
+++ b/collects/framework/main.ss
@@ -1,8 +1,8 @@
 #reader scribble/reader
 #lang scheme/gui
 
-(require (lib "mred-unit.ss" "mred")
-         (lib "mred-sig.ss" "mred")
+(require mred/mred-unit
+         mred/mred-sig
          framework/framework-unit
          framework/private/sig
          (for-syntax scheme/base)
diff --git a/collects/framework/private/autosave.ss b/collects/framework/private/autosave.ss
index 4e95bf9017..ab34d0a9da 100644
--- a/collects/framework/private/autosave.ss
+++ b/collects/framework/private/autosave.ss
@@ -6,7 +6,7 @@
            "sig.ss"
            "../gui-utils.ss"
            "../preferences.ss"
-           (lib "mred-sig.ss" "mred")
+           mred/mred-sig
            mzlib/list
            string-constants)
   
diff --git a/collects/framework/private/bday.ss b/collects/framework/private/bday.ss
index cf0989c261..daa805c281 100644
--- a/collects/framework/private/bday.ss
+++ b/collects/framework/private/bday.ss
@@ -1,4 +1,4 @@
-(module bday mzscheme (require (lib "encode-decode.ss" "framework" "private"))
+(module bday mzscheme (require framework/private/encode-decode)
   (decode
                  \5d8f4
               \10ec22010
diff --git a/collects/framework/private/canvas.ss b/collects/framework/private/canvas.ss
index 5f34dc7eb3..9025edc01b 100644
--- a/collects/framework/private/canvas.ss
+++ b/collects/framework/private/canvas.ss
@@ -2,7 +2,7 @@
   (require mzlib/class
            "sig.ss"
            "../preferences.ss"
-           (lib "mred-sig.ss" "mred"))
+           mred/mred-sig)
   
   (import mred^
           [prefix frame: framework:frame^]
diff --git a/collects/framework/private/color-model.ss b/collects/framework/private/color-model.ss
index 26db84e02d..9a45c77909 100644
--- a/collects/framework/private/color-model.ss
+++ b/collects/framework/private/color-model.ss
@@ -1,7 +1,7 @@
 #lang scheme/unit
   (require mzlib/class
            "sig.ss"
-           (lib "mred-sig.ss" "mred")
+           mred/mred-sig
            mzlib/list)
   
   (import)
diff --git a/collects/framework/private/comment-box.ss b/collects/framework/private/comment-box.ss
index 3691426fb4..cec5b4b30e 100644
--- a/collects/framework/private/comment-box.ss
+++ b/collects/framework/private/comment-box.ss
@@ -6,7 +6,7 @@
            mred
            "sig.ss"
            "../decorated-editor-snip.ss"
-           (lib "include-bitmap.ss" "mrlib")
+           mrlib/include-bitmap
            string-constants)
   
   (import [prefix text: framework:text^]
@@ -25,7 +25,7 @@
   (send snipclass set-classname (format "~s" '(lib "comment-snip.ss" "framework")))
   (send (get-the-snip-class-list) add snipclass)
   
-  (define bm (include-bitmap (lib "semicolon.gif" "icons")))
+  (define bm (include-bitmap (lib "icons/semicolon.gif")))
   
   (define (editor-keymap-mixin %)
     (class %
diff --git a/collects/framework/private/editor.ss b/collects/framework/private/editor.ss
index 4b7eb41564..56884f1575 100644
--- a/collects/framework/private/editor.ss
+++ b/collects/framework/private/editor.ss
@@ -6,7 +6,7 @@
            "../preferences.ss"
            "../gui-utils.ss"
            mzlib/etc
-           (lib "mred-sig.ss" "mred")
+           mred/mred-sig
            scheme/path)
   
   (import mred^
diff --git a/collects/framework/private/encode-decode.ss b/collects/framework/private/encode-decode.ss
index 1d39ca6f99..849816bd3c 100644
--- a/collects/framework/private/encode-decode.ss
+++ b/collects/framework/private/encode-decode.ss
@@ -21,7 +21,7 @@
                (λ (oport)
                  (let ([chopped (chop-up (encode-sexp `(begin ,@bodies)))])
                    (fprintf oport "(module ~a mzscheme\n" m)
-                   (fprintf oport "  (require (lib \"encode-decode.ss\" \"framework\" \"private\"))\n")
+                   (fprintf oport "  (require framework/private/encode-decode)\n")
                    (fprintf oport "  (decode ~a" (car chopped))
                    (for-each (lambda (chopped)
                                (fprintf oport "\n          ~a" chopped))
diff --git a/collects/framework/private/exit.ss b/collects/framework/private/exit.ss
index 6edb99c60d..1ff3f08fd1 100644
--- a/collects/framework/private/exit.ss
+++ b/collects/framework/private/exit.ss
@@ -4,7 +4,7 @@
            "sig.ss"
            "../preferences.ss"
            "../gui-utils.ss"
-           (lib "mred-sig.ss" "mred"))
+           mred/mred-sig)
   
   (import mred^)
   (export (rename framework:exit^
diff --git a/collects/framework/private/finder.ss b/collects/framework/private/finder.ss
index 8a500f9905..9070485998 100644
--- a/collects/framework/private/finder.ss
+++ b/collects/framework/private/finder.ss
@@ -3,7 +3,7 @@
   (require string-constants
            "sig.ss"
            "../preferences.ss"
-           (lib "mred-sig.ss" "mred")
+           mred/mred-sig
            mzlib/string
            scheme/path
            mzlib/etc)
diff --git a/collects/framework/private/frame.ss b/collects/framework/private/frame.ss
index 03de4e517b..ff87f44644 100644
--- a/collects/framework/private/frame.ss
+++ b/collects/framework/private/frame.ss
@@ -6,7 +6,7 @@
            "../preferences.ss"
            "../gui-utils.ss"
            "bday.ss"
-           (lib "mred-sig.ss" "mred")
+           mred/mred-sig
            mzlib/list
            scheme/path
            mzlib/etc)
diff --git a/collects/framework/private/gen-standard-menus.ss b/collects/framework/private/gen-standard-menus.ss
index a1e3f1d587..dee3c5e18d 100644
--- a/collects/framework/private/gen-standard-menus.ss
+++ b/collects/framework/private/gen-standard-menus.ss
@@ -282,4 +282,4 @@
 @definterface[frame:standard-menus<%> (frame:basic<%>)]{
  
 --
-)
\ No newline at end of file
+)
diff --git a/collects/framework/private/group.ss b/collects/framework/private/group.ss
index 1e973de2e3..80e9e63174 100644
--- a/collects/framework/private/group.ss
+++ b/collects/framework/private/group.ss
@@ -5,7 +5,7 @@
            "sig.ss"
            "../preferences.ss"
            "../gui-utils.ss"
-           (lib "mred-sig.ss" "mred")
+           mred/mred-sig
            mzlib/list
            scheme/path)
   
diff --git a/collects/framework/private/handler.ss b/collects/framework/private/handler.ss
index fb7e02c2eb..04ddade507 100644
--- a/collects/framework/private/handler.ss
+++ b/collects/framework/private/handler.ss
@@ -2,15 +2,14 @@
 
 (require mzlib/class
          mzlib/list
-         (lib "hierlist.ss" "hierlist")
+         mrlib/hierlist
          "sig.ss"
          "../preferences.ss"
          "../gui-utils.ss"
-         (lib "mred-sig.ss" "mred")
+         mred/mred-sig
          scheme/path
          string-constants)
 
-
 (import mred^
         [prefix finder: framework:finder^]
         [prefix group: framework:group^]
diff --git a/collects/framework/private/icon.ss b/collects/framework/private/icon.ss
index 198cd85365..8f960fa74d 100644
--- a/collects/framework/private/icon.ss
+++ b/collects/framework/private/icon.ss
@@ -2,28 +2,28 @@
   (require (for-syntax scheme/base)
            scheme/promise
            mzlib/class
-           (lib "include-bitmap.ss" "mrlib")
+           mrlib/include-bitmap
            "bday.ss"
            "sig.ss"
-           (lib "mred-sig.ss" "mred"))
+           mred/mred-sig)
   
   (import mred^)
   (export framework:icon^)
   
-  (define eof-bitmap (delay (include-bitmap (lib "eof.gif" "icons"))))
+  (define eof-bitmap (delay (include-bitmap (lib "icons/eof.gif"))))
   (define (get-eof-bitmap) (force eof-bitmap))
   
-  (define anchor-bitmap (delay (include-bitmap (lib "anchor.gif" "icons"))))
+  (define anchor-bitmap (delay (include-bitmap (lib "icons/anchor.gif"))))
   (define (get-anchor-bitmap) (force anchor-bitmap))
   
-  (define lock-bitmap (delay (include-bitmap (lib "lock.gif" "icons"))))
+  (define lock-bitmap (delay (include-bitmap (lib "icons/lock.gif"))))
   (define (get-lock-bitmap) (force lock-bitmap))
-  (define unlock-bitmap (delay (include-bitmap (lib "unlock.gif" "icons"))))
+  (define unlock-bitmap (delay (include-bitmap (lib "icons/unlock.gif"))))
   (define (get-unlock-bitmap) (force unlock-bitmap))
   
-  (define autowrap-bitmap (delay (include-bitmap (lib "return.xbm" "icons"))))
+  (define autowrap-bitmap (delay (include-bitmap (lib "icons/return.xbm"))))
   (define (get-autowrap-bitmap) (force autowrap-bitmap))
-  (define paren-highlight-bitmap (delay (include-bitmap (lib "paren.xbm" "icons"))))
+  (define paren-highlight-bitmap (delay (include-bitmap (lib "icons/paren.xbm"))))
   (define (get-paren-highlight-bitmap) (force paren-highlight-bitmap))
   
   (define-syntax (make-get-cursor stx)
@@ -46,8 +46,8 @@
   (define get-up/down-cursor (make-get-cursor "up-down-cursor.xbm" "up-down-mask.xbm" 'size-n/s))
   (define get-left/right-cursor (make-get-cursor "left-right-cursor.xbm" "left-right-mask.xbm" 'size-e/w))
   
-  (define mrf-on-bitmap (delay (include-bitmap (lib "mrf.png" "icons"))))
-  (define gc-on-bitmap (delay (include-bitmap (lib "recycle.png" "icons"))))
+  (define mrf-on-bitmap (delay (include-bitmap (lib "icons/mrf.png"))))
+  (define gc-on-bitmap (delay (include-bitmap (lib "icons/recycle.png"))))
   
   (define (make-off-bitmap onb)
     (let* ([bitmap (make-object bitmap%
diff --git a/collects/framework/private/keymap.ss b/collects/framework/private/keymap.ss
index 1232075fe3..85b31fcb2b 100644
--- a/collects/framework/private/keymap.ss
+++ b/collects/framework/private/keymap.ss
@@ -4,7 +4,7 @@
 (require string-constants
          mzlib/class
          mzlib/list
-         (lib "mred-sig.ss" "mred")
+         mred/mred-sig
          mzlib/match
          "../preferences.ss"
          "tex-table.ss"
@@ -30,7 +30,10 @@
               [sexp (and (file-exists? path)
                          (call-with-input-file path read))])
          (match sexp
-           [`(module ,name (lib "keybinding-lang.ss" "framework") ,@(x ...)) 
+           [`(module ,name ,(or `(lib "keybinding-lang.ss" "framework")
+                                `(lib "framework/keybinding-lang.ss")
+                                `framework/keybinding-lang)
+               ,@(x ...)) 
             (let ([km (dynamic-require spec '#%keymap)])
               (hash-set! user-keybindings-files spec km)
               (send global chain-to-keymap km #t))]
diff --git a/collects/framework/private/main.ss b/collects/framework/private/main.ss
index 61b2d9e811..5ce75c2128 100644
--- a/collects/framework/private/main.ss
+++ b/collects/framework/private/main.ss
@@ -2,7 +2,7 @@
   (require mzlib/class
            "sig.ss"
            "../preferences.ss"
-           (lib "mred-sig.ss" "mred"))
+           mred/mred-sig)
   
   (import mred^
           [prefix preferences: framework:preferences^]
diff --git a/collects/framework/private/mapdesc.ss b/collects/framework/private/mapdesc.ss
index 1ee4e3b918..00575cfebc 100644
--- a/collects/framework/private/mapdesc.ss
+++ b/collects/framework/private/mapdesc.ss
@@ -13,4 +13,3 @@
                           " ("
                           (symbol->string 'events)
                           " events)"))]))
-     
\ No newline at end of file
diff --git a/collects/framework/private/menu.ss b/collects/framework/private/menu.ss
index 84e025bb40..17417bed77 100644
--- a/collects/framework/private/menu.ss
+++ b/collects/framework/private/menu.ss
@@ -2,7 +2,7 @@
   (require mzlib/class
            "sig.ss"
            "../preferences.ss"
-           (lib "mred-sig.ss" "mred"))
+           mred/mred-sig)
   
   (import mred^)
   (export framework:menu^)
diff --git a/collects/framework/private/number-snip.ss b/collects/framework/private/number-snip.ss
index 4de4dfdf67..683ad97524 100644
--- a/collects/framework/private/number-snip.ss
+++ b/collects/framework/private/number-snip.ss
@@ -2,7 +2,7 @@
 #lang scheme/unit
 
   (require "sig.ss"
-           (lib "mred-sig.ss" "mred")
+           mred/mred-sig
            mzlib/class
            "../preferences.ss"
            string-constants)
diff --git a/collects/framework/private/panel.ss b/collects/framework/private/panel.ss
index 15511244f5..856f805945 100644
--- a/collects/framework/private/panel.ss
+++ b/collects/framework/private/panel.ss
@@ -2,7 +2,7 @@
 #lang scheme/unit
   (require mzlib/class
            "sig.ss"
-           (lib "mred-sig.ss" "mred")
+           mred/mred-sig
            mzlib/list
            mzlib/etc)
   
diff --git a/collects/framework/private/pasteboard.ss b/collects/framework/private/pasteboard.ss
index dfa4e5d9f5..cfd8a0c412 100644
--- a/collects/framework/private/pasteboard.ss
+++ b/collects/framework/private/pasteboard.ss
@@ -1,14 +1,13 @@
 #lang scheme/unit
-  (require "sig.ss"
-           (lib "mred-sig.ss" "mred"))
-  
+  (require "sig.ss" mred/mred-sig)
+
   (import mred^
           [prefix editor: framework:editor^])
   (export (rename framework:pasteboard^
                   [-keymap% keymap%]))
   (init-depend mred^ framework:editor^)
-  
-  
+
+
   (define basic% (editor:basic-mixin pasteboard%))
   (define standard-style-list% (editor:standard-style-list-mixin basic%))
   (define -keymap% (editor:keymap-mixin standard-style-list%))
diff --git a/collects/framework/private/path-utils.ss b/collects/framework/private/path-utils.ss
index 6cde004b3d..72810d5be0 100644
--- a/collects/framework/private/path-utils.ss
+++ b/collects/framework/private/path-utils.ss
@@ -1,6 +1,5 @@
 #lang scheme/unit
-  (require "sig.ss"
-           (lib "mred-sig.ss" "mred"))
+  (require "sig.ss" mred/mred-sig)
   
   (import)
   (export framework:path-utils^)
diff --git a/collects/framework/private/preferences.ss b/collects/framework/private/preferences.ss
index f265d6037c..6dff796a37 100644
--- a/collects/framework/private/preferences.ss
+++ b/collects/framework/private/preferences.ss
@@ -34,7 +34,7 @@ the state transitions / contracts are:
            "sig.ss"
            "../gui-utils.ss"
            "../preferences.ss"
-	   (lib "mred-sig.ss" "mred")
+	   mred/mred-sig
 	   mzlib/list)
   
   (import mred^
diff --git a/collects/framework/private/standard-menus-items.ss b/collects/framework/private/standard-menus-items.ss
index 6cee32ef51..ced9aae26c 100644
--- a/collects/framework/private/standard-menus-items.ss
+++ b/collects/framework/private/standard-menus-items.ss
@@ -396,4 +396,4 @@
                       '(string-constant about-menu-item)
                       on-demand-do-nothing
                       #f)
-        (make-after 'help-menu 'about 'nothing)))
\ No newline at end of file
+        (make-after 'help-menu 'about 'nothing)))
diff --git a/collects/framework/private/text.ss b/collects/framework/private/text.ss
index e4e608ecf7..2e5df68210 100644
--- a/collects/framework/private/text.ss
+++ b/collects/framework/private/text.ss
@@ -13,8 +13,8 @@ WARNING: printf is rebound in the body of the unit to always
          "sig.ss"
          "../gui-utils.ss"
          "../preferences.ss"
-         (lib "mred-sig.ss" "mred")
-         (lib "interactive-value-port.ss" "mrlib")
+         mred/mred-sig
+         mrlib/interactive-value-port
          mzlib/list
          mzlib/etc
          setup/dirs
diff --git a/collects/framework/private/version.ss b/collects/framework/private/version.ss
index ba68f9b7df..1ef687c83c 100644
--- a/collects/framework/private/version.ss
+++ b/collects/framework/private/version.ss
@@ -1,7 +1,7 @@
 #lang scheme/unit
 
   (require "sig.ss"
-           (lib "mred-sig.ss" "mred")
+           mred/mred-sig
            mzlib/string
            mzlib/list)
   (import)
diff --git a/collects/frtime/base-gm.ss b/collects/frtime/base-gm.ss
index caaae231d0..ad87915d0d 100644
--- a/collects/frtime/base-gm.ss
+++ b/collects/frtime/base-gm.ss
@@ -1,6 +1,6 @@
 (module base-gm mzscheme
   (require mzlib/list
-	   (lib  "etc.ss"))
+	   mzlib/etc)
   
   (provide assert
            print-each
diff --git a/collects/frtime/etc.ss b/collects/frtime/etc.ss
index db0a67d924..a54758063d 100644
--- a/collects/frtime/etc.ss
+++ b/collects/frtime/etc.ss
@@ -1,12 +1,12 @@
 
 (module etc frtime/frtime-lang-only
-  (require (lib "main-collects.ss" "setup"))
+  (require setup/main-collects)
   (require-for-syntax syntax/kerncase
 		      syntax/stx
 		      syntax/name
 		      syntax/context
-		      (lib "main-collects.ss" "setup")
-		      (lib "stxset.ss" "mzlib" "private"))
+		      setup/main-collects
+		      mzlib/private/stxset)
 
   (provide true false
 	   boolean=? symbol=?
diff --git a/collects/frtime/frp-core.ss b/collects/frtime/frp-core.ss
index e747b224fd..8cc1d2a0c8 100644
--- a/collects/frtime/frp-core.ss
+++ b/collects/frtime/frp-core.ss
@@ -6,7 +6,7 @@
            "erl.ss"
            "heap.ss")
   
-  (require-for-syntax (lib "struct-info.ss" "scheme"))
+  (require-for-syntax scheme/struct-info)
  
   
   
diff --git a/collects/frtime/frtime-tool.ss b/collects/frtime/frtime-tool.ss
index 765725c926..f18eec8a96 100644
--- a/collects/frtime/frtime-tool.ss
+++ b/collects/frtime/frtime-tool.ss
@@ -5,7 +5,7 @@
            mred
            mzlib/etc
            mzlib/list
-	   (lib "tool.ss" "drscheme")
+	   drscheme/tool
            string-constants)
   
   (provide tool@)
diff --git a/collects/frtime/graphics-posn-less-unit.ss b/collects/frtime/graphics-posn-less-unit.ss
index 84dc9c2fa3..29d84313a7 100644
--- a/collects/frtime/graphics-posn-less-unit.ss
+++ b/collects/frtime/graphics-posn-less-unit.ss
@@ -6,7 +6,7 @@
 
 #lang scheme/unit
 
-  (require (lib "mred-sig.ss" "mred")
+  (require mred/mred-sig
 	   mzlib/class
 	   mzlib/class100
 	   mzlib/etc
diff --git a/collects/frtime/graphics-unit.ss b/collects/frtime/graphics-unit.ss
index 7e0aa72271..153f664e0b 100644
--- a/collects/frtime/graphics-unit.ss
+++ b/collects/frtime/graphics-unit.ss
@@ -1,6 +1,6 @@
 (module graphics-unit mzscheme
   (require mzlib/unit
-	   (lib "mred-sig.ss" "mred")
+	   mred/mred-sig
 	   "graphics-sig.ss"
 	   "graphics-posn-less-unit.ss")
   (provide graphics@)
diff --git a/collects/frtime/graphics.ss b/collects/frtime/graphics.ss
index bbfd6a0f1d..911e1d3644 100644
--- a/collects/frtime/graphics.ss
+++ b/collects/frtime/graphics.ss
@@ -1,6 +1,6 @@
 (module graphics mzscheme
   (require mzlib/unit
-	   (lib "mred-sig.ss" "mred")
+	   mred/mred-sig
 	   mred
 	   "graphics-sig.ss"
 	   "graphics-unit.ss")
diff --git a/collects/frtime/gui/doc.txt b/collects/frtime/gui/doc.txt
index ad9c44ad71..49a082feb9 100644
--- a/collects/frtime/gui/doc.txt
+++ b/collects/frtime/gui/doc.txt
@@ -2,8 +2,8 @@
   
 MACROS
 -------
-To get the basic macros: 
-(require (lib "mixin-macros.ss" "frtime" "demos" "gui"))
+To get the basic macros:
+(require frtime/demos/gui/mixin-macros)
 
 > (events->callbacks field-name update-call)
 Generates a mixin for allowing an event stream to drive
diff --git a/collects/frtime/gui/mod-mrpanel.ss b/collects/frtime/gui/mod-mrpanel.ss
index 99c67a45d9..239c9199b7 100644
--- a/collects/frtime/gui/mod-mrpanel.ss
+++ b/collects/frtime/gui/mod-mrpanel.ss
@@ -1,18 +1,18 @@
 (module mod-mrpanel mzscheme
   (require mzlib/class
 	   mzlib/class100
-	   (prefix wx: (lib "kernel.ss" "mred" "private"))
-	   (lib "lock.ss" "mred" "private")
-	   (lib "const.ss" "mred" "private")
-	   (lib "check.ss" "mred" "private")
-	   (lib "helper.ss" "mred" "private")
-	   (lib "wx.ss" "mred" "private")
-	   (lib "kw.ss" "mred" "private")
+	   (prefix wx: mred/private/kernel)
+	   mred/private/lock
+	   mred/private/const
+	   mred/private/check
+	   mred/private/helper
+	   mred/private/wx
+	   mred/private/kw
            "mod-wx-panel.ss"
-	   (lib "mrwindow.ss" "mred" "private")
-	   (lib "mrcontainer.ss" "mred" "private")
-	   (lib "mrtabgroup.ss" "mred" "private")
-	   (lib "mrgroupbox.ss" "mred" "private"))
+	   mred/private/mrwindow
+	   mred/private/mrcontainer
+	   mred/private/mrtabgroup
+	   mred/private/mrgroupbox)
 
   (provide #|pane%
 	   vertical-pane%
diff --git a/collects/frtime/gui/mod-wx-panel.ss b/collects/frtime/gui/mod-wx-panel.ss
index 2d1ff279d6..dd45859c0f 100644
--- a/collects/frtime/gui/mod-wx-panel.ss
+++ b/collects/frtime/gui/mod-wx-panel.ss
@@ -2,15 +2,15 @@
   (require mzlib/class
 	   mzlib/class100
 	   mzlib/list
-	   (prefix wx: (lib "kernel.ss" "mred" "private"))
-	   (lib "lock.ss" "mred" "private")
-	   (lib "const.ss" "mred" "private")
-	   (lib "helper.ss" "mred" "private")
-	   (lib "check.ss" "mred" "private")
-	   (lib "wx.ss" "mred" "private")
-	   (lib "wxwindow.ss" "mred" "private")
-	   (lib "wxitem.ss" "mred" "private")
-	   (lib "wxcontainer.ss" "mred" "private"))
+	   (prefix wx: mred/private/kernel)
+	   mred/private/lock
+	   mred/private/const
+	   mred/private/helper
+	   mred/private/check
+	   mred/private/wx
+	   mred/private/wxwindow
+	   mred/private/wxitem
+	   mred/private/wxcontainer)
 
   (provide (protect wx-panel%
 		    wx-vertical-panel%
diff --git a/collects/frtime/struct.ss b/collects/frtime/struct.ss
index f1fff3ca22..4d247f5973 100644
--- a/collects/frtime/struct.ss
+++ b/collects/frtime/struct.ss
@@ -2,7 +2,7 @@
 (module struct mzscheme
   (require mzlib/etc
 	   syntax/stx
-           (lib "struct-info.ss" "scheme"))
+           scheme/struct-info)
   (require-for-template mzscheme)
   
   (provide build-struct-names
diff --git a/collects/games/checkers/checkers.ss b/collects/games/checkers/checkers.ss
index 65b81a2e8a..93aa6d03d8 100644
--- a/collects/games/checkers/checkers.ss
+++ b/collects/games/checkers/checkers.ss
@@ -1,6 +1,6 @@
 #lang mzscheme
 
-(require (lib "gl-board.ss" "games" "gl-board-game")
+(require games/gl-board-game/gl-board
          mzlib/class
          mzlib/math
          mred
@@ -9,7 +9,7 @@
          sgl
          sgl/gl
          srfi/25/array
-         (lib "include-bitmap.ss" "mrlib")
+         mrlib/include-bitmap
          "honu-bitmaps.ss")
 (provide game@)
 
diff --git a/collects/games/doors/doors.ss b/collects/games/doors/doors.ss
index f5c96101e5..2150deb950 100644
--- a/collects/games/doors/doors.ss
+++ b/collects/games/doors/doors.ss
@@ -1,8 +1,8 @@
 (module doors mzscheme
-  (require (lib "gl-board.ss" "games" "gl-board-game")
+  (require games/gl-board-game/gl-board
            sgl/gl-vectors
            sgl
-           (lib "bitmap.ss" "sgl")
+           sgl/bitmap
            mred
            mzlib/list
            mzlib/etc
diff --git a/collects/games/gobblet/gui.ss b/collects/games/gobblet/gui.ss
index 55568148ba..cb9e976476 100644
--- a/collects/games/gobblet/gui.ss
+++ b/collects/games/gobblet/gui.ss
@@ -1,5 +1,5 @@
 (module gui mzscheme
-  (require (lib "gl-board.ss" "games" "gl-board-game")
+  (require games/gl-board-game/gl-board
            mzlib/class
 	   mred
            mzlib/file
diff --git a/collects/games/mines/mines.ss b/collects/games/mines/mines.ss
index 17d9203253..e9dd4063fa 100644
--- a/collects/games/mines/mines.ss
+++ b/collects/games/mines/mines.ss
@@ -9,7 +9,7 @@
          mzlib/class
          mzlib/unit
          mred
-         (lib "include-bitmap.ss" "mrlib"))
+         mrlib/include-bitmap)
 
 (provide game@)
 
diff --git a/collects/games/parcheesi/best-players.ss b/collects/games/parcheesi/best-players.ss
index 0aa016cee1..aa74a87a8b 100644
--- a/collects/games/parcheesi/best-players.ss
+++ b/collects/games/parcheesi/best-players.ss
@@ -700,7 +700,7 @@ another new board representation (vector of loc's)
                       (cdr ents))])))
     
     #;
-    (require (lib "xml.ss" "xml")
+    (require xml
              "parse.ss")
     #;
     (define (dump-out-candidates candidates)
diff --git a/collects/games/parcheesi/rules.ss b/collects/games/parcheesi/rules.ss
index cbbea060cf..76a041bd36 100644
--- a/collects/games/parcheesi/rules.ss
+++ b/collects/games/parcheesi/rules.ss
@@ -6,8 +6,8 @@
            "gui.ss"
 
            mzlib/class
-           (lib "xml.ss" "xml")
-           (lib "htmltext.ss" "browser")
+           xml
+           browser/htmltext
            mred)
 
   (define board-size 250)
diff --git a/collects/games/scribblings/common.ss b/collects/games/scribblings/common.ss
index 7bf55900ba..b08364b0c6 100644
--- a/collects/games/scribblings/common.ss
+++ b/collects/games/scribblings/common.ss
@@ -24,4 +24,4 @@
                  (onscreen name)
                  ", run the "
                  (exec "PLT Games") " program."
-                 " (Under Unix, it's called " (exec "plt-games") ")."))))
\ No newline at end of file
+                 " (Under Unix, it's called " (exec "plt-games") ")."))))
diff --git a/collects/graphics/graphics-posn-less-unit.ss b/collects/graphics/graphics-posn-less-unit.ss
index 2973ff5587..8947d814e7 100644
--- a/collects/graphics/graphics-posn-less-unit.ss
+++ b/collects/graphics/graphics-posn-less-unit.ss
@@ -4,7 +4,7 @@
 
 (module graphics-posn-less-unit mzscheme
   (require mzlib/unit
-	   (lib "mred-sig.ss" "mred")
+	   mred/mred-sig
            mred
 	   mzlib/class
 	   mzlib/class100
diff --git a/collects/graphics/graphics-unit.ss b/collects/graphics/graphics-unit.ss
index 180237bcfd..7957018803 100644
--- a/collects/graphics/graphics-unit.ss
+++ b/collects/graphics/graphics-unit.ss
@@ -1,6 +1,6 @@
 (module graphics-unit mzscheme
   (require mzlib/unit
-	   (lib "mred-sig.ss" "mred")
+	   mred/mred-sig
 	   "graphics-sig.ss"
 	   "graphics-posn-less-unit.ss")
   (provide graphics@)
diff --git a/collects/graphics/graphics.ss b/collects/graphics/graphics.ss
index 94512508b2..fbdca8470b 100644
--- a/collects/graphics/graphics.ss
+++ b/collects/graphics/graphics.ss
@@ -1,7 +1,7 @@
 (module graphics mzscheme
   (require mzlib/unit
-	   (lib "mred-sig.ss" "mred")
-	   (lib "mred-unit.ss" "mred")
+	   mred/mred-sig
+	   mred/mred-unit
 	   "graphics-sig.ss"
 	   "graphics-unit.ss")
   (provide-signature-elements graphics^ graphics:posn^)
diff --git a/collects/graphics/turtle-unit.ss b/collects/graphics/turtle-unit.ss
index 258accc3c1..82016f0475 100644
--- a/collects/graphics/turtle-unit.ss
+++ b/collects/graphics/turtle-unit.ss
@@ -1,6 +1,6 @@
 #lang scheme/unit
 
-(require (lib "mred-sig.ss" "mred")
+(require mred/mred-sig
          mzlib/class
          mzlib/class100
          mzlib/list
diff --git a/collects/graphics/turtles.ss b/collects/graphics/turtles.ss
index fd9046e0aa..0446d47a25 100644
--- a/collects/graphics/turtles.ss
+++ b/collects/graphics/turtles.ss
@@ -1,7 +1,7 @@
 (module turtles mzscheme
   (require mzlib/unit
-	   (lib "mred-sig.ss" "mred")
-	   (lib "mred-unit.ss" "mred")
+	   mred/mred-sig
+	   mred/mred-unit
 	   "turtle-sig.ss"
 	   "turtle-unit.ss")
 
diff --git a/collects/gui-debugger/annotator.ss b/collects/gui-debugger/annotator.ss
index f8e4f1455d..44c077abcd 100644
--- a/collects/gui-debugger/annotator.ss
+++ b/collects/gui-debugger/annotator.ss
@@ -1,7 +1,7 @@
 (module annotator scheme/base
 
   (require (prefix-in kernel: syntax/kerncase)
-           (lib "marks.ss" "gui-debugger")
+           gui-debugger/marks
            mzlib/etc
            (prefix-in srfi: srfi/1/search)
            (for-syntax scheme/base)
diff --git a/collects/gui-debugger/debug-tool.ss b/collects/gui-debugger/debug-tool.ss
index c22eba44a0..393e75b166 100644
--- a/collects/gui-debugger/debug-tool.ss
+++ b/collects/gui-debugger/debug-tool.ss
@@ -6,7 +6,7 @@
            mzlib/contract
            mred
            mzlib/match
-           (lib "tool.ss" "drscheme")
+           drscheme/tool
            "marks.ss"
            mrlib/switchable-button
            mrlib/bitmap-label
@@ -14,7 +14,7 @@
            "load-sandbox.ss"
            framework
            string-constants
-           (lib "debugger-language-interface.ss" "lang"))
+           lang/debugger-language-interface)
   
   (provide tool@)
   
diff --git a/collects/gui-debugger/marks.ss b/collects/gui-debugger/marks.ss
index f32a4e1932..68c7ad3ae3 100644
--- a/collects/gui-debugger/marks.ss
+++ b/collects/gui-debugger/marks.ss
@@ -3,8 +3,8 @@
   (require mzlib/list
 	   mzlib/contract
            (prefix-in mz: mzscheme)
-           (lib "my-macros.ss" "stepper" "private")
-           (lib "shared.ss" "stepper" "private"))
+           stepper/private/my-macros
+           stepper/private/shared)
 
   (define-struct full-mark-struct (module-name source label bindings values))
 
diff --git a/collects/guibuilder/doc.txt b/collects/guibuilder/doc.txt
index 55b1206305..2010dc300f 100644
--- a/collects/guibuilder/doc.txt
+++ b/collects/guibuilder/doc.txt
@@ -6,7 +6,7 @@ from the "Special" menu.
 
 Though less recommended, you can also run
 
-  (require (lib ".ss" "guibuilder"))
+  (require guibuilder/guibuilder)
 
 to get a stand-alone builder. Save your files with the extension
 ".gui" to ensure that they can be re-loaded later.
diff --git a/collects/guibuilder/tool.ss b/collects/guibuilder/tool.ss
index 7576f60b87..0c912944f7 100644
--- a/collects/guibuilder/tool.ss
+++ b/collects/guibuilder/tool.ss
@@ -1,6 +1,6 @@
 
 (module tool mzscheme
-  (require (lib "tool.ss" "drscheme")
+  (require drscheme/tool
            mred
            mzlib/unit
            mzlib/class
diff --git a/collects/handin-client/client.ss b/collects/handin-client/client.ss
index c51daf9bee..245995565a 100644
--- a/collects/handin-client/client.ss
+++ b/collects/handin-client/client.ss
@@ -1,5 +1,5 @@
 (module client mzscheme
-  (require (lib "mzssl.ss" "openssl") "this-collection.ss")
+  (require openssl/mzssl "this-collection.ss")
 
   (provide handin-connect
 	   handin-disconnect
diff --git a/collects/handin-client/handin-multi.ss b/collects/handin-client/handin-multi.ss
index 7731b24ab1..187dc95705 100644
--- a/collects/handin-client/handin-multi.ss
+++ b/collects/handin-client/handin-multi.ss
@@ -1,7 +1,7 @@
 (module handin-multi mzscheme
   (require mzlib/class mzlib/list mzlib/string mzlib/port
            mred framework
-           (lib "external.ss" "browser")
+           browser/external
            "info.ss" "client-gui.ss" "this-collection.ss")
 
   (define handin-name (#%info-lookup 'name))
diff --git a/collects/handin-client/updater.ss b/collects/handin-client/updater.ss
index d8579f907f..6d9f348ff7 100644
--- a/collects/handin-client/updater.ss
+++ b/collects/handin-client/updater.ss
@@ -1,7 +1,5 @@
 (module updater mzscheme
-  (require mzlib/file mzlib/port net/url
-           (lib "plt-installer.ss" "setup") mred
-           framework
+  (require mzlib/file mzlib/port net/url setup/plt-installer mred framework
            "info.ss" "this-collection.ss")
   (define name        (#%info-lookup 'name))
   (define web-address (#%info-lookup 'web-address))
diff --git a/collects/handin-server/main.ss b/collects/handin-server/main.ss
index d50061d6eb..59174ad353 100644
--- a/collects/handin-server/main.ss
+++ b/collects/handin-server/main.ss
@@ -429,7 +429,7 @@
   (let ([c #f] [sema (make-semaphore 1)])
     ;; use only when needed so it doesn't blow up on non-unix platforms
     (lambda (passwd salt)
-      (unless c (set! c (dynamic-require '(lib "crypt.ss" "ffi") 'crypt)))
+      (unless c (set! c (dynamic-require 'ffi/crypt 'crypt)))
       ;; crypt is not reentrant
       (call-with-semaphore sema
         (lambda () (bytes->string/utf-8 (c passwd salt)))))))
diff --git a/collects/handin-server/utils.ss b/collects/handin-server/utils.ss
index a8d5cf7715..451b643e01 100644
--- a/collects/handin-server/utils.ss
+++ b/collects/handin-server/utils.ss
@@ -2,7 +2,7 @@
   (require mzlib/list
            mzlib/class
            mred
-           (lib "posn.ss" "lang")
+           lang/posn
            (prefix pc: mzlib/pconvert)
            mzlib/pretty
            (only "main.ss" timeout-control)
diff --git a/collects/help/bug-report.ss b/collects/help/bug-report.ss
index f5da67caf2..61808b0c0a 100644
--- a/collects/help/bug-report.ss
+++ b/collects/help/bug-report.ss
@@ -9,7 +9,7 @@
            mzlib/list
            net/url
            net/uri-codec
-           (lib "htmltext.ss" "browser")
+           browser/htmltext
            setup/dirs
            "private/buginfo.ss")
 
diff --git a/collects/hierlist/hierlist.ss b/collects/hierlist/hierlist.ss
index db448c646e..c0ae6e9c6b 100644
--- a/collects/hierlist/hierlist.ss
+++ b/collects/hierlist/hierlist.ss
@@ -1,4 +1,6 @@
 #lang scheme/base
 
+;; This is a stub for legacy code
+
 (require mrlib/hierlist)
 (provide (all-from-out mrlib/hierlist))
diff --git a/collects/htdch/Examples/blink-java.ss b/collects/htdch/Examples/blink-java.ss
index ab4a16fe22..1d2c242026 100644
--- a/collects/htdch/Examples/blink-java.ss
+++ b/collects/htdch/Examples/blink-java.ss
@@ -42,4 +42,4 @@ class Examples {
   Examples() { }
   boolean b = check this.p.x expect 10;
   boolean a = new A("hello").go(); 
-}
\ No newline at end of file
+}
diff --git a/collects/htdch/Examples/iblink-java.ss b/collects/htdch/Examples/iblink-java.ss
index 58348aac12..9f75a78775 100644
--- a/collects/htdch/Examples/iblink-java.ss
+++ b/collects/htdch/Examples/iblink-java.ss
@@ -42,4 +42,4 @@ class Examples {
   Examples() { 
     a.go(); 
   }
-}
\ No newline at end of file
+}
diff --git a/collects/htdch/colors/installer.ss b/collects/htdch/colors/installer.ss
index 2e2a5e575a..8271ace39a 100644
--- a/collects/htdch/colors/installer.ss
+++ b/collects/htdch/colors/installer.ss
@@ -1,5 +1,5 @@
 (module installer mzscheme
-  (require (lib "compile.ss" "profj"))
+  (require profj/compile)
   (provide installer)
   
   (define (mprintf . a)
diff --git a/collects/htdch/draw/Canvas-native-methods.ss b/collects/htdch/draw/Canvas-native-methods.ss
index 02e907d98d..37db05ac6c 100644
--- a/collects/htdch/draw/Canvas-native-methods.ss
+++ b/collects/htdch/draw/Canvas-native-methods.ss
@@ -1,6 +1,6 @@
-#lang scheme 
+#lang scheme
 
-(require (lib "support.scm" "htdch" "draw")
+(require (lib "htdch/draw/support.scm")
          mzlib/unit)
 
 (define void-or-true #t)
diff --git a/collects/htdch/draw/World-native-methods.ss b/collects/htdch/draw/World-native-methods.ss
index 5696012ee9..66be8cf2b7 100644
--- a/collects/htdch/draw/World-native-methods.ss
+++ b/collects/htdch/draw/World-native-methods.ss
@@ -1,6 +1,6 @@
 #lang scheme
 
-(require (lib "support.scm" "htdch" "draw") 
+(require (lib "htdch/draw/support.scm")
          mzlib/unit)
 
 (provide endOfTime-java.lang.String-native endOfWorld-java.lang.String-native bigBangO-double-native)
diff --git a/collects/htdch/draw/installer.ss b/collects/htdch/draw/installer.ss
index bab61143aa..ee561173c5 100644
--- a/collects/htdch/draw/installer.ss
+++ b/collects/htdch/draw/installer.ss
@@ -1,7 +1,7 @@
 (module installer mzscheme
-  (require (lib "compile.ss" "profj")
-           (prefix colors: (lib "installer.ss" "htdch" "colors"))
-           (prefix geometry: (lib "installer.ss" "htdch" "geometry")))
+  (require profj/compile
+           (prefix colors: htdch/colors/installer)
+           (prefix geometry: htdch/geometry/installer))
   (provide installer)
   
   (define (mprintf . a)
diff --git a/collects/htdch/draw/pre-installer.ss b/collects/htdch/draw/pre-installer.ss
index 166c90a5b7..afd6ca7d33 100644
--- a/collects/htdch/draw/pre-installer.ss
+++ b/collects/htdch/draw/pre-installer.ss
@@ -1,5 +1,5 @@
 (module pre-installer mzscheme
-  (require (lib "compile.ss" "profj"))
+  (require profj/compile)
   (provide pre-installer)
   
   (define (pre-installer plthome)
diff --git a/collects/htdch/geometry/installer.ss b/collects/htdch/geometry/installer.ss
index a4866d19ca..137fb0b2c2 100644
--- a/collects/htdch/geometry/installer.ss
+++ b/collects/htdch/geometry/installer.ss
@@ -1,5 +1,5 @@
 (module installer mzscheme
-  (require (lib "compile.ss" "profj"))
+  (require profj/compile)
   (provide installer)
   
   (define (mprintf . a)
diff --git a/collects/htdch/graphics/installer.ss b/collects/htdch/graphics/installer.ss
index 49cf9ade2c..55e628f9f8 100644
--- a/collects/htdch/graphics/installer.ss
+++ b/collects/htdch/graphics/installer.ss
@@ -1,5 +1,5 @@
 (module installer mzscheme
-  (require (lib "compile.ss" "profj"))
+  (require profj/compile)
   (provide installer)
   
   (define (installer plthome)
diff --git a/collects/htdch/graphics/rename.ss b/collects/htdch/graphics/rename.ss
index c8363dea6b..cc29d9a421 100644
--- a/collects/htdch/graphics/rename.ss
+++ b/collects/htdch/graphics/rename.ss
@@ -3,7 +3,7 @@
   (require mzlib/class
            mred
            htdp/image
-           (lib "imageeq.ss" "lang" "private" ))
+           lang/private/imageeq)
   
   (provide to-symbol new-object call-back-canvas% overlay-x-y 
            inner->function image-eq? empty-list printer cons-l style-list)
diff --git a/collects/htdch/idraw/installer.ss b/collects/htdch/idraw/installer.ss
index ebf4af3306..017f4db82a 100644
--- a/collects/htdch/idraw/installer.ss
+++ b/collects/htdch/idraw/installer.ss
@@ -1,5 +1,5 @@
 (module installer mzscheme
-  (require (lib "compile.ss" "profj"))
+  (require profj/compile)
   (provide installer)
 
   (define (installer plthome)
diff --git a/collects/htdch/idraw/pre-installer.ss b/collects/htdch/idraw/pre-installer.ss
index 3fc8b0d778..9a2685db60 100644
--- a/collects/htdch/idraw/pre-installer.ss
+++ b/collects/htdch/idraw/pre-installer.ss
@@ -1,5 +1,5 @@
 (module pre-installer mzscheme
-  (require (lib "compile.ss" "profj"))
+  (require profj/compile)
   (provide pre-installer)
 
   (define (pre-installer plthome)
diff --git a/collects/htdp/Test/arrow-gui.ss b/collects/htdp/Test/arrow-gui.ss
index 7dd9b52985..c18fb8e9ef 100644
--- a/collects/htdp/Test/arrow-gui.ss
+++ b/collects/htdp/Test/arrow-gui.ss
@@ -1,8 +1,8 @@
 ;; The first three lines of this file were inserted by DrScheme. They record metadata
 ;; about the language level of this file in a form that our tools can easily process.
 #reader(lib "htdp-beginner-reader.ss" "lang")((modname arrow-gui) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require (lib "arrow-gui.ss" "htdp"))
-(require (lib "gui.ss" "htdp"))
+(require htdp/arrow-gui)
+(require htdp/gui)
 
 (define (left b e) (draw-message msg "left"))
 (define (right b e) (draw-message msg "right"))
diff --git a/collects/htdp/Test/arrow.ss b/collects/htdp/Test/arrow.ss
index a013b1352f..acdd4db83b 100644
--- a/collects/htdp/Test/arrow.ss
+++ b/collects/htdp/Test/arrow.ss
@@ -1,8 +1,8 @@
 ;; The first three lines of this file were inserted by DrScheme. They record metadata
 ;; about the language level of this file in a form that our tools can easily process.
 #reader(lib "htdp-beginner-reader.ss" "lang")((modname arrow) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require (lib "arrow.ss" "htdp"))
-(require (lib "draw.ss" "htdp"))
+(require htdp/arrow)
+(require htdp/draw)
 
 ;; ---------------------------------------------------------------------
 ;; 
diff --git a/collects/htdp/Test/convert.ss b/collects/htdp/Test/convert.ss
index add77950a8..2208fa73e6 100644
--- a/collects/htdp/Test/convert.ss
+++ b/collects/htdp/Test/convert.ss
@@ -1,7 +1,7 @@
 #lang scheme 
 
-(require (lib "testing.ss" "htdp"))
-(require (lib "convert.ss" "htdp"))
+(require htdp/testing)
+(require htdp/convert)
 
 ;; f2c : num -> num
 ;; to convert a Fahrenheit temperature into a Celsius temperature 
@@ -63,4 +63,4 @@
 ;; TEST BY HAND: (convert-gui fx)
 ;; signal an error about not returning a number
 
-(generate-report)
\ No newline at end of file
+(generate-report)
diff --git a/collects/htdp/Test/dir.ss b/collects/htdp/Test/dir.ss
index 9ce427b5a8..765346a8e0 100644
--- a/collects/htdp/Test/dir.ss
+++ b/collects/htdp/Test/dir.ss
@@ -1,7 +1,7 @@
 ;; The first three lines of this file were inserted by DrScheme. They record metadata
 ;; about the language level of this file in a form that our tools can easily process.
 #reader(lib "htdp-intermediate-lambda-reader.ss" "lang")((modname dir) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require (lib "dir.ss" "htdp"))
+(require htdp/dir)
 
 (define current (create-dir "."))
 (define teachps (create-dir (string-append "/Users/matthias/plt/" "collects/teachpack/htdp")))
diff --git a/collects/htdp/Test/docs.ss b/collects/htdp/Test/docs.ss
index cfa86d97eb..afa33721f2 100644
--- a/collects/htdp/Test/docs.ss
+++ b/collects/htdp/Test/docs.ss
@@ -1,7 +1,7 @@
 ;; The first three lines of this file were inserted by DrScheme. They record metadata
 ;; about the language level of this file in a form that our tools can easily process.
 #reader(lib "htdp-beginner-reader.ss" "lang")((modname docs) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require (lib "docs.ss" "htdp"))
+(require htdp/docs)
 
 (check-expect (annotation? '<html>) true)
 (check-expect (annotation? 'html) false)
diff --git a/collects/htdp/Test/elevator.ss b/collects/htdp/Test/elevator.ss
index f217ba209c..a7577170ae 100644
--- a/collects/htdp/Test/elevator.ss
+++ b/collects/htdp/Test/elevator.ss
@@ -1,7 +1,7 @@
 ;; The first three lines of this file were inserted by DrScheme. They record metadata
 ;; about the language level of this file in a form that our tools can easily process.
 #reader(lib "htdp-beginner-reader.ss" "lang")((modname elevator) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require (lib "elevator.ss" "htdp"))
+(require htdp/elevator)
 
 ;; next3 : (union 'up 'down) N X -> N
 ;; always sends elevator to next floor up or down, 
diff --git a/collects/htdp/Test/graphing.ss b/collects/htdp/Test/graphing.ss
index 4068437eb1..2b0cdf38b7 100644
--- a/collects/htdp/Test/graphing.ss
+++ b/collects/htdp/Test/graphing.ss
@@ -1,7 +1,7 @@
 ;; The first three lines of this file were inserted by DrScheme. They record metadata
 ;; about the language level of this file in a form that our tools can easily process.
 #reader(lib "htdp-beginner-reader.ss" "lang")((modname graphing) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require (lib "graphing.ss" "htdp"))
+(require htdp/graphing)
 
 (define (fun1 x) (+ (* x x) 1))
 (check-expect (graph-fun fun1 'red) true)
diff --git a/collects/htdp/Test/guess1.ss b/collects/htdp/Test/guess1.ss
index a162136fbb..1fb35f7499 100644
--- a/collects/htdp/Test/guess1.ss
+++ b/collects/htdp/Test/guess1.ss
@@ -1,7 +1,7 @@
 ;; The first three lines of this file were inserted by DrScheme. They record metadata
 ;; about the language level of this file in a form that our tools can easily process.
 #reader(lib "htdp-beginner-reader.ss" "lang")((modname guess1) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require (lib "guess.ss" "htdp"))
+(require htdp/guess)
 
 ;; check-guess : number number -> symbol 
 ;; to determine how guess and target relate to each other 
diff --git a/collects/htdp/Test/guess2.ss b/collects/htdp/Test/guess2.ss
index 67d0ddb90d..1d3f2ec201 100644
--- a/collects/htdp/Test/guess2.ss
+++ b/collects/htdp/Test/guess2.ss
@@ -1,7 +1,7 @@
 ;; The first three lines of this file were inserted by DrScheme. They record metadata
 ;; about the language level of this file in a form that our tools can easily process.
 #reader(lib "htdp-beginner-reader.ss" "lang")((modname guess2) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require (lib "guess.ss" "htdp"))
+(require htdp/guess)
 
 ;; check-guess3 : digit digit digit number -> symbol
 ;; to determine how three guess digits and target relate to each other 
diff --git a/collects/htdp/Test/guess3.ss b/collects/htdp/Test/guess3.ss
index acf45f46d3..1ffb8cf012 100644
--- a/collects/htdp/Test/guess3.ss
+++ b/collects/htdp/Test/guess3.ss
@@ -1,7 +1,7 @@
 ;; The first three lines of this file were inserted by DrScheme. They record metadata
 ;; about the language level of this file in a form that our tools can easily process.
 #reader(lib "htdp-beginner-reader.ss" "lang")((modname guess3) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require (lib "guess.ss" "htdp"))
+(require htdp/guess)
 
 ;; check-guess-for-list : (listof DIGIT) number -> symbol
 ;; to determine how guess digits and target relate to each other 
diff --git a/collects/htdp/Test/gui.ss b/collects/htdp/Test/gui.ss
index 577b78eb18..94782d6762 100644
--- a/collects/htdp/Test/gui.ss
+++ b/collects/htdp/Test/gui.ss
@@ -1,7 +1,7 @@
 ;; The first three lines of this file were inserted by DrScheme. They record metadata
 ;; about the language level of this file in a form that our tools can easily process.
 #reader(lib "htdp-advanced-reader.ss" "lang")((modname gui) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #t #t none #f ())))
-(require (lib "gui.ss" "htdp"))
+(require htdp/gui)
 
 ;; type in text, choose, click okay, watch message field change, close
 
diff --git a/collects/htdp/Test/hangman1.ss b/collects/htdp/Test/hangman1.ss
index 7afc6c10c1..18a4f619fd 100644
--- a/collects/htdp/Test/hangman1.ss
+++ b/collects/htdp/Test/hangman1.ss
@@ -1,7 +1,7 @@
 ;; The first three lines of this file were inserted by DrScheme. They record metadata
 ;; about the language level of this file in a form that our tools can easily process.
 #reader(lib "htdp-beginner-reader.ss" "lang")((modname hangman1) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require (lib "hangman.ss" "htdp"))
+(require htdp/hangman)
 
 ; (load "tester.ss")
 ;; by hand, Beginner for plain, Full for errors 
diff --git a/collects/htdp/Test/lkup-gui.ss b/collects/htdp/Test/lkup-gui.ss
index 32c71f2f93..9afe66752b 100644
--- a/collects/htdp/Test/lkup-gui.ss
+++ b/collects/htdp/Test/lkup-gui.ss
@@ -1,9 +1,9 @@
 ;; The first three lines of this file were inserted by DrScheme. They record metadata
 ;; about the language level of this file in a form that our tools can easily process.
 #reader(lib "htdp-advanced-reader.ss" "lang")((modname lkup-gui) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #t #t none #f ())))
-(require (lib "lkup-gui.ss" "htdp"))
+(require htdp/lkup-gui)
 
-(check-expect (connect 
+(check-expect (connect
                (lambda (e b)
                  (view (control))))
               true)
diff --git a/collects/htdp/Test/master.ss b/collects/htdp/Test/master.ss
index cc091f2037..37de0ec582 100644
--- a/collects/htdp/Test/master.ss
+++ b/collects/htdp/Test/master.ss
@@ -1,7 +1,7 @@
 ;; The first three lines of this file were inserted by DrScheme. They record metadata
 ;; about the language level of this file in a form that our tools can easily process.
 #reader(lib "htdp-beginner-reader.ss" "lang")((modname master) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require (lib "master.ss" "htdp"))
+(require htdp/master)
 
 ; (load "tester.ss")
 
diff --git a/collects/htdp/Test/matrix-test.ss b/collects/htdp/Test/matrix-test.ss
index e6d59e2c26..fa20fde1f3 100644
--- a/collects/htdp/Test/matrix-test.ss
+++ b/collects/htdp/Test/matrix-test.ss
@@ -1,8 +1,8 @@
 ;; The first three lines of this file were inserted by DrScheme. They record metadata
 ;; about the language level of this file in a form that our tools can easily process.
 #reader(lib "htdp-intermediate-lambda-reader.ss" "lang")((modname matrix-test) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-;(require (lib "matrix-invisible.ss" "htdp"))
-(require (lib "matrix.ss" "htdp"))
+;(require htdp/matrix-invisible)
+(require htdp/matrix)
 
 (define r1 '((a00 a01 a02)
              (a10 a11 a12)))
diff --git a/collects/htdp/Test/world-add-line.ss b/collects/htdp/Test/world-add-line.ss
index 241d2caef8..0b4ce29687 100644
--- a/collects/htdp/Test/world-add-line.ss
+++ b/collects/htdp/Test/world-add-line.ss
@@ -1,7 +1,7 @@
 ;; The first three lines of this file were inserted by DrScheme. They record metadata
 ;; about the language level of this file in a form that our tools can easily process.
 #reader(lib "htdp-beginner-reader.ss" "lang")((modname world-add-line) (read-case-sensitive #t) (teachpacks ((lib "world.ss" "teachpack" "htdp"))) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ((lib "world.ss" "teachpack" "htdp")))))
-(require (lib "world.ss" "htdp"))
+(require htdp/world)
 
 (define plain (empty-scene 100 100))
 
diff --git a/collects/htdp/guess-gui.ss b/collects/htdp/guess-gui.ss
index b7a78d6575..36ea12ab75 100644
--- a/collects/htdp/guess-gui.ss
+++ b/collects/htdp/guess-gui.ss
@@ -4,7 +4,7 @@
 	   mzlib/class
            mzlib/list
            mzlib/etc
-           (lib "prim.ss" "lang"))
+           lang/prim)
   
   (provide
    connect ; (button% event% -> true) -> true 
diff --git a/collects/htdp/hangman-world.ss b/collects/htdp/hangman-world.ss
index 9f433b3f1a..95924142b0 100644
--- a/collects/htdp/hangman-world.ss
+++ b/collects/htdp/hangman-world.ss
@@ -6,13 +6,13 @@
 |#
 
 #cs
-(module hangman-world mzscheme  
+(module hangman-world mzscheme
   (require htdp/world
            htdp/error
-           (lib "prim.ss" "lang")
+           lang/prim
            mzlib/contract
-           mzlib/etc 
-           mzlib/list)       
+           mzlib/etc
+           mzlib/list)
   
   (define (letter? s) (and (symbol? s) (pair? (member s LETTERS))))
   (define LETTERS '(a b c d e f g h i j k l m o p q r s t u v w x y z _))
diff --git a/collects/htdp/hangman.ss b/collects/htdp/hangman.ss
index ef59b9cfb3..fb1243360a 100644
--- a/collects/htdp/hangman.ss
+++ b/collects/htdp/hangman.ss
@@ -5,7 +5,7 @@
 	   mzlib/class
            mzlib/unit
            mzlib/etc
-           (lib "prim.ss" "lang")
+           lang/prim
 	   mred)
   
   (provide
diff --git a/collects/htdp/image.ss b/collects/htdp/image.ss
index 03eb444389..c41efa7e17 100644
--- a/collects/htdp/image.ss
+++ b/collects/htdp/image.ss
@@ -9,11 +9,11 @@ plt/collects/tests/mzscheme/htdp-image.ss
 
 (require mred
          mzlib/class
-         (lib "cache-image-snip.ss" "mrlib")
+         mrlib/cache-image-snip
          mzlib/math
 	 lang/prim
-         (lib "posn.ss" "lang")
-         (lib "imageeq.ss" "lang" "private")
+         lang/posn
+         lang/private/imageeq
          "error.ss")
 
 (provide-primitives
diff --git a/collects/htdp/master-play.ss b/collects/htdp/master-play.ss
index 090f6888be..9b172e76bf 100644
--- a/collects/htdp/master-play.ss
+++ b/collects/htdp/master-play.ss
@@ -1,7 +1,7 @@
 #cs(module master-play mzscheme
   (require 
    "master.ss"
-   (lib "prim.ss" "lang"))
+   lang/prim)
   
   (provide go)
   (define-primitive go go/proc)
diff --git a/collects/htdp/matrix-unit.ss b/collects/htdp/matrix-unit.ss
index d20d813fde..2884f40448 100644
--- a/collects/htdp/matrix-unit.ss
+++ b/collects/htdp/matrix-unit.ss
@@ -2,9 +2,9 @@
 
 (require htdp/matrix-sig
          htdp/matrix-render-sig
-         (lib "matrix-snip.ss" "mrlib")
+         mrlib/matrix-snip
          htdp/error
-         (lib "posn.ss" "lang")
+         lang/posn
          mzlib/class
          mzlib/pconvert
          mzlib/pretty)
diff --git a/collects/htdp/matrix.ss b/collects/htdp/matrix.ss
index fd435fb93a..b736037b58 100644
--- a/collects/htdp/matrix.ss
+++ b/collects/htdp/matrix.ss
@@ -5,12 +5,12 @@
 (require htdp/matrix-sig
          htdp/matrix-render-sig
          htdp/matrix-unit
-         (lib "matrix-snip.ss" "mrlib"))
+         mrlib/matrix-snip)
 
 (require mzlib/class
          mzlib/string
          mred
-         (lib "matrix-snip.ss" "mrlib"))
+         mrlib/matrix-snip)
 
 ;; ---------------------------------------------------------------------------
 
diff --git a/collects/htdp/servlet.ss b/collects/htdp/servlet.ss
index aac7b29256..a3f70aef79 100644
--- a/collects/htdp/servlet.ss
+++ b/collects/htdp/servlet.ss
@@ -2,7 +2,7 @@
 #cs(module servlet mzscheme
      (require web-server/servlet-env
               htdp/error
-              (lib "xml.ss" "xml")
+              xml
               mzlib/etc)
      (provide (all-from web-server/servlet-env)
               (rename wrapped-build-suspender build-suspender))
diff --git a/collects/htdp/show-queen.ss b/collects/htdp/show-queen.ss
index 9493fc0e2d..d0541c65a0 100644
--- a/collects/htdp/show-queen.ss
+++ b/collects/htdp/show-queen.ss
@@ -1 +1 @@
-(module show-queen mzscheme (require (lib "encode-decode.ss" "framework" "private")) (decode ad56db8ee3360cfd15368b05eca6eecc60fbb05834cd1f14e81714b2cd444a65c923cbb9ec43bfbda464d97226b3e8167db2c5cb21451d512c6a3c2a0385c3d751398442ab1a369dc3f6e761d8c4bf4d39891b2d8681e525497a67cfaa4518a4bd54af23a221618b0765107a876765c7a13a38d1217c382caae6231401071a61ce62a0e541a16ea13857b515ae850fcf05e30fea2bc273397b3ef563ad55038532ca4330652bf43f40f2a42c075ffd76c6c65b0745277a5849a25399dc428422ea2a8de6e86582621b6baa5e28e3f3149c3a0b4f4e47f4a0e054ceee0e0fabff94922ac9aae4a4253aca9b1cab462b34be0ae179dd36e55c844ec56a7527fe2e91ed199de372735a78267fc0b3277d630db915bcdf01e997a4d0d1c998e3becc44e440f159c88749d9170589af99056772652d2d6e77f21bcb0f76346d650deea7d40eb457148dac06dab7b2c4222dbaba15b45b38c1156ee0a51aaa4bfc48f2b848242bc119ffba238b98c296fea225a392e20631876d8290cba1e559f0fe47a391c8144189c442efe9643a55ceab1374a7d99deaabe6ff5338c1e59c439409308bb38e61ac8ff0e167851c4e2e4187c51df652558d229d512c0a1d202174a7ef817bc48da84f67dc3681ab4cb1ff766203f3d56aeb0620ac4dad45f317b505ad8ed21f9db86d12c948db3a7121f2375e98a3c66f1060b93d8a6e8d970ee952196cabfab68f5598d4ef449f7ad23b5aeb283e6ecafbcc506bd50f18f9563ca5dc3eb321332d896414fd980c3e3dfdb22c6558962b2ec78c8b5de2dd2ea7dca30c8f8ebae59bcafdaff9ad0832b7ad37e77f884ca9ce428f480c2f8a0bf039ddb5a972e91a976af0d843f13a5acf7ab840b48042deab24ac9cb5b5a425aa3d93e04a1df740809d6d476d33946b6cfae9ce7155832a2530ed3a50e72b3abb870855424a6d9bfe5ecafbd8a710fbb68e2de7d8b7fbd8a707b1651efb36c596736cb98a7d80f76e56cc684bda97f211e23314d5b460b0bb6e586608ea0ee19a235c57084ba34d1419c61e5d65f09211e69eb87df8853a7c32dab255cfb72008bc445e55fce402c150f7745513ee76b09a505e22416870b05aa5d778c1abdd38c80c31ac1f6246cb98d43d66b6956fb497ecf232c42ebd0ebbf434ecb882d1b69ada73946e27e93649f3900f869e30eaac44c53237cdc3cca4fa934a348d65ab97878bb09f8d49c403cedcc1afe5caecba98d4d6d27363584659cef30d3d1a59e1b2296e83d79efa03b620c2fc04f6307f27ac01683bcaf4a3ff098ed67f81bf71b320c7d66846ad9774df8f46a71ca1a01b29488d14360e4f17451399088f2547e7425293dc64cd48f17ee3e4b60c7759d1de546807b94f56907f550f4e7572a55af0ca8e3457c5ea780b9df08d04eeb049cfd6d20f69a98c99cc87b785cbbaac41a26b1874c3981118b5bc3a9936ce448170e47489bf1f79cf356ad8fc0e7ff01e067e6c68e394f7a767ee8012f9010f8b798099481a60784aef85e3269e62a77b3a99ada6f0b7599161cc8a0bc9931afb9f6db89cff00))
+(module show-queen mzscheme (require framework/private/encode-decode) (decode ad56db8ee3360cfd15368b05eca6eecc60fbb05834cd1f14e81714b2cd444a65c923cbb9ec43bfbda464d97226b3e8167db2c5cb21451d512c6a3c2a0385c3d751398442ab1a369dc3f6e761d8c4bf4d39891b2d8681e525497a67cfaa4518a4bd54af23a221618b0765107a876765c7a13a38d1217c382caae6231401071a61ce62a0e541a16ea13857b515ae850fcf05e30fea2bc273397b3ef563ad55038532ca4330652bf43f40f2a42c075ffd76c6c65b0745277a5849a25399dc428422ea2a8de6e86582621b6baa5e28e3f3149c3a0b4f4e47f4a0e054ceee0e0fabff94922ac9aae4a4253aca9b1cab462b34be0ae179dd36e55c844ec56a7527fe2e91ed199de372735a78267fc0b3277d630db915bcdf01e997a4d0d1c998e3becc44e440f159c88749d9170589af99056772652d2d6e77f21bcb0f76346d650deea7d40eb457148dac06dab7b2c4222dbaba15b45b38c1156ee0a51aaa4bfc48f2b848242bc119ffba238b98c296fea225a392e20631876d8290cba1e559f0fe47a391c8144189c442efe9643a55ceab1374a7d99deaabe6ff5338c1e59c439409308bb38e61ac8ff0e167851c4e2e4187c51df652558d229d512c0a1d202174a7ef817bc48da84f67dc3681ab4cb1ff766203f3d56aeb0620ac4dad45f317b505ad8ed21f9db86d12c948db3a7121f2375e98a3c66f1060b93d8a6e8d970ee952196cabfab68f5598d4ef449f7ad23b5aeb283e6ecafbcc506bd50f18f9563ca5dc3eb321332d896414fd980c3e3dfdb22c6558962b2ec78c8b5de2dd2ea7dca30c8f8ebae59bcafdaff9ad0832b7ad37e77f884ca9ce428f480c2f8a0bf039ddb5a972e91a976af0d843f13a5acf7ab840b48042deab24ac9cb5b5a425aa3d93e04a1df740809d6d476d33946b6cfae9ce7155832a2530ed3a50e72b3abb870855424a6d9bfe5ecafbd8a710fbb68e2de7d8b7fbd8a707b1651efb36c596736cb98a7d80f76e56cc684bda97f211e23314d5b460b0bb6e586608ea0ee19a235c57084ba34d1419c61e5d65f09211e69eb87df8853a7c32dab255cfb72008bc445e55fce402c150f7745513ee76b09a505e22416870b05aa5d778c1abdd38c80c31ac1f6246cb98d43d66b6956fb497ecf232c42ebd0ebbf434ecb882d1b69ada73946e27e93649f3900f869e30eaac44c53237cdc3cca4fa934a348d65ab97878bb09f8d49c403cedcc1afe5caecba98d4d6d27363584659cef30d3d1a59e1b2296e83d79efa03b620c2fc04f6307f27ac01683bcaf4a3ff098ed67f81bf71b320c7d66846ad9774df8f46a71ca1a01b29488d14360e4f17451399088f2547e7425293dc64cd48f17ee3e4b60c7759d1de546807b94f56907f550f4e7572a55af0ca8e3457c5ea780b9df08d04eeb049cfd6d20f69a98c99cc87b785cbbaac41a26b1874c3981118b5bc3a9936ce448170e47489bf1f79cf356ad8fc0e7ff01e067e6c68e394f7a767ee8012f9010f8b798099481a60784aef85e3269e62a77b3a99ada6f0b7599161cc8a0bc9931afb9f6db89cff00))
diff --git a/collects/htdp/world.ss b/collects/htdp/world.ss
index bd6c496b7d..3cce3bd81f 100644
--- a/collects/htdp/world.ss
+++ b/collects/htdp/world.ss
@@ -641,8 +641,8 @@ Matthew
 ;; adds the stop animation and image creation button, 
 ;; whose callbacks runs as a thread in the custodian
 (define IMAGES "Images")
-(define-runtime-path s:pth '(lib "break.png" "icons"))
-(define-runtime-path i:pth '(lib "file.gif" "icons"))
+(define-runtime-path s:pth '(lib "icons/break.png"))
+(define-runtime-path i:pth '(lib "icons/file.gif"))
 (define (add-stop-and-image-buttons  frame the-play-back-custodian)
   (define p (new horizontal-pane% [parent frame][alignment '(center center)]))
   (define S ((bitmap-label-maker (string-constant break-button-label) s:pth) '_))
diff --git a/collects/html/html-unit.ss b/collects/html/html-unit.ss
index 7ff3333ad2..6406d6773a 100644
--- a/collects/html/html-unit.ss
+++ b/collects/html/html-unit.ss
@@ -8,7 +8,7 @@
 	   mzlib/include
 	   "html-sig.ss"
 	   "sgml-reader-sig.ss"
-	   (lib "xml-sig.ss" "xml"))
+	   xml/xml-sig)
 
   (provide html@)
 
diff --git a/collects/html/html.ss b/collects/html/html.ss
index 1802205d59..de547502d4 100644
--- a/collects/html/html.ss
+++ b/collects/html/html.ss
@@ -6,10 +6,10 @@
 	   "html-unit.ss"
 	   "sgml-reader-sig.ss"
 	   "sgml-reader-unit.ss"
-	   (lib "xml.ss" "xml")
-	   (lib "xml-sig.ss" "xml")
-	   (lib "sig.ss" "xml" "private")
-	   (lib "xml-unit.ss" "xml"))
+	   xml/xml
+	   xml/xml-sig
+	   xml/private/sig
+	   xml/xml-unit)
 
   ;; To get read-comments from sgml-reader, we have to
   ;;  avoid the read-comments from XML, so we rename it
diff --git a/collects/html/sgml-reader-unit.ss b/collects/html/sgml-reader-unit.ss
index 0ad98fa64c..30be92f0b7 100644
--- a/collects/html/sgml-reader-unit.ss
+++ b/collects/html/sgml-reader-unit.ss
@@ -7,7 +7,7 @@
 	   mzlib/list
 	   mzlib/string
 	   "sgml-reader-sig.ss"
-	   (lib "sig.ss" "xml" "private"))
+	   xml/private/sig)
 
   (provide sgml-reader@)
 
diff --git a/collects/lang/htdp-langs.ss b/collects/lang/htdp-langs.ss
index 0827b92f1a..aad56c8467 100644
--- a/collects/lang/htdp-langs.ss
+++ b/collects/lang/htdp-langs.ss
@@ -9,8 +9,8 @@
 #lang scheme
 (require string-constants
            framework
-           (prefix-in et: (lib "stacktrace.ss" "errortrace"))
-           (prefix-in tr: (lib "stacktrace.ss" "trace"))
+           (prefix-in et: errortrace/stacktrace)
+           (prefix-in tr: trace/stacktrace)
            mzlib/pretty
            (prefix-in pc: mzlib/pconvert)
            mzlib/file
@@ -20,13 +20,13 @@
            mzlib/struct
            mzlib/compile
            mzlib/struct
-           (lib "tool.ss" "drscheme")
+           drscheme/tool
            mred
-           (lib "bday.ss" "framework" "private")
+           framework/private/bday
            syntax/moddep
-           (lib "cache-image-snip.ss" "mrlib")
+           mrlib/cache-image-snip
            compiler/embed
-           (lib "wxme.ss" "wxme")
+           wxme/wxme
            setup/dirs
            
            ;; this module is shared between the drscheme's namespace (so loaded here) 
@@ -40,7 +40,7 @@
            
            (only-in test-engine/scheme-gui make-formatter)
            (only-in test-engine/scheme-tests scheme-test-data test-format test-execute)
-           (lib "test-display.scm" "test-engine")
+           (lib "test-engine/test-display.scm")
            )
   
   
@@ -1407,4 +1407,3 @@
         
         (drscheme:get/extend:extend-unit-frame frame-tracing-mixin)
         (drscheme:get/extend:extend-tab tab-tracing-mixin))))
-  
\ No newline at end of file
diff --git a/collects/lang/prim.ss b/collects/lang/prim.ss
index d54a4b64e3..2f157f8205 100644
--- a/collects/lang/prim.ss
+++ b/collects/lang/prim.ss
@@ -5,11 +5,11 @@
 ;; See manual for more information.
 
 (module prim mzscheme
-  (require (lib "error.ss" "lang")
-	   (rename (lib "htdp-beginner.ss" "lang") beginner-app #%app))
+  (require lang/error
+	   (rename lang/htdp-beginner beginner-app #%app))
   
   (require-for-syntax "private/firstorder.ss"
-                      (lib "shared.ss" "stepper" "private"))
+                      stepper/private/shared)
   
   (provide define-primitive
 	   define-higher-order-primitive
diff --git a/collects/lang/private/contracts/beginner-contracts.ss b/collects/lang/private/contracts/beginner-contracts.ss
index c9384180d1..2daf383e67 100644
--- a/collects/lang/private/contracts/beginner-contracts.ss
+++ b/collects/lang/private/contracts/beginner-contracts.ss
@@ -1,9 +1,9 @@
 (module beginner-contracts mzscheme
   
   (require "contracts-helpers.ss"
-           (lib "posn.ss" "lang")
-           (lib "teach.ss" "lang" "private")
-           mzlib/list)  
+           lang/posn
+           lang/private/teach
+           mzlib/list)
   
   (provide (all-defined))
   
diff --git a/collects/lang/private/imageeq.ss b/collects/lang/private/imageeq.ss
index 984998864c..98002c8a2e 100644
--- a/collects/lang/private/imageeq.ss
+++ b/collects/lang/private/imageeq.ss
@@ -1,6 +1,6 @@
 (module imageeq mzscheme
   (require mred
-           (lib "cache-image-snip.ss" "mrlib")
+           mrlib/cache-image-snip
            mzlib/class)
   
   (provide image? image=? 
diff --git a/collects/lang/private/teach.ss b/collects/lang/private/teach.ss
index cc554f5494..7e305d8989 100644
--- a/collects/lang/private/teach.ss
+++ b/collects/lang/private/teach.ss
@@ -45,7 +45,7 @@
 		      syntax/struct
 		      syntax/context
 		      mzlib/include
-                      (lib "shared.ss" "stepper" "private"))
+                      stepper/private/shared)
 
   ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
   ;; run-time helpers
diff --git a/collects/lang/private/teachhelp.ss b/collects/lang/private/teachhelp.ss
index 30d0be9df3..87ed59b2fb 100644
--- a/collects/lang/private/teachhelp.ss
+++ b/collects/lang/private/teachhelp.ss
@@ -1,9 +1,9 @@
 
 (module teachhelp mzscheme
   (require "firstorder.ss"
-           (lib "shared.ss" "stepper" "private"))
+           stepper/private/shared)
 
-  (require-for-syntax (lib "shared.ss" "stepper" "private"))
+  (require-for-syntax stepper/private/shared)
   
   (provide make-undefined-check 
 	   make-first-order-function)
diff --git a/collects/lang/r5rs.ss b/collects/lang/r5rs.ss
index 361b0d57d9..8429570c0f 100644
--- a/collects/lang/r5rs.ss
+++ b/collects/lang/r5rs.ss
@@ -2,5 +2,5 @@
 ;; This file is here only as a stub for backward compatibility; use one
 ;;   r5rs
 ;; instead.
-(module r5rs (lib "main.ss" "r5rs")
-  (#%provide (all-from (lib "main.ss" "r5rs"))))
+(module r5rs r5rs/main
+  (#%provide (all-from r5rs/main)))
diff --git a/collects/launcher/launcher-unit.ss b/collects/launcher/launcher-unit.ss
index 8e2c0cc1cb..9a81879f5d 100644
--- a/collects/launcher/launcher-unit.ss
+++ b/collects/launcher/launcher-unit.ss
@@ -6,11 +6,11 @@
 
          compiler/embed
          setup/dirs
-         (lib "variant.ss" "setup")
+         setup/variant
 
          "launcher-sig.ss"
 
-         (lib "winutf16.ss" "compiler" "private"))
+         compiler/private/winutf16)
 
 (import)
 (export launcher^)
diff --git a/collects/lazy/lazy.ss b/collects/lazy/lazy.ss
index 266b38d3d8..2d5584c5bc 100644
--- a/collects/lazy/lazy.ss
+++ b/collects/lazy/lazy.ss
@@ -1,6 +1,6 @@
 (module lazy mzscheme
 
-  (require-for-syntax (lib "shared.ss" "stepper" "private"))
+  (require-for-syntax stepper/private/shared)
 
   ;; ~ = lazy (or delayed)
   ;; ! = strict (or forced)
diff --git a/collects/little-helper/indexer/planet/srfi.plt/1/2/42-eager-comprehensions/comprehensions.ss b/collects/little-helper/indexer/planet/srfi.plt/1/2/42-eager-comprehensions/comprehensions.ss
index 8ac81275e6..0565f3e431 100644
--- a/collects/little-helper/indexer/planet/srfi.plt/1/2/42-eager-comprehensions/comprehensions.ss
+++ b/collects/little-helper/indexer/planet/srfi.plt/1/2/42-eager-comprehensions/comprehensions.ss
@@ -1038,4 +1038,3 @@
 
   
   ) ; close the module
-   
\ No newline at end of file
diff --git a/collects/little-helper/web-root/htdocs/Defaults/documentation/examples/add.ss b/collects/little-helper/web-root/htdocs/Defaults/documentation/examples/add.ss
index 3a5af4374d..6169368066 100644
--- a/collects/little-helper/web-root/htdocs/Defaults/documentation/examples/add.ss
+++ b/collects/little-helper/web-root/htdocs/Defaults/documentation/examples/add.ss
@@ -26,4 +26,4 @@
      `(html (head (title "Sum"))
             (body ([bgcolor "white"])
                   (p "The sum is "
-                     ,(number->string (+ (request-number "first") (request-number "second")))))))))
\ No newline at end of file
+                     ,(number->string (+ (request-number "first") (request-number "second")))))))))
diff --git a/collects/little-helper/web-root/htdocs/Defaults/documentation/examples/count.ss b/collects/little-helper/web-root/htdocs/Defaults/documentation/examples/count.ss
index b7b00a73f6..8cee05c506 100644
--- a/collects/little-helper/web-root/htdocs/Defaults/documentation/examples/count.ss
+++ b/collects/little-helper/web-root/htdocs/Defaults/documentation/examples/count.ss
@@ -11,4 +11,4 @@
   `(html (head (title "Counter"))
          (body ([bgcolor "white"])
                (p "This servlet was called " ,(number->string count)
-                  " times since loaded on " ,date ".")))))
\ No newline at end of file
+                  " times since loaded on " ,date ".")))))
diff --git a/collects/little-helper/web-root/htdocs/Defaults/documentation/examples/hello.ss b/collects/little-helper/web-root/htdocs/Defaults/documentation/examples/hello.ss
index 5c3fb60ea7..9b3015edec 100644
--- a/collects/little-helper/web-root/htdocs/Defaults/documentation/examples/hello.ss
+++ b/collects/little-helper/web-root/htdocs/Defaults/documentation/examples/hello.ss
@@ -7,4 +7,4 @@
   
   `(html (head (title ,the-text))
          (body ([bgcolor "white"])
-               (p ,the-text))))
\ No newline at end of file
+               (p ,the-text))))
diff --git a/collects/macro-debugger/view/browse-deriv.ss b/collects/macro-debugger/view/browse-deriv.ss
index 5b272565c7..b51ef7d143 100644
--- a/collects/macro-debugger/view/browse-deriv.ss
+++ b/collects/macro-debugger/view/browse-deriv.ss
@@ -5,7 +5,7 @@
            mzlib/unit
            mred
            framework
-           (lib "hierlist.ss" "hierlist"))
+           mrlib/hierlist)
   (require "../model/deriv.ss")
   (provide (all-defined))
 
diff --git a/collects/mrlib/hierlist.ss b/collects/mrlib/hierlist.ss
index 475f38b6b0..d42fdcde53 100644
--- a/collects/mrlib/hierlist.ss
+++ b/collects/mrlib/hierlist.ss
@@ -2,9 +2,9 @@
 
 (require mzlib/unit
          scheme/gui/base
-         hierlist/hierlist-sig
-         hierlist/hierlist-unit)
-    
+         "hierlist/hierlist-sig.ss"
+         "hierlist/hierlist-unit.ss")
+
 (define-values/invoke-unit/infer hierlist@)
 
 (provide-signature-elements hierlist^)
diff --git a/collects/hierlist/hierlist-sig.ss b/collects/mrlib/hierlist/hierlist-sig.ss
similarity index 100%
rename from collects/hierlist/hierlist-sig.ss
rename to collects/mrlib/hierlist/hierlist-sig.ss
diff --git a/collects/hierlist/hierlist-unit.ss b/collects/mrlib/hierlist/hierlist-unit.ss
similarity index 98%
rename from collects/hierlist/hierlist-unit.ss
rename to collects/mrlib/hierlist/hierlist-unit.ss
index c045b9c12f..ebf77bb498 100644
--- a/collects/hierlist/hierlist-unit.ss
+++ b/collects/mrlib/hierlist/hierlist-unit.ss
@@ -3,25 +3,25 @@
   (require (all-except mzlib/unit rename)
 	   mzlib/class
 	   mzlib/class100
-	   (lib "mred-sig.ss" "mred")
-	   (lib "include-bitmap.ss" "mrlib")
+	   mred/mred-sig
+	   mrlib/include-bitmap
 	   "hierlist-sig.ss")
 
   (require (rename mzlib/list sort* sort)
 	   mzlib/etc)
 
-  (define turn-up (include-bitmap "../icons/turn-up.png" 'png))
-  (define turn-down (include-bitmap "../icons/turn-down.png" 'png))
-  (define turn-up-click (include-bitmap "../icons/turn-up-click.png" 'png))
-  (define turn-down-click (include-bitmap "../icons/turn-down-click.png" 'png))
+  (define turn-up (include-bitmap "../../icons/turn-up.png" 'png))
+  (define turn-down (include-bitmap "../../icons/turn-down.png" 'png))
+  (define turn-up-click (include-bitmap "../../icons/turn-up-click.png" 'png))
+  (define turn-down-click (include-bitmap "../../icons/turn-down-click.png" 'png))
 
   (provide hierlist@)
   (define-unit hierlist@
     (import mred^)
     (export hierlist^)
     (init-depend mred^)
-    
-      (define-local-member-name 
+
+      (define-local-member-name
 	;; In hierarchical-list%
 	ensure-not-selected)
 
@@ -32,7 +32,7 @@
       (define blue (make-object brush% "BLUE" 'solid))
       (define black-xor (make-object brush% "BLACK" 'hilite))
       (define arrow-cursor (make-object cursor% 'arrow))
-      
+
       (define-values (up-bitmap down-bitmap up-click-bitmap down-click-bitmap)
 	(values turn-up turn-down turn-up-click turn-down-click))
 
diff --git a/collects/mrlib/include-bitmap.ss b/collects/mrlib/include-bitmap.ss
index c4f23ac96d..6864a061bd 100644
--- a/collects/mrlib/include-bitmap.ss
+++ b/collects/mrlib/include-bitmap.ss
@@ -2,10 +2,10 @@
   (require mred
 	   mzlib/class
 	   mzlib/file
-           (lib "main-collects.ss" "setup"))
+           setup/main-collects)
   (require-for-syntax syntax/path-spec
 		      mzlib/cm-accomplice
-                      (lib "main-collects.ss" "setup"))
+                      setup/main-collects)
 
   (provide include-bitmap
            include-bitmap/relative-to)
diff --git a/collects/mrlib/matrix-snip.ss b/collects/mrlib/matrix-snip.ss
index d42762145a..54f7af1a79 100644
--- a/collects/mrlib/matrix-snip.ss
+++ b/collects/mrlib/matrix-snip.ss
@@ -2,7 +2,7 @@
 
 (require mzlib/class
          mzlib/string
-         (lib "cache-image-snip.ss" "mrlib"))
+         mrlib/cache-image-snip)
 
 (provide visible-matrix%
          matrix-snip-class%
diff --git a/collects/mrlib/path-dialog.ss b/collects/mrlib/path-dialog.ss
index 9cc3c45895..c21b433fa8 100644
--- a/collects/mrlib/path-dialog.ss
+++ b/collects/mrlib/path-dialog.ss
@@ -1,3 +1,3 @@
 (module path-dialog mzscheme
-  (require (lib "path-dialog.ss" "mred" "private"))
+  (require mred/private/path-dialog)
   (provide path-dialog%))
diff --git a/collects/mrlib/private/aligned-pasteboard/aligned-pasteboard.ss b/collects/mrlib/private/aligned-pasteboard/aligned-pasteboard.ss
index 92d2628a36..4f3fb59548 100644
--- a/collects/mrlib/private/aligned-pasteboard/aligned-pasteboard.ss
+++ b/collects/mrlib/private/aligned-pasteboard/aligned-pasteboard.ss
@@ -1,7 +1,7 @@
 (module aligned-pasteboard mzscheme
   
   (require
-   (lib "click-forwarding-editor.ss" "mrlib")
+   mrlib/click-forwarding-editor
    "geometry-managed-pasteboard.ss"
    "locked-pasteboard.ss")
   
diff --git a/collects/mrlib/private/aligned-pasteboard/tests/insertion-without-display.ss b/collects/mrlib/private/aligned-pasteboard/tests/insertion-without-display.ss
index 69e740f42a..b4a5a80cd8 100644
--- a/collects/mrlib/private/aligned-pasteboard/tests/insertion-without-display.ss
+++ b/collects/mrlib/private/aligned-pasteboard/tests/insertion-without-display.ss
@@ -1,4 +1,4 @@
-(require (lib "aligned-pasteboard.ss" "mrlib"))
+(require mrlib/aligned-pasteboard)
 (with-handlers ([exn? (lambda (x) #f)])
   (send (new pasteboard%) insert (new aligned-editor-snip% (editor (new horizontal-pasteboard%))))
   #t)
diff --git a/collects/mrlib/private/aligned-pasteboard/tests/test-locked-pasteboard.ss b/collects/mrlib/private/aligned-pasteboard/tests/test-locked-pasteboard.ss
index 16a8510efb..3ee53399a7 100644
--- a/collects/mrlib/private/aligned-pasteboard/tests/test-locked-pasteboard.ss
+++ b/collects/mrlib/private/aligned-pasteboard/tests/test-locked-pasteboard.ss
@@ -1,6 +1,6 @@
 (require
  "../locked-pasteboard.ss"
- (lib "click-forwarding-editor.ss" "mrlib"))
+ mrlib/click-forwarding-editor)
 
 (define f (new frame% (width 400) (height 500) (label "test")))
 (define e (new (click-forwarding-editor-mixin (locked-pasteboard-mixin pasteboard%))))
diff --git a/collects/mrlib/syntax-browser.ss b/collects/mrlib/syntax-browser.ss
index 22b69cf139..dc01c9e02f 100644
--- a/collects/mrlib/syntax-browser.ss
+++ b/collects/mrlib/syntax-browser.ss
@@ -498,10 +498,10 @@ needed to really make this work:
   
   (define (set-box/f! b v) (when (box? b) (set-box! b v)))
   
-  (define down-bitmap (include-bitmap (lib "turn-down.png" "icons") 'png))
-  (define up-bitmap (include-bitmap (lib "turn-up.png" "icons") 'png))
-  (define down-click-bitmap (include-bitmap (lib "turn-down-click.png" "icons") 'png))
-  (define up-click-bitmap (include-bitmap (lib "turn-up-click.png" "icons") 'png))
+  (define down-bitmap (include-bitmap (lib "icons/turn-down.png") 'png))
+  (define up-bitmap (include-bitmap (lib "icons/turn-up.png") 'png))
+  (define down-click-bitmap (include-bitmap (lib "icons/turn-down-click.png") 'png))
+  (define up-click-bitmap (include-bitmap (lib "icons/turn-up-click.png") 'png))
   (define arrow-snip-height
     (max 10
          (send up-bitmap get-height)
diff --git a/collects/mzlib/class-traced.ss b/collects/mzlib/class-traced.ss
index 1df7866662..f503746d5a 100644
--- a/collects/mzlib/class-traced.ss
+++ b/collects/mzlib/class-traced.ss
@@ -2,7 +2,7 @@
   
   ;; All of the implementation is actually in private/class-internal.ss,
   ;;  which provides extra (private) functionality to contract.ss.
-  (require (lib "private/class-internal.ss" "scheme"))
+  (require scheme/private/class-internal)
   
   (provide (rename class-traced class)
            (rename class*-traced class*)
diff --git a/collects/mzlib/cm-accomplice.ss b/collects/mzlib/cm-accomplice.ss
index 69ed372899..6d7e07eb9c 100644
--- a/collects/mzlib/cm-accomplice.ss
+++ b/collects/mzlib/cm-accomplice.ss
@@ -12,7 +12,7 @@
       (thread-wait 
        (thread (lambda ()
 		 (set! param
-		       (dynamic-require '(lib "cm-ctime.ss" "mzlib/private")
+		       (dynamic-require 'mzlib/private/cm-ctime
 					'current-external-file-registrar)))))
       ((param) f))))
 
diff --git a/collects/mzlib/cm.ss b/collects/mzlib/cm.ss
index 252ce1cc12..47afb590c5 100644
--- a/collects/mzlib/cm.ss
+++ b/collects/mzlib/cm.ss
@@ -1,7 +1,7 @@
 (module cm scheme/base
   (require syntax/modcode
            syntax/modresolve
-	   (lib "main-collects.ss" "setup")
+	   setup/main-collects
 	   scheme/file)
 
   (provide make-compilation-manager-load/use-compiled-handler
diff --git a/collects/mzlib/etc.ss b/collects/mzlib/etc.ss
index 3f9c69703b..1e72899af5 100644
--- a/collects/mzlib/etc.ss
+++ b/collects/mzlib/etc.ss
@@ -1,6 +1,6 @@
 #lang mzscheme
 
-(require (lib "main-collects.ss" "setup")
+(require setup/main-collects
          scheme/local
          scheme/bool
          (only scheme/base
@@ -14,7 +14,7 @@
 (require-for-syntax syntax/kerncase
                     syntax/stx
                     syntax/name
-                    (lib "main-collects.ss" "setup")
+                    setup/main-collects
                     "private/stxset.ss")
 
 (provide boolean=? symbol=?
diff --git a/collects/mzlib/match.ss b/collects/mzlib/match.ss
index 6bfea8a14c..d38a78ad82 100644
--- a/collects/mzlib/match.ss
+++ b/collects/mzlib/match.ss
@@ -1,4 +1,4 @@
 #lang scheme/base
 
 (require scheme/match/legacy-match)
-(provide (all-from-out scheme/match/legacy-match))
\ No newline at end of file
+(provide (all-from-out scheme/match/legacy-match))
diff --git a/collects/mzlib/plt-match.ss b/collects/mzlib/plt-match.ss
index fa392175b3..84e08e6231 100644
--- a/collects/mzlib/plt-match.ss
+++ b/collects/mzlib/plt-match.ss
@@ -1,4 +1,4 @@
 #lang scheme/base
 
 (require scheme/match/match)
-(provide (all-from-out scheme/match/match))
\ No newline at end of file
+(provide (all-from-out scheme/match/match))
diff --git a/collects/mzlib/pretty.ss b/collects/mzlib/pretty.ss
index b5fab1c919..91e7aea70d 100644
--- a/collects/mzlib/pretty.ss
+++ b/collects/mzlib/pretty.ss
@@ -10,7 +10,7 @@
 ;;      (current-print pretty-print-handler)
 
 (module pretty mzscheme
-   (require (lib "port.ss" "mzlib" "private"))
+   (require mzlib/private/port)
 
    (provide pretty-print
 	    pretty-display
diff --git a/collects/mzlib/private/sandbox-coverage.ss b/collects/mzlib/private/sandbox-coverage.ss
index 67167e4089..4a9c1e3453 100644
--- a/collects/mzlib/private/sandbox-coverage.ss
+++ b/collects/mzlib/private/sandbox-coverage.ss
@@ -1,7 +1,7 @@
 ;; This file is is used in the context of sandboxed code, it uses the
 ;; stacktrace interface from errortrace to find uncovered expressions.
 (module sandbox-coverage mzscheme
-  (require (lib "stacktrace.ss" "errortrace") mzlib/unit mzlib/list)
+  (require errortrace/stacktrace mzlib/unit mzlib/list)
 
   ;; Test coverage run-time support
   (define test-coverage-enabled (make-parameter #t))
diff --git a/collects/mzlib/private/unit-compiletime.ss b/collects/mzlib/private/unit-compiletime.ss
index 50be3c22de..f7043eded6 100644
--- a/collects/mzlib/private/unit-compiletime.ss
+++ b/collects/mzlib/private/unit-compiletime.ss
@@ -6,7 +6,7 @@
   (require-for-template mzscheme
                         "unit-keywords.ss"
                         "unit-runtime.ss")
-  (require (lib "define-struct.ss" "scheme/private"))
+  (require scheme/private/define-struct)
   
   (provide (struct var-info (syntax? exported? id))
            (struct signature (siginfo vars val-defs stx-defs))
diff --git a/collects/mzlib/scribblings/match-grammar.ss b/collects/mzlib/scribblings/match-grammar.ss
index 22e856bf1f..3d3993eee6 100644
--- a/collects/mzlib/scribblings/match-grammar.ss
+++ b/collects/mzlib/scribblings/match-grammar.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (lib "scribblings/reference/match-parse.ss"))
+(require scribblings/reference/match-parse)
 
 (provide match-grammar)
 
diff --git a/collects/planet/private/command.ss b/collects/planet/private/command.ss
index 38da135cfd..44d19e4711 100644
--- a/collects/planet/private/command.ss
+++ b/collects/planet/private/command.ss
@@ -126,4 +126,4 @@
          [(= k 0) (error wrap-to-count "could not break string")]
          [(char=? (string-ref str k) #\space)
           (cons (substring str 0 k) (wrap-to-count (substring str (add1 k)) n))]
-         [else (loop (sub1 k))]))]))
\ No newline at end of file
+         [else (loop (sub1 k))]))]))
diff --git a/collects/planet/private/data.ss b/collects/planet/private/data.ss
index 7cd52d4816..f0513bb1ba 100644
--- a/collects/planet/private/data.ss
+++ b/collects/planet/private/data.ss
@@ -34,4 +34,4 @@
   (eq? (pkg-origin p) 'normal))
 
 (define (development-link-pkg? p)
-  (eq? (pkg-origin p) 'development-link))
\ No newline at end of file
+  (eq? (pkg-origin p) 'development-link))
diff --git a/collects/planet/private/planet-shared.ss b/collects/planet/private/planet-shared.ss
index 24fe6fec1a..e730883635 100644
--- a/collects/planet/private/planet-shared.ss
+++ b/collects/planet/private/planet-shared.ss
@@ -7,7 +7,7 @@ Various common pieces of code that both the client and server need to access
   
   (require (only-in mzlib/file path-only)
 	   mzlib/port
-           (lib "getinfo.ss" "setup")
+           setup/getinfo
            (prefix-in srfi1: srfi/1)
            "../config.ss"
            "data.ss")
diff --git a/collects/planet/private/test.ss b/collects/planet/private/test.ss
index 8694f42ebe..8d5f08fec5 100644
--- a/collects/planet/private/test.ss
+++ b/collects/planet/private/test.ss
@@ -35,4 +35,4 @@
 (test (string->mz-version "4..1")
       #f)
 
-(printf "tests passed\n")
\ No newline at end of file
+(printf "tests passed\n")
diff --git a/collects/planet/resolver.ss b/collects/planet/resolver.ss
index 5e15de83c7..2725b9b052 100644
--- a/collects/planet/resolver.ss
+++ b/collects/planet/resolver.ss
@@ -544,7 +544,7 @@ subdirectory.
                    (current-time))
            ;; oh man is this a bad hack!
            (parameterize ([current-namespace (make-namespace)])
-             (let ([ipp (dynamic-require '(lib "setup/plt-single-installer.ss")
+             (let ([ipp (dynamic-require 'setup/plt-single-installer
                                          'install-planet-package)])
                (ipp path the-dir (list owner (pkg-spec-name pkg)
                                        extra-path maj min))))))
diff --git a/collects/profj/installer.ss b/collects/profj/installer.ss
index 977b136e3f..39f20a4d1a 100644
--- a/collects/profj/installer.ss
+++ b/collects/profj/installer.ss
@@ -1,8 +1,8 @@
 (module installer mzscheme
-  (require (prefix lang: (lib "installer.ss" "profj" "libs" "java" "lang"))
-           (prefix io: (lib "installer.ss" "profj" "libs" "java" "io"))
-           (prefix test: (lib "installer.ss" "profj" "libs" "java" "tester"))
-           (prefix util: (lib "installer.ss" "profj" "libs" "java" "util"))
+  (require (prefix lang: profj/libs/java/lang/installer)
+           (prefix io: profj/libs/java/io/installer)
+           (prefix test: profj/libs/java/tester/installer)
+           (prefix util: profj/libs/java/util/installer)
            )
   (provide installer)
 
diff --git a/collects/profj/libs/java/lang/installer.ss b/collects/profj/libs/java/lang/installer.ss
index 2f76c7f471..409d7cdafc 100644
--- a/collects/profj/libs/java/lang/installer.ss
+++ b/collects/profj/libs/java/lang/installer.ss
@@ -1,5 +1,5 @@
 (module installer mzscheme
-  (require (lib "compile.ss" "profj"))
+  (require profj/compile)
   (provide installer)
 
   (define (installer plthome)
diff --git a/collects/profj/libs/java/tester/installer.ss b/collects/profj/libs/java/tester/installer.ss
index fdd186e787..74fb03cf4e 100644
--- a/collects/profj/libs/java/tester/installer.ss
+++ b/collects/profj/libs/java/tester/installer.ss
@@ -1,5 +1,5 @@
 (module installer mzscheme
-  (require (lib "compile.ss" "profj"))
+  (require profj/compile)
   (provide installer)
 
   (define (installer plthome)
diff --git a/collects/profj/libs/java/util/installer.ss b/collects/profj/libs/java/util/installer.ss
index 560ffcc43b..91153c037f 100644
--- a/collects/profj/libs/java/util/installer.ss
+++ b/collects/profj/libs/java/util/installer.ss
@@ -1,5 +1,5 @@
 (module installer mzscheme
-  (require (lib "compile.ss" "profj"))
+  (require profj/compile)
   (provide installer)
 
   (define (installer plthome)
diff --git a/collects/profj/to-scheme.ss b/collects/profj/to-scheme.ss
index 4aa0737670..01944ffbcf 100644
--- a/collects/profj/to-scheme.ss
+++ b/collects/profj/to-scheme.ss
@@ -6,7 +6,7 @@
            "parameters.ss"
            scheme/class
            mzlib/etc
-           (prefix-in int-set: (lib "integer-set.ss"))
+           (prefix-in int-set: mzlib/integer-set)
            )
   
   (provide translate-program translate-interactions (struct-out compilation-unit))
diff --git a/collects/profj/tool.ss b/collects/profj/tool.ss
index 5117413175..fe32b4d217 100644
--- a/collects/profj/tool.ss
+++ b/collects/profj/tool.ss
@@ -11,9 +11,9 @@
            profj/libs/java/lang/Object profj/libs/java/lang/array
            profj/libs/java/lang/String)
   (require "compile.ss" "parameters.ss" "parsers/lexer.ss" "parser.ss"
-           (lib "test-engine.scm" "test-engine")
-           (lib "java-tests.scm" "test-engine")
-           (lib "test-coverage.scm" "test-engine")
+           (lib "test-engine/test-engine.scm")
+           (lib "test-engine/java-tests.scm")
+           (lib "test-engine/test-coverage.scm")
            (except-in "ast.ss" for)
            "display-java.ss")
 
@@ -1168,7 +1168,7 @@
       
       ;Comment box
       ;;Comment icon
-      (define comment-gif (include-bitmap (lib "slash-slash.gif" "icons")))
+      (define comment-gif (include-bitmap (lib "icons/slash-slash.gif")))
       
       ;;The following code has been taken with small modifications from framework/private/comment-box.ss
       (define snipclass-java-comment%
@@ -1221,7 +1221,7 @@
       (drscheme:language:register-capability 'profj:special:java-comment-box (flat-contract boolean?) #f)
       
       ;;Java interactions box
-      (define ji-gif (include-bitmap (lib "j.gif" "icons")))
+      (define ji-gif (include-bitmap (lib "icons/j.gif")))
       
       (define snipclass-java-interactions%
         (class decorated-editor-snipclass%
diff --git a/collects/profjWizard/draw-txt.ss b/collects/profjWizard/draw-txt.ss
index abb2e8dd42..31af507787 100644
--- a/collects/profjWizard/draw-txt.ss
+++ b/collects/profjWizard/draw-txt.ss
@@ -292,7 +292,7 @@
   
   
   #|Tests: 
-  (require (lib "testing.scm" "testing"))
+  (require (lib "testing/testing.scm"))
   
   (test== (centered "|" 2) "| ")
   (test== (centered "|" 3) " | ")
diff --git a/collects/profjWizard/tool.ss b/collects/profjWizard/tool.ss
index 3cc0ee92c1..875900858b 100644
--- a/collects/profjWizard/tool.ss
+++ b/collects/profjWizard/tool.ss
@@ -4,8 +4,8 @@
            "view.scm"
            "draw-txt.ss"
            "data-defs.scm"
-           (lib "tool.ss" "drscheme")
-           (only (lib "drsig.ss" "drscheme" "private") drscheme:language-configuration^)
+           drscheme/tool
+           (only drscheme/private/drsig drscheme:language-configuration^)
            framework
            mred
            mzlib/unit 
diff --git a/collects/profjWizard/union.ss b/collects/profjWizard/union.ss
index daad9029e9..b2691f8e16 100644
--- a/collects/profjWizard/union.ss
+++ b/collects/profjWizard/union.ss
@@ -76,7 +76,7 @@
   
   #| Tests: 
   
-  (require (lib "testing.scm" "testing"))
+  (require (lib "testing/testing.scm"))
   
   (test== (interface "Foo" #f '())
           (string-append 
diff --git a/collects/repos-time-stamp/time-stamp.ss b/collects/repos-time-stamp/time-stamp.ss
index 43e1fd8af6..dc106ec503 100644
--- a/collects/repos-time-stamp/time-stamp.ss
+++ b/collects/repos-time-stamp/time-stamp.ss
@@ -1,6 +1,6 @@
 
 (module time-stamp mzscheme
-  (require (lib "tool.ss" "drscheme")
+  (require drscheme/tool
            mzlib/unit
            framework)
   
diff --git a/collects/rnrs/main.ss b/collects/rnrs/main.ss
index 4faf552b89..b1e11082d8 100644
--- a/collects/rnrs/main.ss
+++ b/collects/rnrs/main.ss
@@ -4,4 +4,4 @@
   (begin
     (require rnrs/main-6)
     (provide (all-from-out rnrs/main-6))))
-(bounce)
\ No newline at end of file
+(bounce)
diff --git a/collects/scheme/private/class-internal.ss b/collects/scheme/private/class-internal.ss
index dcacd26b86..38265b0ffa 100644
--- a/collects/scheme/private/class-internal.ss
+++ b/collects/scheme/private/class-internal.ss
@@ -11,7 +11,7 @@
                        syntax/name
                        syntax/context
                        syntax/define
-                       (lib "boundmap.ss" "syntax" "private")
+                       syntax/private/boundmap
                        mzlib/stxparam
                        "classidmap.ss"))
 
diff --git a/collects/scheme/sandbox.ss b/collects/scheme/sandbox.ss
index d4456874a7..77970426b9 100644
--- a/collects/scheme/sandbox.ss
+++ b/collects/scheme/sandbox.ss
@@ -373,7 +373,7 @@
 
 (define (evaluate-program program limits uncovered!)
   (when uncovered!
-    (eval `(,#'#%require (lib "sandbox-coverage.ss" "mzlib" "private"))))
+    (eval `(,#'#%require mzlib/private/sandbox-coverage)))
   ;; the actual evaluation happens under specified limits, if given
   (let ([run (if (and (pair? program) (eq? 'begin (car program)))
                  (lambda () (eval* (cdr program)))
diff --git a/collects/scribble/test-reader.ss b/collects/scribble/test-reader.ss
index e000a5923d..9b2e477091 100755
--- a/collects/scribble/test-reader.ss
+++ b/collects/scribble/test-reader.ss
@@ -2,7 +2,7 @@
 #lang scheme/base
 (require mzlib/string (for-syntax scheme/base))
 
-#reader(lib "reader.ss" "scribble")
+#reader scribble/reader
 (define tests
   `(
 
diff --git a/collects/scribblings/htdp-langs/prim-ops.ss b/collects/scribblings/htdp-langs/prim-ops.ss
index f639857a78..d55b893f8d 100644
--- a/collects/scribblings/htdp-langs/prim-ops.ss
+++ b/collects/scribblings/htdp-langs/prim-ops.ss
@@ -1,4 +1,4 @@
-#reader(lib "scribble/reader.ss")
+#reader scribble/reader
 #lang scheme/base
 (require "common.ss"
          scribble/decode
diff --git a/collects/scribblings/htdp-langs/std-grammar.ss b/collects/scribblings/htdp-langs/std-grammar.ss
index 315e1e9b59..c9acac6fd9 100644
--- a/collects/scribblings/htdp-langs/std-grammar.ss
+++ b/collects/scribblings/htdp-langs/std-grammar.ss
@@ -1,4 +1,4 @@
-#reader(lib "scribble/reader.ss")
+#reader scribble/reader
 #lang scheme/base
 (require "common.ss"
          scribble/decode
diff --git a/collects/scribblings/quick/mreval.ss b/collects/scribblings/quick/mreval.ss
index 64c957d8f3..bc7d3d852c 100644
--- a/collects/scribblings/quick/mreval.ss
+++ b/collects/scribblings/quick/mreval.ss
@@ -1,13 +1,13 @@
 
 (module mreval mzscheme
-  (require (lib "eval.ss" "scribble")
-           (lib "struct.ss" "scribble")
-           (lib "scheme.ss" "scribble")
+  (require scribble/eval
+           scribble/struct
+           scribble/scheme
            mzlib/class
            mzlib/file
            mzlib/runtime-path
            mzlib/serialize
-           (lib "exn.ss" "scribblings" "quick"))
+           scribblings/quick/exn)
 
   (define-syntax define-mr
     (syntax-rules ()
diff --git a/collects/scribblings/reference/prog-steps.ss b/collects/scribblings/reference/prog-steps.ss
index 900c102547..abb60ee481 100644
--- a/collects/scribblings/reference/prog-steps.ss
+++ b/collects/scribblings/reference/prog-steps.ss
@@ -1,9 +1,9 @@
 
 (module prog-steps mzscheme
-  (require (lib "struct.ss" "scribble")
-           (lib "decode.ss" "scribble")
-           (lib "manual.ss" "scribble")
-           (lib "scheme.ss" "scribble")
+  (require scribble/struct
+           scribble/decode
+           scribble/manual
+           scribble/scheme
            mzlib/kw
            mzlib/class
            mzlib/for)
diff --git a/collects/scribblings/tools/common.ss b/collects/scribblings/tools/common.ss
index 819684b52c..2476dd523c 100644
--- a/collects/scribblings/tools/common.ss
+++ b/collects/scribblings/tools/common.ss
@@ -48,4 +48,4 @@
                        void?])]{
                                 Adds a new mixin to the class eventually created in DrScheme.
                                 }
-          @defproc[(get) class?]{Returns the class (with all registered mixins applied).}))]))
\ No newline at end of file
+          @defproc[(get) class?]{Returns the class (with all registered mixins applied).}))]))
diff --git a/collects/setup/dirs.ss b/collects/setup/dirs.ss
index 3556531932..d63453a060 100644
--- a/collects/setup/dirs.ss
+++ b/collects/setup/dirs.ss
@@ -1,7 +1,7 @@
 (module dirs mzscheme
   (require (prefix config: config)
-           (lib "winutf16.ss" "compiler" "private")
-           (lib "mach-o.ss" "compiler" "private"))
+           compiler/private/winutf16
+           compiler/private/mach-o)
 
   (provide (rename config:absolute-installation? absolute-installation?))
 
diff --git a/collects/setup/getinfo.ss b/collects/setup/getinfo.ss
index ce5b0b050f..241f2a2e61 100644
--- a/collects/setup/getinfo.ss
+++ b/collects/setup/getinfo.ss
@@ -35,7 +35,9 @@
   (and (file-exists? file)
        (match (contents)
          [(list 'module 'info
-                (or '(lib "infotab.ss" "setup") 'setup/infotab)
+                (or '(lib "infotab.ss" "setup")
+                    '(lib "setup/infotab.ss")
+                    'setup/infotab)
                 expr ...)
           ;; No need to set a reader-guard, since we checked it
           ;; above (a guard will see other uses of #lang for stuff
diff --git a/collects/setup/infotab.ss b/collects/setup/infotab.ss
index 85fdb269ac..803f0e8470 100644
--- a/collects/setup/infotab.ss
+++ b/collects/setup/infotab.ss
@@ -51,6 +51,7 @@
   (syntax-case stx ()
     [(_ lib) (member (syntax-object->datum #'lib)
                      '((lib "string-constant.ss" "string-constants")
+                       (lib "string-constants/string-constant.ss")
                        string-constants/string-constant
                        string-constants))
      (syntax/loc stx (require lib))]))
diff --git a/collects/setup/plt-installer-unit.ss b/collects/setup/plt-installer-unit.ss
index aa70a53715..ce18b4648c 100644
--- a/collects/setup/plt-installer-unit.ss
+++ b/collects/setup/plt-installer-unit.ss
@@ -1,7 +1,7 @@
 
 (module plt-installer-unit mzscheme
   (require mzlib/unit
-           (lib "mred-sig.ss" "mred")
+           mred/mred-sig
            mzlib/class
            mzlib/etc
            "plt-installer-sig.ss"
diff --git a/collects/setup/plt-installer.ss b/collects/setup/plt-installer.ss
index a488734a7a..8dbcff8a38 100644
--- a/collects/setup/plt-installer.ss
+++ b/collects/setup/plt-installer.ss
@@ -2,9 +2,9 @@
   (require mzlib/unit
            "plt-installer-sig.ss"
            "plt-installer-unit.ss"
-           (lib "mred-unit.ss" "mred")
-           (lib "mred-sig.ss" "mred"))
-  
+           mred/mred-unit
+           mred/mred-sig)
+
   (provide-signature-elements setup:plt-installer^)
   (define-compound-unit/infer plt-installer+mred@ 
     (import) (export setup:plt-installer^)
diff --git a/collects/setup/plt-single-installer.ss b/collects/setup/plt-single-installer.ss
index 4ceb4ad7d5..fcbe814cb5 100644
--- a/collects/setup/plt-single-installer.ss
+++ b/collects/setup/plt-single-installer.ss
@@ -6,8 +6,8 @@
 	   "option-sig.ss"
 	   "setup-unit.ss"
 	   "option-unit.ss"
-	   (lib "launcher-sig.ss" "launcher")
-	   (lib "launcher-unit.ss" "launcher")
+	   launcher/launcher-sig
+	   launcher/launcher-unit
 	   dynext/dynext-sig
 	   dynext/dynext-unit
 	   compiler/sig
diff --git a/collects/setup/setup-go.ss b/collects/setup/setup-go.ss
index 37e7db45b6..6f278c583b 100644
--- a/collects/setup/setup-go.ss
+++ b/collects/setup/setup-go.ss
@@ -28,8 +28,8 @@
   (archives x-archives)
   (specific-planet-dirs x-specific-planet-packages)
 
-  (require (lib "launcher-sig.ss" "launcher")
-	   (lib "launcher-unit.ss" "launcher")
+  (require launcher/launcher-sig
+	   launcher/launcher-unit
 
 	   dynext/dynext-sig
 	   dynext/dynext-unit)
diff --git a/collects/setup/unixstyle-install.ss b/collects/setup/unixstyle-install.ss
index b93bacdad5..f59ef90c1e 100644
--- a/collects/setup/unixstyle-install.ss
+++ b/collects/setup/unixstyle-install.ss
@@ -283,7 +283,7 @@
          (with-output-to-file src #:exists 'truncate/replace
            (lambda ()
              (printf ";; automatically generated by unixstyle-install\n")
-             (printf "(module config (lib \"configtab.ss\" \"setup\")\n")
+             (printf "(module config setup/configtab\n")
              (printf "  (define doc-dir ~s)\n" (dir: 'doc))
              (when (eq? 'shared (system-type 'link)) ; never true for now
                (printf "  (define dll-dir ~s)\n" (dir: 'lib)))
diff --git a/collects/setup/unpack.ss b/collects/setup/unpack.ss
index 2485e627aa..a903392256 100644
--- a/collects/setup/unpack.ss
+++ b/collects/setup/unpack.ss
@@ -7,7 +7,7 @@
            mzlib/list
            mzlib/port
 	   net/base64
-	   (lib "getinfo.ss" "setup")
+	   setup/getinfo
 	   "dirs.ss")
 
   (provide unpack
diff --git a/collects/setup/winvers.ss b/collects/setup/winvers.ss
index 4d0a2285a7..8a669efb57 100644
--- a/collects/setup/winvers.ss
+++ b/collects/setup/winvers.ss
@@ -23,7 +23,7 @@
   (define (patch-files)
     (parameterize ((current-command-line-arguments
                     (vector (path->string (find-console-bin-dir)))))
-      (dynamic-require `(lib "winvers-change.ss" "setup") #f)))
+      (dynamic-require 'setup/winvers-change #f)))
 
   (define collects-dir
     (path->string (find-collects-dir)))
diff --git a/collects/sgl/examples/gl-frame.ss b/collects/sgl/examples/gl-frame.ss
index 5a829ca467..ca2e8e7a5f 100644
--- a/collects/sgl/examples/gl-frame.ss
+++ b/collects/sgl/examples/gl-frame.ss
@@ -1,8 +1,8 @@
 ;; By Brendan Burns, with modifications by Scott Owens
 
-(module gl-frame (lib "plt-pretty-big.ss" "lang")
+(module gl-frame lang/plt-pretty-big
   (require sgl/gl
-           sgl/gl-vectors)  
+           sgl/gl-vectors)
   (provide set-gl-draw-fn
            set-gl-init-fn
            init-textures
diff --git a/collects/sgl/make-gl-info.ss b/collects/sgl/make-gl-info.ss
index d82188b2fb..a58f5b3951 100644
--- a/collects/sgl/make-gl-info.ss
+++ b/collects/sgl/make-gl-info.ss
@@ -175,7 +175,7 @@ end-string
                  (provide (all-defined))
                  ,@(map 
                     (lambda (x)
-                      `(define ,x ,(dynamic-require '(lib "make-gl-info-helper.ss" "sgl") x)))
+                      `(define ,x ,(dynamic-require 'sgl/make-gl-info-helper x)))
                     '(gl-byte-size gl-ubyte-size gl-short-size gl-ushort-size
                       gl-int-size gl-uint-size gl-boolean-size gl-sizei-size
                       gl-bitfield-size gl-enum-size gl-float-size gl-double-size
diff --git a/collects/sirmail/folderr.ss b/collects/sirmail/folderr.ss
index efa885b98e..4322495a9f 100644
--- a/collects/sirmail/folderr.ss
+++ b/collects/sirmail/folderr.ss
@@ -3,7 +3,7 @@
   (require mzlib/unit
            mzlib/class
            framework
-           (lib "mred-sig.ss" "mred"))
+           mred/mred-sig)
   
   (require mzlib/list
            mzlib/etc)
@@ -13,9 +13,9 @@
   
   (require net/imap-sig)
   
-  (require (lib "hierlist-sig.ss" "hierlist"))
+  (require mrlib/hierlist/hierlist-sig)
 
-  (require (lib "mzssl.ss" "openssl"))
+  (require openssl/mzssl)
   
   (provide folder@)
   (define-unit folder@
diff --git a/collects/sirmail/optionr.ss b/collects/sirmail/optionr.ss
index 16f37323d0..fb90dc52ca 100644
--- a/collects/sirmail/optionr.ss
+++ b/collects/sirmail/optionr.ss
@@ -4,7 +4,7 @@
 	   mzlib/string)
 
   (require net/imap-sig
-           (lib "mred-sig.ss" "mred")
+           mred/mred-sig
 	   framework)
 
   (require "sirmails.ss"
diff --git a/collects/sirmail/readr.ss b/collects/sirmail/readr.ss
index 4ea5fc4357..1e8bcf3cd5 100644
--- a/collects/sirmail/readr.ss
+++ b/collects/sirmail/readr.ss
@@ -14,7 +14,7 @@
   (require mzlib/unit
 	   mzlib/class
            mzlib/file
-	   (lib "mred-sig.ss" "mred")
+	   mred/mred-sig
            framework
            mzlib/process)
 
@@ -33,13 +33,13 @@
 	   net/base64-sig
 	   net/mime-sig
 	   net/qp-sig
-           (lib "htmltext.ss" "browser"))
+           browser/htmltext)
 
-  (require (lib "hierlist-sig.ss" "hierlist"))
+  (require mrlib/hierlist/hierlist-sig)
 
   (require net/sendurl)
 
-  (require (lib "mzssl.ss" "openssl"))
+  (require openssl/mzssl)
 
   ;; Constant for messages without a title:
   (define no-subject-string "<No subject>")
diff --git a/collects/sirmail/sendr.ss b/collects/sirmail/sendr.ss
index c10b986404..7355d40873 100644
--- a/collects/sirmail/sendr.ss
+++ b/collects/sirmail/sendr.ss
@@ -6,12 +6,12 @@
   (require scheme/tcp
            scheme/unit
            scheme/class
-	   (lib "mred-sig.ss" "mred")
+	   mred/mred-sig
            framework)
 
   (require scheme/file
 	   mzlib/process
-	   (lib "mzssl.ss" "openssl"))
+	   openssl/mzssl)
 
   (require "sirmails.ss"
 	   "pref.ss"
@@ -23,7 +23,7 @@
 	   net/base64-sig
 	   net/qp-sig)
 
-  (require (lib "hierlist-sig.ss" "hierlist"))
+  (require mrlib/hierlist/hierlist-sig)
 
   (define smtp-passwords (make-hash))
 
diff --git a/collects/sirmail/sirmail.ss b/collects/sirmail/sirmail.ss
index 1c6815e058..76653173aa 100644
--- a/collects/sirmail/sirmail.ss
+++ b/collects/sirmail/sirmail.ss
@@ -4,11 +4,11 @@
 (module sirmail mzscheme
   (require mzlib/unit
 	   mzlib/class
-	   (lib "mred-sig.ss" "mred")
+	   mred/mred-sig
 	   mred
            framework
 	   mzlib/list)
-  
+
   (require "sirmails.ss"
 	   "pref.ss"
 	   "sirmailr.ss")
@@ -26,8 +26,8 @@
 	   net/mime
 	   net/qp)
 
-  (require (lib "hierlist-sig.ss" "hierlist")
-	   (lib "hierlist.ss" "hierlist"))
+  (require mrlib/hierlist/hierlist-sig
+	   mrlib/hierlist)
 
   ;; For testing purposes, cause GC accounting to be
   ;;  enabled:
diff --git a/collects/sirmail/sirmailr.ss b/collects/sirmail/sirmailr.ss
index 97317aeb18..594c5637e6 100644
--- a/collects/sirmail/sirmailr.ss
+++ b/collects/sirmail/sirmailr.ss
@@ -1,7 +1,7 @@
 
 (module sirmailr mzscheme
   (require mzlib/unit
-	   (lib "mred-sig.ss" "mred"))
+	   mred/mred-sig)
 
   (require "sirmails.ss")
 
@@ -12,7 +12,7 @@
            net/mime-sig
            net/qp-sig)
   
-  (require (lib "hierlist-sig.ss" "hierlist"))
+  (require mrlib/hierlist/hierlist-sig)
   
   (require "utilr.ss"
            "optionr.ss"
diff --git a/collects/sirmail/utilr.ss b/collects/sirmail/utilr.ss
index 751e582afa..fe1f58f1ec 100644
--- a/collects/sirmail/utilr.ss
+++ b/collects/sirmail/utilr.ss
@@ -2,7 +2,7 @@
 (module utilr mzscheme
   (require mzlib/unit
 	   mzlib/class
-	   (lib "mred-sig.ss" "mred")
+	   mred/mred-sig
 	   net/qp-sig
 	   net/base64-sig
 	   (prefix unihead: net/unihead)
diff --git a/collects/slatex/slatex-launcher.ss b/collects/slatex/slatex-launcher.ss
index 8d12e1990d..e487e0c316 100644
--- a/collects/slatex/slatex-launcher.ss
+++ b/collects/slatex/slatex-launcher.ss
@@ -30,4 +30,4 @@
                     (slatex filename)))])
        (if result
            (exit)
-           (exit 1)))]))
\ No newline at end of file
+           (exit 1)))]))
diff --git a/collects/slideshow/code.ss b/collects/slideshow/code.ss
index ee5d289669..c23091d305 100644
--- a/collects/slideshow/code.ss
+++ b/collects/slideshow/code.ss
@@ -1,6 +1,6 @@
 
 (module code "slideshow.ss"
-  (require (lib "code.ss" "texpict")
+  (require texpict/code
 	   mzlib/unit)
   (require-for-syntax syntax/to-string
                       mzlib/list)
diff --git a/collects/slideshow/start.ss b/collects/slideshow/start.ss
index e4c0082102..bce7e03708 100644
--- a/collects/slideshow/start.ss
+++ b/collects/slideshow/start.ss
@@ -1,7 +1,7 @@
 
 (module start "slideshow.ss"
   (require "start-param.ss"
-           (lib "config.ss" "planet")
+           planet/config
 	   mred
            mzlib/class)
 
diff --git a/collects/slideshow/tool.ss b/collects/slideshow/tool.ss
index 946e5b68de..532a8701dd 100644
--- a/collects/slideshow/tool.ss
+++ b/collects/slideshow/tool.ss
@@ -15,7 +15,7 @@ pict snip :
 |#
 
 (module tool mzscheme
-  (require (lib "tool.ss" "drscheme")
+  (require drscheme/tool
            mred
            mzlib/class
            mzlib/unit
@@ -23,7 +23,7 @@ pict snip :
            string-constants
            framework
            texpict/mrpict
-           (lib "pict-value-snip.ss" "texpict")
+           texpict/pict-value-snip
            mzlib/list
            "private/pict-box-lib.ss"
            "private/image-snipr.ss")
@@ -330,9 +330,9 @@ pict snip :
       (define orig-namespace (current-namespace))
       
       (define (pict->image-snip p)
-        (let* ([pict-width (dynamic-require '(lib "texpict/mrpict.ss") 'pict-width)]
-               [pict-height (dynamic-require '(lib "texpict/mrpict.ss") 'pict-height)]
-               [draw-pict (dynamic-require '(lib "texpict/mrpict.ss") 'draw-pict)]
+        (let* ([pict-width  (dynamic-require 'texpict/mrpict 'pict-width)]
+               [pict-height (dynamic-require 'texpict/mrpict 'pict-height)]
+               [draw-pict   (dynamic-require 'texpict/mrpict 'draw-pict)]
                [bm (make-object bitmap%
                      (max 1 (add1 (inexact->exact (ceiling (pict-width p)))))
                      (max 1 (add1 (inexact->exact (ceiling (pict-height p))))))]
@@ -350,7 +350,7 @@ pict snip :
          ;; this can happen when, for example, there is no mred module
          ;; in the namespace
          (let ([pict? (with-handlers ((exn? (λ (x) #f)))
-                        (dynamic-require '(lib "texpict/mrpict.ss") 'pict?))])
+                        (dynamic-require 'texpict/mrpict 'pict?))])
            (and pict?
                 (pict? x))))
        ;; Converter:
@@ -359,7 +359,7 @@ pict snip :
        (λ () 
          (with-handlers ((exn? void))
            ;; code running in this thunk cannot fail, or else drscheme gets wedged.
-           (dynamic-require '(lib "texpict/mrpict.ss") #f))))
+           (dynamic-require 'texpict/mrpict #f))))
         
       (define lib-pict-snipclass (make-object lib-pict-snipclass%))
       (send lib-pict-snipclass set-version 2)
diff --git a/collects/slideshow/viewer.ss b/collects/slideshow/viewer.ss
index 56239d99ed..d7350d0616 100644
--- a/collects/slideshow/viewer.ss
+++ b/collects/slideshow/viewer.ss
@@ -10,7 +10,7 @@
 	   texpict/mrpict
 	   texpict/utils
 	   scheme/math
-	   (lib "include-bitmap.ss" "mrlib")
+	   mrlib/include-bitmap
 	   "sig.ss"
 	   "core.ss"
 	   "private/utils.ss")
@@ -1129,9 +1129,9 @@
       (refresh-page)
       
       (define slideshow-bm
-	(include-bitmap (lib "slideshow.png" "slideshow")))
+	(include-bitmap (lib "slideshow/slideshow.png")))
       (define slideshow-mbm
-	(include-bitmap (lib "mask.xbm" "slideshow")))
+	(include-bitmap (lib "slideshow/mask.xbm")))
 
       (let* ([bm slideshow-bm]
 	     [mbm slideshow-mbm])
diff --git a/collects/srfi/41.ss b/collects/srfi/41.ss
index 9a3c3b002f..264cf12bec 100644
--- a/collects/srfi/41.ss
+++ b/collects/srfi/41.ss
@@ -1,4 +1,4 @@
 ;; module loader for SRFI-40
 (module |41| mzscheme
-  (require (lib "streams.ss" "srfi" "41"))
-  (provide (all-from (lib "streams.ss" "srfi" "41"))))
+  (require srfi/41/streams)
+  (provide (all-from srfi/41/streams)))
diff --git a/collects/srfi/41/streams.ss b/collects/srfi/41/streams.ss
index 8b0910995a..5a8eaa7215 100644
--- a/collects/srfi/41/streams.ss
+++ b/collects/srfi/41/streams.ss
@@ -26,4 +26,4 @@
           stream-of stream-range stream-ref stream-reverse stream-scan stream-take
           stream-take-while stream-unfold stream-unfolds stream-zip)
 
-  (require "primitive.ss" "derived.ss")
\ No newline at end of file
+  (require "primitive.ss" "derived.ss")
diff --git a/collects/srpersist/srpersist.ss b/collects/srpersist/srpersist.ss
index 6326e27d65..be7d55fbd5 100644
--- a/collects/srpersist/srpersist.ss
+++ b/collects/srpersist/srpersist.ss
@@ -1,9 +1,5 @@
 (module srpersist mzscheme
   (require mzlib/unitsig)
-  (require (lib "sigs.ss" "srpersist" "private"))
-  (require (lib "srpmain.ss" "srpersist" "private"))
+  (require srpersist/private/sigs)
+  (require srpersist/private/srpmain)
   (provide-signature-elements srpersist:odbc^))
-
-
-
-   	
diff --git a/collects/stepper/debugger-tool.ss b/collects/stepper/debugger-tool.ss
index 9a459ddb8d..76df2b6241 100644
--- a/collects/stepper/debugger-tool.ss
+++ b/collects/stepper/debugger-tool.ss
@@ -1,12 +1,12 @@
 (module debugger-tool mzscheme
   (require mzlib/contract
-           (lib "tool.ss" "drscheme")
+           drscheme/tool
            mred
            (prefix frame: framework)
            mzlib/unitsig
            mzlib/class
            mzlib/list
-           (lib "bitmap-label.ss" "mrlib")
+           mrlib/bitmap-label
            "debugger-sig.ss"
            "private/debugger-vc.ss"
            "private/debugger-model.ss"
diff --git a/collects/stepper/private/debugger-model.ss b/collects/stepper/private/debugger-model.ss
index d274760acb..10b4786ed7 100644
--- a/collects/stepper/private/debugger-model.ss
+++ b/collects/stepper/private/debugger-model.ss
@@ -3,7 +3,7 @@
            mzlib/contract
            mzlib/etc
            mred
-           (lib "debugger-sig.ss" "stepper")
+           stepper/debugger-sig
            "my-macros.ss"
            "debugger-annotate.ss"
            "shared.ss"
diff --git a/collects/stepper/private/debugger-vc.ss b/collects/stepper/private/debugger-vc.ss
index 04b212d5d8..89f3296fea 100644
--- a/collects/stepper/private/debugger-vc.ss
+++ b/collects/stepper/private/debugger-vc.ss
@@ -1,6 +1,6 @@
 (module debugger-vc mzscheme
   (require mzlib/unitsig
-           (lib "debugger-sig.ss" "stepper")
+           stepper/debugger-sig
            mred
            mzlib/class
            framework
diff --git a/collects/stepper/private/lifting.ss b/collects/stepper/private/lifting.ss
index b87c5c7140..84739085b8 100644
--- a/collects/stepper/private/lifting.ss
+++ b/collects/stepper/private/lifting.ss
@@ -161,7 +161,7 @@
                           (context-record-index cr)
                           (context-record-kind cr)))
   
-  (test-begin (require (lib "mz-testing.ss" "tests" "utils")))
+  (test-begin (require tests/utils/mz-testing))
   
   (test-begin (SECTION 'stepper-lifting))
 
diff --git a/collects/stepper/private/mred-extensions.ss b/collects/stepper/private/mred-extensions.ss
index 3bd1a6a67b..2ad7592915 100644
--- a/collects/stepper/private/mred-extensions.ss
+++ b/collects/stepper/private/mred-extensions.ss
@@ -6,7 +6,7 @@
            "testing-shared.ss"
            "shared.ss"
 	   string-constants
-           (lib "bitmap-label.ss" "mrlib"))
+           mrlib/bitmap-label)
 
   (provide
    foot-img/horizontal
diff --git a/collects/stepper/private/testing-shared.ss b/collects/stepper/private/testing-shared.ss
index fb873f7fe9..f13acd01a7 100644
--- a/collects/stepper/private/testing-shared.ss
+++ b/collects/stepper/private/testing-shared.ss
@@ -31,8 +31,8 @@
                  (read-loop (read-syntax temp-file file-port))))))
         (delete-file temp-file))))
   
-;  (require (lib "mz-testing.ss" "tests" "utils")
-;           (lib "sexp-diff.ss" "tests" "utils"))
+;  (require tests/utils/mz-testing
+;           tests/utils/sexp-diff)
 ; (test `((define a 13) 14 15 #f 1)
 ;       map
 ;       syntax-object->datum
diff --git a/collects/stepper/private/xml-snip-helpers.ss b/collects/stepper/private/xml-snip-helpers.ss
index e3285d2ffe..e48a284b21 100644
--- a/collects/stepper/private/xml-snip-helpers.ss
+++ b/collects/stepper/private/xml-snip-helpers.ss
@@ -1,6 +1,6 @@
 
 (module xml-snip-helpers mzscheme
-  (require (lib "xml.ss" "xml")
+  (require xml/xml
            syntax/readerr
            mred
            mzlib/class
diff --git a/collects/stepper/stepper+xml-tool.ss b/collects/stepper/stepper+xml-tool.ss
index 8006015310..bf34fbe4bd 100644
--- a/collects/stepper/stepper+xml-tool.ss
+++ b/collects/stepper/stepper+xml-tool.ss
@@ -1,6 +1,6 @@
 (module stepper+xml-tool mzscheme
   (require mzlib/unit
-           (lib "tool.ss" "drscheme")
+           drscheme/tool
            "stepper-tool.ss"
            "xml-tool.ss")
 
diff --git a/collects/stepper/stepper-tool.ss b/collects/stepper/stepper-tool.ss
index 2426d28193..b50b7ecfbd 100644
--- a/collects/stepper/stepper-tool.ss
+++ b/collects/stepper/stepper-tool.ss
@@ -1,7 +1,7 @@
 (module stepper-tool mzscheme
 
   (require mzlib/contract
-           (lib "tool.ss" "drscheme")
+           drscheme/tool
            mred
            mzlib/pconvert
            string-constants
@@ -16,7 +16,7 @@
            (prefix x: "private/mred-extensions.ss")
            "private/shared.ss"
            "private/model-settings.ss"
-           (lib "stepper-language-interface.ss" "lang")
+           lang/stepper-language-interface
            "xml-sig.ss")
 
   (provide stepper-tool@
diff --git a/collects/stepper/xml-tool.ss b/collects/stepper/xml-tool.ss
index 9a91e0371a..f3fc2e80bc 100644
--- a/collects/stepper/xml-tool.ss
+++ b/collects/stepper/xml-tool.ss
@@ -7,8 +7,8 @@
            mzlib/class
            mred
            framework
-           (lib "tool.ss" "drscheme")
-           (lib "xml.ss" "xml")
+           drscheme/tool
+           xml/xml
            string-constants)
   
   (provide xml-tool@)
@@ -117,7 +117,7 @@
       (send xml-snipclass set-classname "drscheme:xml-snip")
       (send (get-the-snip-class-list) add xml-snipclass)
       
-      ;; this snipclass overrides the actual one in (lib "xml-snipclass.ss" "xml")
+      ;; this snipclass overrides the actual one in xml/xml-snipclass
       ;; as a full-fledged snipclass, for use in DrScheme.
       
       (define lib-xml-snipclass%
@@ -225,7 +225,7 @@
       (send scheme-snipclass set-classname "drscheme:scheme-snip")
       (send (get-the-snip-class-list) add scheme-snipclass)
       
-      ;; this snipclass overrides the one in (lib "scheme-snipclass.ss" "xml")
+      ;; this snipclass overrides the one in xml/scheme-snipclass
       ;; as a full-fledged snipclass, for use in DrScheme.
       (define lib-scheme-snipclass (make-object scheme-snipclass%))
       (send lib-scheme-snipclass set-version 1)
diff --git a/collects/string-constants/danish-string-constants.ss b/collects/string-constants/danish-string-constants.ss
index 1bf7e99075..38cbb1bae6 100644
--- a/collects/string-constants/danish-string-constants.ss
+++ b/collects/string-constants/danish-string-constants.ss
@@ -637,7 +637,7 @@ please adhere to these guidelines:
   (keybindings-error-installing-file "Error when installing the keybindings ~a:\n\n~a")
   
   (user-defined-keybinding-error "Fejl ved kørsel af brugerdefineret tastebinding ~a\n\n~a")
-  (user-defined-keybinding-malformed-file "Filen ~a indeholder ikke et modul skrevet i sproget (lib \"keybinding-lang.ss\" \"framework\").")  
+  (user-defined-keybinding-malformed-file "Filen ~a indeholder ikke et modul skrevet i sproget framework/keybinding-lang.")  
   
   ;; menu items in the "special" menu
   (insert-text-box-item "Indsæt tekstkasse")
diff --git a/collects/string-constants/english-string-constants.ss b/collects/string-constants/english-string-constants.ss
index d34411e73c..b34acc0907 100644
--- a/collects/string-constants/english-string-constants.ss
+++ b/collects/string-constants/english-string-constants.ss
@@ -680,7 +680,7 @@ please adhere to these guidelines:
  (keybindings-error-installing-file "Error when installing the keybindings ~a:\n\n~a")
   
  (user-defined-keybinding-error "Error running keybinding ~a\n\n~a")
- (user-defined-keybinding-malformed-file "The file ~a does not contain a module written in the (lib \"keybinding-lang.ss\" \"framework\") language.")  
+ (user-defined-keybinding-malformed-file "The file ~a does not contain a module written in the framework/keybinding-lang language.")  
   
  ;; menu items in the "special" menu
  (insert-text-box-item "Insert Text Box")
diff --git a/collects/string-constants/french-string-constants.ss b/collects/string-constants/french-string-constants.ss
index 1091ee45ee..191aaa4224 100644
--- a/collects/string-constants/french-string-constants.ss
+++ b/collects/string-constants/french-string-constants.ss
@@ -672,7 +672,7 @@
   (keybindings-error-installing-file "Erreur durant l'installation des raccourcis clavier provenants du fichier PLaneT ~a:\n\n~a")
   
   (user-defined-keybinding-error "Erreur durant l'exécution du raccourci clavier ~a\n\n~a")
-  (user-defined-keybinding-malformed-file "Le fichier ~a ne contient pas un module écrit dans le langage (lib \"keybinding-lang.ss\" \"framework\").")  
+  (user-defined-keybinding-malformed-file "Le fichier ~a ne contient pas un module écrit dans le langage framework/keybinding-lang.")  
   
   ;; menu items in the "special" menu
   (insert-text-box-item "Insérer une boite texte")
diff --git a/collects/string-constants/german-string-constants.ss b/collects/string-constants/german-string-constants.ss
index a550908902..a2d883ae00 100644
--- a/collects/string-constants/german-string-constants.ss
+++ b/collects/string-constants/german-string-constants.ss
@@ -570,7 +570,7 @@
  (keybindings-choose-user-defined-file "Bitte eine Datei mit den Tastenbelegungen auswählen.")
 
  (user-defined-keybinding-error "Fehler beim Ausführen der Tastenbelegung ~a\n\n~a")
- (user-defined-keybinding-malformed-file "Die Datei ~a enthält kein Modul, das in der Sprache (lib \"keybinding-lang.ss\" \"framework\") geschrieben ist.")  
+ (user-defined-keybinding-malformed-file "Die Datei ~a enthält kein Modul, das in der Sprache framework/keybinding-lang geschrieben ist.")  
  (keybindings-planet-malformed-spec "Die PLaneT-Spezifikation ist fehlerhaft: ~a") ; the string will be what the user typed in
  (keybindings-type-planet-spec "Bitte PLaneT-require-Spezifikation eingeben (ohne das `require')")
   
diff --git a/collects/string-constants/japanese-string-constants.ss b/collects/string-constants/japanese-string-constants.ss
index 5cc05d57d4..1a4889eefc 100644
--- a/collects/string-constants/japanese-string-constants.ss
+++ b/collects/string-constants/japanese-string-constants.ss
@@ -649,7 +649,7 @@ please adhere to these guidelines:
  (keybindings-choose-user-defined-file "キーバインドを記述したファイルを選択してください")
 
  (user-defined-keybinding-error "キーバインド ~a\n\n~a を実行中にエラーが発生しました")
- (user-defined-keybinding-malformed-file "ファイル ~a には、言語 (lib \"keybinding-lang.ss\" \"framework\") で書かれたモジュールが含まれていません。")
+ (user-defined-keybinding-malformed-file "ファイル ~a には、言語 framework/keybinding-lang で書かれたモジュールが含まれていません。")
 
  ;; menu items in the "special" menu
  (insert-text-box-item "テキストボックスを挿入")
diff --git a/collects/string-constants/portuguese-string-constants.ss b/collects/string-constants/portuguese-string-constants.ss
index ffaff3a315..cee058057b 100644
--- a/collects/string-constants/portuguese-string-constants.ss
+++ b/collects/string-constants/portuguese-string-constants.ss
@@ -631,7 +631,7 @@ please adhere to these guidelines:
  (keybindings-choose-user-defined-file "Please choose a file containing keybindings.")
 
  (user-defined-keybinding-error "Error running keybinding ~a\n\n~a")
- (user-defined-keybinding-malformed-file "The file ~a does not contain a module written in the (lib \"keybinding-lang.ss\" \"framework\") language.")  
+ (user-defined-keybinding-malformed-file "The file ~a does not contain a module written in the framework/keybinding-lang language.")  
   
  ;; menu items in the "special" menu
  (insert-text-box-item "Inserir Caixa de Texto")
diff --git a/collects/string-constants/simplified-chinese-string-constants.ss b/collects/string-constants/simplified-chinese-string-constants.ss
index 3bf3c25cfd..7a1a564547 100644
--- a/collects/string-constants/simplified-chinese-string-constants.ss
+++ b/collects/string-constants/simplified-chinese-string-constants.ss
@@ -607,7 +607,7 @@
   (keybindings-error-installing-file "安装热键绑定~a时出错:\n\n~a")
   
   (user-defined-keybinding-error "热键绑定出错~a\n\n~a")
-  (user-defined-keybinding-malformed-file "文件~a并不是一个按照(lib \"keybinding-lang.ss\" \"framework\")语言编写的module.")  
+  (user-defined-keybinding-malformed-file "文件~a并不是一个按照framework/keybinding-lang语言编写的module.")  
   
   ;; menu items in the "special" menu
   (insert-text-box-item "插入文本框")
diff --git a/collects/string-constants/spanish-string-constants.ss b/collects/string-constants/spanish-string-constants.ss
index 841806b234..ebfcc1882b 100644
--- a/collects/string-constants/spanish-string-constants.ss
+++ b/collects/string-constants/spanish-string-constants.ss
@@ -521,7 +521,7 @@
  (keybindings-choose-user-defined-file "Por favor seleccione un archivo con enlaces de teclas.")
 
  (user-defined-keybinding-error "Error al ejecutar el enlace de teclas ~a\n\n~a")
- (user-defined-keybinding-malformed-file "El archivo ~a no contiene un módulo escrito usando el lenguaje (lib \"keybinding-lang.ss\" \"framework\").")  
+ (user-defined-keybinding-malformed-file "El archivo ~a no contiene un módulo escrito usando el lenguaje framework/keybinding-lang.")  
 
  (insert-text-box-item "Inserta caja de texto")
  (insert-image-item "Inserta imagen...")
diff --git a/collects/string-constants/traditional-chinese-string-constants.ss b/collects/string-constants/traditional-chinese-string-constants.ss
index f928eca741..702f0e36b3 100644
--- a/collects/string-constants/traditional-chinese-string-constants.ss
+++ b/collects/string-constants/traditional-chinese-string-constants.ss
@@ -603,7 +603,7 @@
   (keybindings-error-installing-file "安裝熱鍵綁定~a時出錯:\n\n~a")
   
   (user-defined-keybinding-error "熱鍵綁定出錯~a\n\n~a")
-  (user-defined-keybinding-malformed-file "文件~a並不是一個按照(lib \"keybinding-lang.ss\" \"framework\")語言編寫的module.")  
+  (user-defined-keybinding-malformed-file "文件~a並不是一個按照framework/keybinding-lang語言編寫的module.")  
   
   ;; menu items in the "special" menu
   (insert-text-box-item "插入文本框")
diff --git a/collects/swindle/turbo.ss b/collects/swindle/turbo.ss
index 8eca027d21..6c8781592b 100644
--- a/collects/swindle/turbo.ss
+++ b/collects/swindle/turbo.ss
@@ -30,7 +30,7 @@
        (list* (quote-syntax #%plain-module-begin)
               (datum->syntax-object stx
                                     (list (quote-syntax require-for-syntax)
-                                          '(lib "turbo.ss" "swindle")))
+                                          'swindle/turbo))
               (cdr e))
        stx)
       (raise-syntax-error #f "bad syntax" stx)))
@@ -38,5 +38,5 @@
   ;; (syntax-rules ()
   ;;   [(_ . body)
   ;;    (#%plain-module-begin
-  ;;     (require-for-syntax (lib "turbo.ss" "swindle")) . body)])
+  ;;     (require-for-syntax swindle/turbo) . body)])
   )
diff --git a/collects/syntax/struct.ss b/collects/syntax/struct.ss
index 0066f50028..6fb7b5e5e3 100644
--- a/collects/syntax/struct.ss
+++ b/collects/syntax/struct.ss
@@ -4,7 +4,7 @@
            mzlib/etc
            mzlib/contract
 	   "stx.ss"
-           (lib "struct-info.ss" "scheme"))
+           scheme/struct-info)
   (require (for-template mzscheme))
   
   (provide parse-define-struct
diff --git a/collects/teachpack/htdp/image.ss b/collects/teachpack/htdp/image.ss
index f1f2c0f6cf..38cab1bb04 100644
--- a/collects/teachpack/htdp/image.ss
+++ b/collects/teachpack/htdp/image.ss
@@ -1,9 +1,9 @@
-;; this is like (lib "htdp" "image.ss") 
+;; this is like htdp/image
 ;; except that it provides things with
 ;; provide-primitives for better error
 ;; reporting in the teaching languages.
 
 (module image mzscheme
-  (require htdp/image (lib "prim.ss" "lang"))  
+  (require htdp/image lang/prim)
   (provide (all-from htdp/image))
 )
diff --git a/collects/test-box-recovery/tool.ss b/collects/test-box-recovery/tool.ss
index 2df5c05988..3ab170c3f7 100644
--- a/collects/test-box-recovery/tool.ss
+++ b/collects/test-box-recovery/tool.ss
@@ -1,6 +1,6 @@
 
 (module tool mzscheme
-  (require (lib "tool.ss" "drscheme")
+  (require drscheme/tool
            mred
            mzlib/class
            mzlib/unit
diff --git a/collects/test-engine/scheme-tests.ss b/collects/test-engine/scheme-tests.ss
index 23191d6642..e841786b29 100644
--- a/collects/test-engine/scheme-tests.ss
+++ b/collects/test-engine/scheme-tests.ss
@@ -312,4 +312,4 @@
       (test)
       (inner (void) run-test test))))
 
-(provide scheme-test-data test-format test-execute test-silence)
\ No newline at end of file
+(provide scheme-test-data test-format test-execute test-silence)
diff --git a/collects/tests/aligned-pasteboard/old-bugs/big-min.ss b/collects/tests/aligned-pasteboard/old-bugs/big-min.ss
index 9aeccc8808..d26e6d4bb5 100644
--- a/collects/tests/aligned-pasteboard/old-bugs/big-min.ss
+++ b/collects/tests/aligned-pasteboard/old-bugs/big-min.ss
@@ -2,7 +2,7 @@
  mzlib/class
  mred
  mzlib/etc
- (lib "aligned-pasteboard.ss" "mrlib"))
+ mrlib/aligned-pasteboard)
 
 (define frame (instantiate frame% () (label "big-min") (width 400) (height 500)))
 (define test-suite (instantiate vertical-pasteboard% ()))
diff --git a/collects/tests/aligned-pasteboard/old-bugs/missing-min.ss b/collects/tests/aligned-pasteboard/old-bugs/missing-min.ss
index 87991553a4..0094386a6e 100644
--- a/collects/tests/aligned-pasteboard/old-bugs/missing-min.ss
+++ b/collects/tests/aligned-pasteboard/old-bugs/missing-min.ss
@@ -1,7 +1,7 @@
 (require
  mzlib/class
  mzlib/etc
- (lib "aligned-pasteboard.ss" "mrlib")
+ mrlib/aligned-pasteboard
  mzlib/class
  mred)
 
diff --git a/collects/tests/aligned-pasteboard/test-alignment.ss b/collects/tests/aligned-pasteboard/test-alignment.ss
index a1d555ce04..1a318b0cf2 100644
--- a/collects/tests/aligned-pasteboard/test-alignment.ss
+++ b/collects/tests/aligned-pasteboard/test-alignment.ss
@@ -3,7 +3,7 @@
  mzlib/etc
  mzlib/list
  mzlib/match
- (lib "private/aligned-pasteboard/alignment.ss" "mrlib"))
+ mrlib/private/aligned-pasteboard/alignment)
 
 ;; los-equal? ((listof rect?) (listof rect?) . -> . boolean?)
 ;; tests the equality of the list of structures
diff --git a/collects/tests/aligned-pasteboard/test-pasteboard-lib.ss b/collects/tests/aligned-pasteboard/test-pasteboard-lib.ss
index 4c472c36b8..d50f496a32 100644
--- a/collects/tests/aligned-pasteboard/test-pasteboard-lib.ss
+++ b/collects/tests/aligned-pasteboard/test-pasteboard-lib.ss
@@ -3,8 +3,8 @@
  mzlib/etc
  mzlib/class
  mred
- (lib "private/aligned-pasteboard/pasteboard-lib.ss" "mrlib")
- (lib "aligned-pasteboard.ss" "mrlib"))
+ mrlib/private/aligned-pasteboard/pasteboard-lib
+ mrlib/aligned-pasteboard)
 
 ;; pasteboard-root: ((is-a?/c aligned-pasteboard<%>) -> (is-a?/c aligned-pasteboard<%>))
 ;; gets the top most aligned pasteboard in the tree of pasteboards and containers
diff --git a/collects/tests/aligned-pasteboard/test-snip-lib.ss b/collects/tests/aligned-pasteboard/test-snip-lib.ss
index 0b59e236dd..40d6c1c907 100644
--- a/collects/tests/aligned-pasteboard/test-snip-lib.ss
+++ b/collects/tests/aligned-pasteboard/test-snip-lib.ss
@@ -3,9 +3,9 @@
  mzlib/etc
  mzlib/class
  mred
- (lib "private/aligned-pasteboard/snip-lib.ss" "mrlib")
- (lib "private/aligned-pasteboard/aligned-pasteboard.ss" "mrlib")
- (lib "private/aligned-pasteboard/aligned-editor-container.ss" "mrlib"))
+ mrlib/private/aligned-pasteboard/snip-lib
+ mrlib/private/aligned-pasteboard/aligned-pasteboard
+ mrlib/private/aligned-pasteboard/aligned-editor-container)
 
 (printf "running tests for snip-lib.ss~n")
   
diff --git a/collects/tests/aligned-pasteboard/test.ss b/collects/tests/aligned-pasteboard/test.ss
index 8cd28250e3..eed9363ee4 100644
--- a/collects/tests/aligned-pasteboard/test.ss
+++ b/collects/tests/aligned-pasteboard/test.ss
@@ -5,7 +5,7 @@
  mred
  mzlib/etc
  mzlib/list
- (lib "aligned-pasteboard.ss" "mrlib")
+ mrlib/aligned-pasteboard
  "snip-dumper.ss")
 
                                                         
diff --git a/collects/tests/aligned-pasteboard/test2.ss b/collects/tests/aligned-pasteboard/test2.ss
index 23ddcceae2..76c740d834 100644
--- a/collects/tests/aligned-pasteboard/test2.ss
+++ b/collects/tests/aligned-pasteboard/test2.ss
@@ -5,7 +5,7 @@
  mred
  mzlib/etc
  mzlib/list
- (lib "aligned-pasteboard.ss" "mrlib")
+ mrlib/aligned-pasteboard
  "snip-dumper.ss")
 
 ;                                                          
diff --git a/collects/tests/drscheme/drscheme-test-util.ss b/collects/tests/drscheme/drscheme-test-util.ss
index e6f4f329f2..77f3e79cf7 100644
--- a/collects/tests/drscheme/drscheme-test-util.ss
+++ b/collects/tests/drscheme/drscheme-test-util.ss
@@ -6,13 +6,13 @@
 
 (module drscheme-test-util mzscheme
   (require (prefix fw: framework)
-           (lib "hierlist.ss" "hierlist")
+           mrlib/hierlist
            mred
            mzlib/class
            mzlib/list
            mzlib/contract
            mzlib/etc
-           (lib "gui.ss" "tests" "utils")
+           tests/utils/gui
            mzlib/contract)
 
   (provide/contract 
diff --git a/collects/tests/drscheme/io.ss b/collects/tests/drscheme/io.ss
index ab20d6da66..1869cc4a86 100644
--- a/collects/tests/drscheme/io.ss
+++ b/collects/tests/drscheme/io.ss
@@ -12,13 +12,13 @@ add this test:
 
 (module io mzscheme
   (require "drscheme-test-util.ss"
-           (lib "gui.ss" "tests" "utils")
+           tests/utils/gui
            mzlib/class
            mzlib/list
            mzlib/pretty
            mred
            framework
-           (lib "text-string-style-desc.ss" "mrlib")
+           mrlib/text-string-style-desc
            (prefix fw: framework))
   
   (provide run-test)
diff --git a/collects/tests/drscheme/language-test.ss b/collects/tests/drscheme/language-test.ss
index 1da34317f3..62d4ed46ca 100644
--- a/collects/tests/drscheme/language-test.ss
+++ b/collects/tests/drscheme/language-test.ss
@@ -14,7 +14,7 @@ the settings above should match r5rs
 #lang scheme
 
 (require "drscheme-test-util.ss"
-         (lib "gui.ss" "tests" "utils")
+         tests/utils/gui
          mred
          framework
          (prefix-in fw: framework))
@@ -1360,4 +1360,4 @@ the settings above should match r5rs
   (go intermediate)
   (go intermediate/lambda)
   (go advanced)
-  )
\ No newline at end of file
+  )
diff --git a/collects/tests/drscheme/sample-solutions-one-window.ss b/collects/tests/drscheme/sample-solutions-one-window.ss
index 132547f17e..306a119b29 100644
--- a/collects/tests/drscheme/sample-solutions-one-window.ss
+++ b/collects/tests/drscheme/sample-solutions-one-window.ss
@@ -1,7 +1,7 @@
 
 (module sample-solutions-one-window mzscheme
   (require "drscheme-test-util.ss"
-           (lib "gui.ss" "tests" "utils")
+           tests/utils/gui
            mzlib/class
            mzlib/list
            mzlib/file
diff --git a/collects/tests/drscheme/stepper-test.ss b/collects/tests/drscheme/stepper-test.ss
index a770ea648f..7a80f1aeda 100644
--- a/collects/tests/drscheme/stepper-test.ss
+++ b/collects/tests/drscheme/stepper-test.ss
@@ -3,7 +3,7 @@
   (require mred
            mzlib/class
            "drscheme-test-util.ss"
-           (lib "gui.ss" "tests" "utils")
+           tests/utils/gui
            framework
            mzlib/pretty)
   
diff --git a/collects/tests/drscheme/syncheck-test.ss b/collects/tests/drscheme/syncheck-test.ss
index deb25826f8..875ee2c736 100644
--- a/collects/tests/drscheme/syncheck-test.ss
+++ b/collects/tests/drscheme/syncheck-test.ss
@@ -9,14 +9,14 @@ trigger runtime errors in check syntax.
 (module syncheck-test mzscheme
   
   (require "drscheme-test-util.ss"
-           (lib "gui.ss" "tests" "utils")
+           tests/utils/gui
            mzlib/etc
            mzlib/class
            mzlib/list
            mzlib/file
            mred
            framework
-           (lib "text-string-style-desc.ss" "mrlib"))
+           mrlib/text-string-style-desc)
   
   (provide run-test)
   
diff --git a/collects/tests/drscheme/tool.ss b/collects/tests/drscheme/tool.ss
index d35f6d0180..d627919c16 100644
--- a/collects/tests/drscheme/tool.ss
+++ b/collects/tests/drscheme/tool.ss
@@ -1,7 +1,7 @@
 ;; load this file as a tool to run the test suites
 
 (module tool mzscheme
-  (require (lib "tool.ss" "drscheme")
+  (require drscheme/tool
            mzlib/list
            mzlib/unit
            mzlib/class
@@ -36,7 +36,7 @@
                            (if (send bitmap ok?) bitmap "Console")
                            (get-button-panel)
                            (lambda (button evt) 
-                             (let ([ask-test-suite (dynamic-require '(lib "run-tests.ss" "tests" "drscheme")
+                             (let ([ask-test-suite (dynamic-require 'tests/drscheme/run-tests
                                                                     'ask-test-suite)])
                                (ask-test-suite this))))])
             (send (get-button-panel) change-children
diff --git a/collects/tests/framework/load.ss b/collects/tests/framework/load.ss
index 3f9f051788..4b37088d1a 100644
--- a/collects/tests/framework/load.ss
+++ b/collects/tests/framework/load.ss
@@ -46,5 +46,5 @@
                        (let-values ([(_1 eles _2 _3) (signature-members #'sig #'whatever)])
                          (with-syntax ([eles eles])
                            #''eles))])))
-           (eval '(require (lib "framework-sig.ss" "framework")))
+           (eval '(require framework/framework-sig))
            (eval '(for-each eval (signature->symbols framework^))))))
diff --git a/collects/tests/macro-debugger/tests/regression.ss b/collects/tests/macro-debugger/tests/regression.ss
index e483f25e90..258e34fd55 100644
--- a/collects/tests/macro-debugger/tests/regression.ss
+++ b/collects/tests/macro-debugger/tests/regression.ss
@@ -45,8 +45,8 @@
     (test-case "lift in module"
       (check-pred syntax?
                   (stx/hide-none
-                   (trace '(module m mzscheme 
-                             (require (lib "etc.ss"))
+                   (trace '(module m mzscheme
+                             (require mzlib/etc)
                              (define x (begin-lifted 1)))))))
 
     ;; Fixed 2/9/2007: defstx in brules misparsed & mishandled
diff --git a/collects/tests/macro-debugger/tests/syntax-errors.ss b/collects/tests/macro-debugger/tests/syntax-errors.ss
index 10b5fdbb99..57c972114a 100644
--- a/collects/tests/macro-debugger/tests/syntax-errors.ss
+++ b/collects/tests/macro-debugger/tests/syntax-errors.ss
@@ -18,9 +18,9 @@
            #:error-step)
    (testKE (#%require 5)
            #:error-step)
-   (testKE (#%require (prefix (lib "list.ss")))
+   (testKE (#%require (prefix mzlib/list))
            #:error-step)
-   (testKE (#%require (prefix 5 (lib "list.ss")))
+   (testKE (#%require (prefix 5 mzlib/list))
            #:error-step)]
   [#:suite
    "Definitions"
diff --git a/collects/tests/match/examples.ss b/collects/tests/match/examples.ss
index eecbe51a7d..d73706de1d 100644
--- a/collects/tests/match/examples.ss
+++ b/collects/tests/match/examples.ss
@@ -566,4 +566,4 @@
                     (list a b)))
 
 
-   ))
\ No newline at end of file
+   ))
diff --git a/collects/tests/match/match-tests.ss b/collects/tests/match/match-tests.ss
index b84d5ed267..e65d7fbb49 100644
--- a/collects/tests/match/match-tests.ss
+++ b/collects/tests/match/match-tests.ss
@@ -128,4 +128,4 @@
                      simple-tests
                      nonlinear-tests
                      match-expander-tests))
-  )
\ No newline at end of file
+  )
diff --git a/collects/tests/match/other-plt-tests.ss b/collects/tests/match/other-plt-tests.ss
index d890de22c2..dfa241117f 100644
--- a/collects/tests/match/other-plt-tests.ss
+++ b/collects/tests/match/other-plt-tests.ss
@@ -1,13 +1,13 @@
 (module other-plt-tests mzscheme
   
   (require (planet "test-compat2.ss" ("schematics" "schemeunit.plt" 2 10)))
-  (require (lib "uri-codec.ss" "net"))
-  (require (lib "pregexp.ss"))
+  (require net/uri-codec)
+  (require mzlib/pregexp)
   
   (require mzlib/plt-match)
   
-  (require (lib "list.ss")
-           (lib "etc.ss"))
+  (require mzlib/list
+           mzlib/etc)
   
   (define-struct shape (color))
   (define-struct (ovoid shape) (x-diam y-diam))
diff --git a/collects/tests/match/plt-match-tests.ss b/collects/tests/match/plt-match-tests.ss
index 8cb13f1c0d..d50f65f05c 100644
--- a/collects/tests/match/plt-match-tests.ss
+++ b/collects/tests/match/plt-match-tests.ss
@@ -230,4 +230,4 @@
 			    (= 0 (run-tests)))
 	      (error "Match Tests did not pass."))
       (run-tests))
-  )
\ No newline at end of file
+  )
diff --git a/collects/tests/mysterx/dhtmltests.ss b/collects/tests/mysterx/dhtmltests.ss
index 6fa741b017..eab77835eb 100644
--- a/collects/tests/mysterx/dhtmltests.ss
+++ b/collects/tests/mysterx/dhtmltests.ss
@@ -6,7 +6,7 @@
 (define insp (current-inspector))
 (current-inspector (make-inspector))
 
-(require (lib "mysterx.ss" "mysterx"))
+(require mysterx)
 
 (current-inspector insp)
 
diff --git a/collects/tests/mysterx/mystests.ss b/collects/tests/mysterx/mystests.ss
index a024fd1617..a309b2fd77 100644
--- a/collects/tests/mysterx/mystests.ss
+++ b/collects/tests/mysterx/mystests.ss
@@ -1,7 +1,7 @@
 ;;; mystests.ss -- test suite for MysterX
 
 (require mzlib/class)
-(require (lib "mysterx.ss" "mysterx"))
+(require mysterx)
 
 (define errors? #f)
 
diff --git a/collects/tests/mzcom/test.ss b/collects/tests/mzcom/test.ss
index 33b351f7a8..786656d3ce 100644
--- a/collects/tests/mzcom/test.ss
+++ b/collects/tests/mzcom/test.ss
@@ -1,7 +1,7 @@
 ; test.ss for MzCOM
 ; requires MysterX to be installed
 
-(require (lib "mysterx.ss" "mysterx"))
+(require mysterx)
 (define mzcom (cci/progid "MzCOM.MzObj"))
 
 (define num-errors 0)
diff --git a/collects/tests/mzscheme/benchmarks/common/mk-chicken.ss b/collects/tests/mzscheme/benchmarks/common/mk-chicken.ss
index c787234c2a..48dc8edc10 100644
--- a/collects/tests/mzscheme/benchmarks/common/mk-chicken.ss
+++ b/collects/tests/mzscheme/benchmarks/common/mk-chicken.ss
@@ -1,4 +1,4 @@
-(require (lib "mzlib/process.ss"))
+(require mzlib/process)
 
 (define name (vector-ref (current-command-line-arguments) 0))
 
diff --git a/collects/tests/mzscheme/benchmarks/common/mk-gambit.ss b/collects/tests/mzscheme/benchmarks/common/mk-gambit.ss
index 93d49c1cb4..addd829c80 100644
--- a/collects/tests/mzscheme/benchmarks/common/mk-gambit.ss
+++ b/collects/tests/mzscheme/benchmarks/common/mk-gambit.ss
@@ -1,5 +1,5 @@
 
-(require (lib "mzlib/process.ss"))
+(require mzlib/process)
 
 (define name (vector-ref (current-command-line-arguments) 0))
 
diff --git a/collects/tests/mzscheme/benchmarks/common/tabulate.ss b/collects/tests/mzscheme/benchmarks/common/tabulate.ss
index dd00e9cf4d..ce4d10a963 100755
--- a/collects/tests/mzscheme/benchmarks/common/tabulate.ss
+++ b/collects/tests/mzscheme/benchmarks/common/tabulate.ss
@@ -5,7 +5,7 @@ exec mzscheme -qu "$0" ${1+"$@"}
 
 (module tabulate mzscheme
   (require mzlib/list
-           (lib "xml.ss" "xml")
+           xml/xml
            mzlib/cmdline)
 
   (define base-link-filename (make-parameter #f))
diff --git a/collects/tests/mzscheme/cache-image-snip-test.ss b/collects/tests/mzscheme/cache-image-snip-test.ss
index a4465bd10d..3e74efb040 100644
--- a/collects/tests/mzscheme/cache-image-snip-test.ss
+++ b/collects/tests/mzscheme/cache-image-snip-test.ss
@@ -1,6 +1,6 @@
 (load-relative "loadtest.ss")
 
-(require (lib "cache-image-snip.ss" "mrlib")
+(require mrlib/cache-image-snip
          mzlib/unit)
 
 (invoke-unit
diff --git a/collects/tests/mzscheme/cover-teach.ss b/collects/tests/mzscheme/cover-teach.ss
index 97c4e91903..fd9c284212 100644
--- a/collects/tests/mzscheme/cover-teach.ss
+++ b/collects/tests/mzscheme/cover-teach.ss
@@ -7,10 +7,10 @@
 (when compiled?
   (rename-file-or-directory compiled-file saved-file))
 
-(require (lib "errortrace.ss" "errortrace"))
+(require errortrace)
 
 (execute-counts-enabled #t)
-(dynamic-require '(lib "teach.ss" "lang" "private") #f)
+(dynamic-require 'lang/private/teach #f)
 (execute-counts-enabled #f)
 
 (when compiled?
diff --git a/collects/tests/mzscheme/embed-me10.ss b/collects/tests/mzscheme/embed-me10.ss
index 807eb8705d..70360977d6 100644
--- a/collects/tests/mzscheme/embed-me10.ss
+++ b/collects/tests/mzscheme/embed-me10.ss
@@ -1,5 +1,5 @@
 (module embed-me10 mzscheme
-  (require (lib "mzssl.ss" "openssl"))
+  (require openssl/mzssl)
 
   (with-output-to-file "stdout"
     (lambda () 
diff --git a/collects/tests/mzscheme/embed-me6.ss b/collects/tests/mzscheme/embed-me6.ss
index 74ec1f8354..58a244aee1 100644
--- a/collects/tests/mzscheme/embed-me6.ss
+++ b/collects/tests/mzscheme/embed-me6.ss
@@ -3,6 +3,6 @@
     (lambda () 
       (printf "This is 6\n")
       (with-handlers ([void (lambda (exn) (printf "no etc.ss\n"))])
-	(printf "~a\n" (dynamic-require '(lib "etc.ss") 'true))))
+	(printf "~a\n" (dynamic-require 'mzlib/etc 'true))))
     'append))
 
diff --git a/collects/tests/mzscheme/htdp-image.ss b/collects/tests/mzscheme/htdp-image.ss
index 618f3a4173..03a429249e 100644
--- a/collects/tests/mzscheme/htdp-image.ss
+++ b/collects/tests/mzscheme/htdp-image.ss
@@ -1,11 +1,11 @@
 ;; Load this one with MrEd
 
 (load-relative "loadtest.ss")
-(require (lib "image.ss" "teachpack" "htdp")
+(require teachpack/htdp/image
          htdp/error
-         (lib "posn.ss" "lang")
+         lang/posn
          mzlib/list
-         (lib "imageeq.ss" "lang"))
+         lang/imageeq)
 
 (define-values (image-snip1 image-snip2)
   (let ()
@@ -1237,8 +1237,8 @@
 
 (parameterize ((current-namespace (make-base-namespace)))
   (err/rt-test
-    (eval '(module m (lib "htdp-beginner.ss" "lang")
-	     (require (lib "image.ss" "teachpack" "htdp")) overlay))
+    (eval '(module m lang/htdp-beginner
+	     (require teachpack/htdp/image) overlay))
     (lambda (exn)
       (regexp-match #rx"must be applied to arguments" 
 	(exn-message exn)))))
diff --git a/collects/tests/mzscheme/imap.ss b/collects/tests/mzscheme/imap.ss
index 4d30a63b20..58a5f54ac1 100644
--- a/collects/tests/mzscheme/imap.ss
+++ b/collects/tests/mzscheme/imap.ss
@@ -10,7 +10,7 @@
 
 (Section 'imap)
 
-(require (lib "mzssl.ss" "openssl")
+(require openssl/mzssl
 	 net/imap
 	 mzlib/etc)
 
diff --git a/collects/tests/mzscheme/openssl.ss b/collects/tests/mzscheme/openssl.ss
index c03128dce5..e3edce1044 100644
--- a/collects/tests/mzscheme/openssl.ss
+++ b/collects/tests/mzscheme/openssl.ss
@@ -3,7 +3,7 @@
 
 (Section 'openssl)
 
-(require (lib "mzssl.ss" "openssl"))
+(require openssl/mzssl)
 
 (define pem (build-path (collection-path "openssl")
 			"test.pem"))
diff --git a/collects/tests/mzscheme/pack.ss b/collects/tests/mzscheme/pack.ss
index b19933b305..89ae925772 100644
--- a/collects/tests/mzscheme/pack.ss
+++ b/collects/tests/mzscheme/pack.ss
@@ -6,8 +6,8 @@
 
 (Section 'pack)
 
-(require (lib "pack.ss" "setup")
-	 (lib "unpack.ss" "setup")
+(require setup/pack
+	 setup/unpack
 	 mzlib/process
 	 setup/dirs
 	 mzlib/file)
diff --git a/collects/tests/mzscheme/portlib.ss b/collects/tests/mzscheme/portlib.ss
index 809fdb3c11..fcb099c29d 100644
--- a/collects/tests/mzscheme/portlib.ss
+++ b/collects/tests/mzscheme/portlib.ss
@@ -5,7 +5,7 @@
 
 (define SLEEP-TIME 0.1)
 
-(require (lib "mzlib/port.ss"))
+(require mzlib/port)
 
 ;; ----------------------------------------
 
diff --git a/collects/tests/mzscheme/read.ss b/collects/tests/mzscheme/read.ss
index e983348101..7e1bb0a8ef 100644
--- a/collects/tests/mzscheme/read.ss
+++ b/collects/tests/mzscheme/read.ss
@@ -700,7 +700,7 @@
   (test a-special cadr v)
   (test b-special caddr v))
 
-(require (only-in (lib "mzlib/port.ss") [relocate-input-port relocate-input-port]))
+(require (only-in mzlib/port [relocate-input-port relocate-input-port]))
 (define (shift-port p count-lines? deltas)
   (let ([p (relocate-input-port p 
 				(add1 (car deltas))
diff --git a/collects/tests/mzscheme/readtable.ss b/collects/tests/mzscheme/readtable.ss
index d91e341d77..bff34f6643 100644
--- a/collects/tests/mzscheme/readtable.ss
+++ b/collects/tests/mzscheme/readtable.ss
@@ -3,7 +3,7 @@
 
 (Section 'readtable)
 
-(require (only-in (lib "mzlib/port.ss") 
+(require (only-in mzlib/port 
                   [relocate-input-port relocate-input-port]))
 (define (shift-rt-port p deltas)
   (let ([p (relocate-input-port p 
diff --git a/collects/tests/mzscheme/sandbox.ss b/collects/tests/mzscheme/sandbox.ss
index 040a587f28..26c1ed07fe 100644
--- a/collects/tests/mzscheme/sandbox.ss
+++ b/collects/tests/mzscheme/sandbox.ss
@@ -298,7 +298,7 @@
    (eq? (ev "6") (ev "(sub1 (* 2 3.5))"))
    (eq? (ev "6") (ev "(sub1 (* 2 x))"))
    --top--
-   (set! ev (make-evaluator 'mzscheme '((lib "list.ss")) '()))
+   (set! ev (make-evaluator 'mzscheme '(mzlib/list) '()))
    --eval--
    (last-pair '(1 2 3)) => '(3)
    (last-pair null) =err> "expected argument of type"
diff --git a/collects/tests/mzscheme/testing.ss b/collects/tests/mzscheme/testing.ss
index a5c0bc294d..318d9fdf8b 100644
--- a/collects/tests/mzscheme/testing.ss
+++ b/collects/tests/mzscheme/testing.ss
@@ -209,7 +209,7 @@ transcript.
     [(expr) (error-test expr exn:application:type?)]
     [(expr exn-type?) (thunk-error-test (lambda () (eval expr)) expr exn-type?)]))
 
-(require (only-in (lib "scheme") [lambda err:mz:lambda])) ; so err/rt-test works with beginner.ss
+(require (only-in scheme [lambda err:mz:lambda])) ; so err/rt-test works with beginner.ss
 (define-syntax err/rt-test
   (lambda (stx)
     (syntax-case stx ()
diff --git a/collects/tests/mzscheme/unit.ss b/collects/tests/mzscheme/unit.ss
index 7358951dec..27693082fd 100644
--- a/collects/tests/mzscheme/unit.ss
+++ b/collects/tests/mzscheme/unit.ss
@@ -2,7 +2,7 @@
 (load-relative "loadtest.ss")
 
 (Section 'unit)
-(require (lib "mzlib/unit200.ss"))
+(require mzlib/unit200)
 
 ;; Hide keywords from scheme/unit.ss:
 (define import #f)
diff --git a/collects/tests/mzscheme/unitsig.ss b/collects/tests/mzscheme/unitsig.ss
index 654fb2ec32..57b35390db 100644
--- a/collects/tests/mzscheme/unitsig.ss
+++ b/collects/tests/mzscheme/unitsig.ss
@@ -6,9 +6,9 @@
 (define export #f)
 (define link #f)
 
-(require (lib "mzlib/unit200.ss"))
-(require (lib "mzlib/unitsig200.ss"))
-(require (lib "mzlib/include.ss"))
+(require mzlib/unit200)
+(require mzlib/unitsig200)
+(require mzlib/include)
 
 (Section 'unit/sig)
 
diff --git a/collects/tests/plai/datatype-test.ss b/collects/tests/plai/datatype-test.ss
index 623495754f..904b89b0f4 100644
--- a/collects/tests/plai/datatype-test.ss
+++ b/collects/tests/plai/datatype-test.ss
@@ -1,6 +1,6 @@
 (module datatype-test mzscheme
-  (require (lib "datatype.ss" "plai")
-           (lib "test-harness.ss" "plai")
+  (require plai/datatype
+           plai/test-harness
            mzlib/contract)
   
   (print-tests 'stop)
diff --git a/collects/tests/profj/TestEngineTest.ss b/collects/tests/profj/TestEngineTest.ss
index 34efab5416..6a7d25f826 100644
--- a/collects/tests/profj/TestEngineTest.ss
+++ b/collects/tests/profj/TestEngineTest.ss
@@ -44,4 +44,4 @@
 (check-error (error 'test "hi") "test: hi")
 (check-error (/ 1 0) "/: division by zero")
 (check-error 3 "some message") ;fails
-(check-error (first empty) "another message") ;fails
\ No newline at end of file
+(check-error (first empty) "another message") ;fails
diff --git a/collects/tests/profj/profj-testing.ss b/collects/tests/profj/profj-testing.ss
index e788956b71..0591618a21 100644
--- a/collects/tests/profj/profj-testing.ss
+++ b/collects/tests/profj/profj-testing.ss
@@ -1,6 +1,6 @@
 (module profj-testing scheme
   
-  (require (lib "compile.ss" "profj")
+  (require profj/compile
            (lib "parameters.ss" "profj")
            (lib "display-java.ss" "profj")
            mzlib/class)
diff --git a/collects/tests/srfi/4/srfi-4-test.ss b/collects/tests/srfi/4/srfi-4-test.ss
index d019efec97..a80f888430 100644
--- a/collects/tests/srfi/4/srfi-4-test.ss
+++ b/collects/tests/srfi/4/srfi-4-test.ss
@@ -100,4 +100,4 @@
 
   (test/text-ui srfi-4-tests)
   
-  )
\ No newline at end of file
+  )
diff --git a/collects/tests/stepper/annotate-test.ss b/collects/tests/stepper/annotate-test.ss
index 37fa14708e..65b5a5b9a2 100644
--- a/collects/tests/stepper/annotate-test.ss
+++ b/collects/tests/stepper/annotate-test.ss
@@ -1,12 +1,12 @@
-(require (prefix annotate: (lib "annotate.ss" "stepper" "private")))
+(require (prefix annotate: stepper/private/annotate))
 (require (prefix kernel: syntax/kerncase))
-(require (lib "syncheck-debug.ss" "drscheme" "private"))
-(require (lib "marks.ss" "stepper" "private"))
+(require drscheme/private/syncheck-debug)
+(require stepper/private/marks)
 (require "tests-common.ss")
 
 (load "/Users/clements/plt/tests/mzscheme/testing.ss")
 
-(reset-namespaces) 
+(reset-namespaces)
 
 (SECTION 'stepper-annotater)
 
diff --git a/collects/tests/stepper/debugger-annotate-test.ss b/collects/tests/stepper/debugger-annotate-test.ss
index 98322cc1ef..1464ebeb24 100644
--- a/collects/tests/stepper/debugger-annotate-test.ss
+++ b/collects/tests/stepper/debugger-annotate-test.ss
@@ -1,5 +1,5 @@
 (module debugger-annotate-test mzscheme
 
-  (require (lib "private/debugger-annotate.ss" "stepper"))
+  (require stepper/private/debugger-annotate)
 
   )
diff --git a/collects/tests/stepper/reconstruct-test.ss b/collects/tests/stepper/reconstruct-test.ss
index cb9cae464e..38fc3e4813 100644
--- a/collects/tests/stepper/reconstruct-test.ss
+++ b/collects/tests/stepper/reconstruct-test.ss
@@ -1,11 +1,11 @@
-(require (prefix annotate: (lib "annotate.ss" "stepper" "private"))
+(require (prefix annotate: stepper/private/annotate)
          (prefix kernel: syntax/kerncase)
-         (prefix reconstruct: (lib "reconstruct.ss" "stepper" "private"))
-         (lib "shared.ss" "stepper" "private")
-         (lib "highlight-placeholder.ss" "stepper" "private")
-         (lib "my-macros.ss" "stepper" "private")
-         (lib "model-settings.ss" "stepper" "private")
-         (lib "marks.ss" "stepper" "private")
+         (prefix reconstruct: stepper/private/reconstruct)
+         stepper/private/shared
+         stepper/private/highlight-placeholder
+         stepper/private/my-macros
+         stepper/private/model-settings
+         stepper/private/marks
          mzlib/class
          mzlib/etc
          "tests-common.ss")
diff --git a/collects/tests/stepper/tests-common.ss b/collects/tests/stepper/tests-common.ss
index f9dfad58a3..4e53df189d 100644
--- a/collects/tests/stepper/tests-common.ss
+++ b/collects/tests/stepper/tests-common.ss
@@ -1,8 +1,8 @@
 (module tests-common mzscheme
   
-  (require (lib "private/annotate.ss" "stepper")
+  (require stepper/private/annotate
            mzlib/contract
-           (lib "shared.ss" "stepper" "private"))
+           stepper/private/shared)
   
   (provide/contract (reset-namespaces (-> void?))
                     (annotate-exprs (-> (listof syntax?) break-contract (listof syntax?)))
diff --git a/collects/tests/stepper/through-tests.ss b/collects/tests/stepper/through-tests.ss
index d57501b5c2..e2a909401d 100755
--- a/collects/tests/stepper/through-tests.ss
+++ b/collects/tests/stepper/through-tests.ss
@@ -16,8 +16,8 @@
            (only-in srfi/13 string-contains)
            ;; for xml testing:
            ;; mzlib/class
-           ;; (all-except (lib "xml-snipclass.ss" "xml") snip-class)
-           ;; (all-except (lib "scheme-snipclass.ss" "xml") snip-class)
+           ;; (all-except xml/xml-snipclass snip-class)
+           ;; (all-except xml/scheme-snipclass snip-class)
            ;; mred
            #;(file "/Users/clements/clements/scheme-scraps/eli-debug.ss")
            )
diff --git a/collects/tests/syntax-color/paren-tree.ss b/collects/tests/syntax-color/paren-tree.ss
index dfb7dc1663..44befb9041 100644
--- a/collects/tests/syntax-color/paren-tree.ss
+++ b/collects/tests/syntax-color/paren-tree.ss
@@ -1,6 +1,6 @@
 (load-relative "../mzscheme/loadtest.ss")
 (require mzlib/class
-         (lib "paren-tree.ss" "syntax-color"))
+         syntax-color/paren-tree)
 
 (define t (new paren-tree% (matches '((|(| |)|)
                                       (|[| |]|)))))
diff --git a/collects/tests/syntax-color/scheme-lexer.ss b/collects/tests/syntax-color/scheme-lexer.ss
index 7f3f6ebfa2..afd6f07f8c 100644
--- a/collects/tests/syntax-color/scheme-lexer.ss
+++ b/collects/tests/syntax-color/scheme-lexer.ss
@@ -6,7 +6,7 @@
 ;;  Honu (#hx, #sx, #honu)
 ;;  #reader
 
-(require (lib "scheme-lexer.ss" "syntax-color"))
+(require syntax-color/scheme-lexer)
 
 (define (char kind)
   (case kind
diff --git a/collects/tests/syntax-color/token-tree.ss b/collects/tests/syntax-color/token-tree.ss
index 1e0657ea68..1f76b8bd0f 100644
--- a/collects/tests/syntax-color/token-tree.ss
+++ b/collects/tests/syntax-color/token-tree.ss
@@ -1,6 +1,6 @@
 (load-relative "../mzscheme/loadtest.ss")
 (require mzlib/class
-         (lib "token-tree.ss" "syntax-color"))
+         syntax-color/token-tree)
 
 (define t (new token-tree% (length 1) (data 'a)))
 
diff --git a/collects/tests/typed-scheme/660-examples/support.ss b/collects/tests/typed-scheme/660-examples/support.ss
index 22dd376fd3..e1af9b4e3d 100644
--- a/collects/tests/typed-scheme/660-examples/support.ss
+++ b/collects/tests/typed-scheme/660-examples/support.ss
@@ -18,4 +18,4 @@
   #;(define: (list-of [f : (Any -> Any)]) : Any
     (lambda: ([l : List]) (andmap f l)))
   
-  )
\ No newline at end of file
+  )
diff --git a/collects/tests/typed-scheme/fail/back-and-forth.ss b/collects/tests/typed-scheme/fail/back-and-forth.ss
index 3144b9a34a..e8548984a9 100644
--- a/collects/tests/typed-scheme/fail/back-and-forth.ss
+++ b/collects/tests/typed-scheme/fail/back-and-forth.ss
@@ -15,4 +15,4 @@
 (module o typed-scheme
   (require 'n))
 
-(require 'o)
\ No newline at end of file
+(require 'o)
diff --git a/collects/tests/typed-scheme/fail/bad-type-app.ss b/collects/tests/typed-scheme/fail/bad-type-app.ss
index 581e73e59f..3af92cbbc4 100644
--- a/collects/tests/typed-scheme/fail/bad-type-app.ss
+++ b/collects/tests/typed-scheme/fail/bad-type-app.ss
@@ -12,4 +12,4 @@
 (define-typed-struct (type-un   type) ([cases : (Listof type)])               #:transparent)
 (define-typed-struct (type-vals type) ([elems : (Listof type)])               #:transparent)
 
-(define-typed-struct (type-poly type) ([vars  : (Listof (U (type-dots type-var) type-var))]))
\ No newline at end of file
+(define-typed-struct (type-poly type) ([vars  : (Listof (U (type-dots type-var) type-var))]))
diff --git a/collects/tests/typed-scheme/fail/box-fail.ss b/collects/tests/typed-scheme/fail/box-fail.ss
index c1f45c60c8..4d53f3ef53 100644
--- a/collects/tests/typed-scheme/fail/box-fail.ss
+++ b/collects/tests/typed-scheme/fail/box-fail.ss
@@ -5,4 +5,4 @@
 (let ()
   (: x (Boxof Number))
   (define x (box "foo"))
-  x)
\ No newline at end of file
+  x)
diff --git a/collects/tests/typed-scheme/fail/cnt-err1.ss b/collects/tests/typed-scheme/fail/cnt-err1.ss
index fa236bc823..40c3ca3bd8 100644
--- a/collects/tests/typed-scheme/fail/cnt-err1.ss
+++ b/collects/tests/typed-scheme/fail/cnt-err1.ss
@@ -25,4 +25,4 @@
 
 (require 'client)
 
-(try-it #t)
\ No newline at end of file
+(try-it #t)
diff --git a/collects/tests/typed-scheme/fail/pr9053-fail.ss b/collects/tests/typed-scheme/fail/pr9053-fail.ss
index 7686350522..93c513b0e6 100644
--- a/collects/tests/typed-scheme/fail/pr9053-fail.ss
+++ b/collects/tests/typed-scheme/fail/pr9053-fail.ss
@@ -16,4 +16,4 @@
   (require-typed-struct term ([posn : Number]) 'source)
   (require-typed-struct (var term) (
                              [id : Symbol])
-                        'source))
\ No newline at end of file
+                        'source))
diff --git a/collects/tests/typed-scheme/fail/set-tests.ss b/collects/tests/typed-scheme/fail/set-tests.ss
index bd359d0404..13f99b1df4 100644
--- a/collects/tests/typed-scheme/fail/set-tests.ss
+++ b/collects/tests/typed-scheme/fail/set-tests.ss
@@ -6,4 +6,3 @@
 	(f : (-> Void) (lambda () (set! x (quote foo)))))
        (if (number? x) (begin (f) (add1 x)) 12))
 
- 
\ No newline at end of file
diff --git a/collects/tests/typed-scheme/succeed/apply-append.ss b/collects/tests/typed-scheme/succeed/apply-append.ss
index 9393072675..fc99651732 100644
--- a/collects/tests/typed-scheme/succeed/apply-append.ss
+++ b/collects/tests/typed-scheme/succeed/apply-append.ss
@@ -1,4 +1,4 @@
 #lang typed-scheme
 
 (apply append '((1 2 3) (4 5 6)))
-(apply append (list (list 1 2 3) (list 4 5 6)))
\ No newline at end of file
+(apply append (list (list 1 2 3) (list 4 5 6)))
diff --git a/collects/tests/typed-scheme/succeed/bad-map-infer.ss b/collects/tests/typed-scheme/succeed/bad-map-infer.ss
index 9ce634cb66..6e9a97d7f8 100644
--- a/collects/tests/typed-scheme/succeed/bad-map-infer.ss
+++ b/collects/tests/typed-scheme/succeed/bad-map-infer.ss
@@ -2,4 +2,4 @@
 
 (: cross1 ((Listof Number) -> (Listof Number)))
 (define (cross1 m)
-  (map (lambda: ([m1 : Number]) #{(error 'bad) :: Number}) m))
\ No newline at end of file
+  (map (lambda: ([m1 : Number]) #{(error 'bad) :: Number}) m))
diff --git a/collects/tests/typed-scheme/succeed/basic-tests.ss b/collects/tests/typed-scheme/succeed/basic-tests.ss
index 8ca4f27a04..3413470e8e 100644
--- a/collects/tests/typed-scheme/succeed/basic-tests.ss
+++ b/collects/tests/typed-scheme/succeed/basic-tests.ss
@@ -1,7 +1,7 @@
 #lang typed-scheme
 ;;syntax-only requires
-(require (only-in (lib "etc.ss") let+))
-(require (only-in (lib "match.ss") match))
+(require (only-in mzlib/etc let+))
+(require (only-in mzlib/match match))
 
 (define-type-alias number Number)
 (define-type-alias boolean Boolean)
diff --git a/collects/tests/typed-scheme/succeed/box-num.ss b/collects/tests/typed-scheme/succeed/box-num.ss
index 5cf003e426..c0e3742820 100644
--- a/collects/tests/typed-scheme/succeed/box-num.ss
+++ b/collects/tests/typed-scheme/succeed/box-num.ss
@@ -5,4 +5,4 @@
 (let ()
   (: x (Boxof Number))
   (define x (box 1))
-  x)
\ No newline at end of file
+  x)
diff --git a/collects/tests/typed-scheme/succeed/broken-let-syntax.ss b/collects/tests/typed-scheme/succeed/broken-let-syntax.ss
index 4fd593c954..1817b32e37 100644
--- a/collects/tests/typed-scheme/succeed/broken-let-syntax.ss
+++ b/collects/tests/typed-scheme/succeed/broken-let-syntax.ss
@@ -4,5 +4,3 @@
       (let-syntax ([m (syntax-rules ()
 			[(_) x])])
 	(m)))
-  
-  
\ No newline at end of file
diff --git a/collects/tests/typed-scheme/succeed/int-def-colon.ss b/collects/tests/typed-scheme/succeed/int-def-colon.ss
index 991b709c74..b74ff402b4 100644
--- a/collects/tests/typed-scheme/succeed/int-def-colon.ss
+++ b/collects/tests/typed-scheme/succeed/int-def-colon.ss
@@ -7,4 +7,4 @@
  (: loop (Int -> Int))
  (define (loop x)
    (loop x))
- (loop 0))
\ No newline at end of file
+ (loop 0))
diff --git a/collects/tests/typed-scheme/succeed/leftist-heap.ss b/collects/tests/typed-scheme/succeed/leftist-heap.ss
index 81651f7c45..0423a4a3e5 100644
--- a/collects/tests/typed-scheme/succeed/leftist-heap.ss
+++ b/collects/tests/typed-scheme/succeed/leftist-heap.ss
@@ -34,10 +34,10 @@
 (define-type-alias top Any)
 (define-type-alias list-of Listof)
 (require 
-   (except-in (lib "67.ss" "srfi") current-compare =? <?)
+   (except-in srfi/67 current-compare =? <?)
    #;"typed-list.ss"
-   #;(lib "42.ss" "srfi")
-   #;(only (lib "list.ss") foldl))
+   #;srfi/42
+   #;(only mzlib/list foldl))
     
   #;(provide (all-defined))
   (provide comparator Heap elements empty fold heap-node? find-min empty? insert insert* delete-min size union)
@@ -48,9 +48,9 @@
   
   ;; fixme - type aliases should work in require
   
-  (require/typed current-compare (-> (top top -> number)) (lib "67.ss" "srfi"))
-  (require/typed =? ((top top -> number) top top -> boolean) (lib "67.ss" "srfi"))
-  (require/typed <? ((top top -> number) top top -> boolean) (lib "67.ss" "srfi"))
+  (require/typed current-compare (-> (top top -> number)) srfi/67)
+  (require/typed =? ((top top -> number) top top -> boolean) srfi/67)
+  (require/typed <? ((top top -> number) top top -> boolean) srfi/67)
   
   ;;; DATA DEFINITION
   
diff --git a/collects/tests/typed-scheme/succeed/list-ref-vec.ss b/collects/tests/typed-scheme/succeed/list-ref-vec.ss
index a602f90349..56b4d30d26 100644
--- a/collects/tests/typed-scheme/succeed/list-ref-vec.ss
+++ b/collects/tests/typed-scheme/succeed/list-ref-vec.ss
@@ -3,4 +3,4 @@
 (: x : (Listof (Vectorof Integer)))
 (define x (list (vector 1 2 3)))
 
-(list-ref x 0)
\ No newline at end of file
+(list-ref x 0)
diff --git a/collects/tests/typed-scheme/succeed/little-schemer.ss b/collects/tests/typed-scheme/succeed/little-schemer.ss
index d363763f87..24f453e79a 100644
--- a/collects/tests/typed-scheme/succeed/little-schemer.ss
+++ b/collects/tests/typed-scheme/succeed/little-schemer.ss
@@ -1,7 +1,7 @@
 #lang typed-scheme  
-#;(require (lib "etc.ss"))
+#;(require mzlib/etc)
 #;(require "prims.ss")
-(require (lib "match.ss")
+(require mzlib/match
          (for-syntax scheme/base))
 
 (define-type-alias number Number)
diff --git a/collects/tests/typed-scheme/succeed/manual-examples.ss b/collects/tests/typed-scheme/succeed/manual-examples.ss
index 47e60d8d2c..5c6f973157 100644
--- a/collects/tests/typed-scheme/succeed/manual-examples.ss
+++ b/collects/tests/typed-scheme/succeed/manual-examples.ss
@@ -71,4 +71,3 @@
     (cond [(null? l) (make-Nothing)]
           [(= v (car l)) (make-Just v)]
           [else (find v (cdr l))])))
-  
\ No newline at end of file
diff --git a/collects/tests/typed-scheme/succeed/map1.ss b/collects/tests/typed-scheme/succeed/map1.ss
index 6d6a9d991c..5c4e67a0d7 100644
--- a/collects/tests/typed-scheme/succeed/map1.ss
+++ b/collects/tests/typed-scheme/succeed/map1.ss
@@ -3,4 +3,4 @@
 (: f ((U String Number) -> Void))
 (define (f x) (void))
 
-(map f (list 1 2 3))
\ No newline at end of file
+(map f (list 1 2 3))
diff --git a/collects/tests/typed-scheme/succeed/map2.ss b/collects/tests/typed-scheme/succeed/map2.ss
index fa95e5ad72..f82a06a19d 100644
--- a/collects/tests/typed-scheme/succeed/map2.ss
+++ b/collects/tests/typed-scheme/succeed/map2.ss
@@ -1,4 +1,4 @@
 #lang typed-scheme 
 
 (map add1 #{(list 1 2 3) :: (Listof Integer)})
-(map add1 #{(list 1 2 3) :: (Listof Number)})
\ No newline at end of file
+(map add1 #{(list 1 2 3) :: (Listof Number)})
diff --git a/collects/tests/typed-scheme/succeed/match-expander-problem.ss b/collects/tests/typed-scheme/succeed/match-expander-problem.ss
index c26e3fbc85..dd563dfc71 100644
--- a/collects/tests/typed-scheme/succeed/match-expander-problem.ss
+++ b/collects/tests/typed-scheme/succeed/match-expander-problem.ss
@@ -1,8 +1,8 @@
 #lang typed-scheme
 
-#;(require (lib "etc.ss"))
+#;(require mzlib/etc)
 ;(require "prims.ss")
-(require (lib "match.ss"))
+(require mzlib/match)
 
 (define-typed-struct pt ([x : Number] [y : Number]))
 
diff --git a/collects/tests/typed-scheme/succeed/match.ss b/collects/tests/typed-scheme/succeed/match.ss
index 741027590b..b103770a32 100644
--- a/collects/tests/typed-scheme/succeed/match.ss
+++ b/collects/tests/typed-scheme/succeed/match.ss
@@ -4,4 +4,4 @@
 
 (match 1
   [2 3]
-  [x 4])
\ No newline at end of file
+  [x 4])
diff --git a/collects/tests/typed-scheme/succeed/metrics.ss b/collects/tests/typed-scheme/succeed/metrics.ss
index 150261abaa..5e6d2eb0b9 100644
--- a/collects/tests/typed-scheme/succeed/metrics.ss
+++ b/collects/tests/typed-scheme/succeed/metrics.ss
@@ -16,13 +16,13 @@
 (require/typed explode-path (Path -> (Listof Path)) (lib "file.ss"))
 (require/typed srfi48::format (Port String String top .. -> top)  "patch.ss")
 ;; FIXME - prefix
-#;(require/typed srfi48:format ( Port String String top .. -> top) (prefix-in srfi48: (lib "48.ss" "srfi")))
-(require (lib "match.ss")
-         ;(lib "file.ss")
-         ;(lib "list.ss")
-         ;(lib "etc.ss")
-         (prefix-in srfi13: (lib "13.ss" "srfi"))
-         ;(prefix srfi48: (lib "48.ss" "srfi"))
+#;(require/typed srfi48:format ( Port String String top .. -> top) (prefix-in srfi48: srfi/48))
+(require mzlib/match
+         ;mzlib/file
+         ;mzlib/list
+         ;mzlib/etc
+         (prefix-in srfi13: srfi/13)
+         ;(prefix srfi48: srfi/48)
          )
 
 (define-type-alias Sexpr Any)
diff --git a/collects/tests/typed-scheme/succeed/param.ss b/collects/tests/typed-scheme/succeed/param.ss
index 80633fbb94..e149b2c3a2 100644
--- a/collects/tests/typed-scheme/succeed/param.ss
+++ b/collects/tests/typed-scheme/succeed/param.ss
@@ -2,4 +2,4 @@
 
 (parameterize ([current-directory ".."])
   (current-directory)
-  (current-directory ".."))
\ No newline at end of file
+  (current-directory ".."))
diff --git a/collects/tests/typed-scheme/succeed/patch.ss b/collects/tests/typed-scheme/succeed/patch.ss
index c4d18dc0f5..4dc7c76342 100644
--- a/collects/tests/typed-scheme/succeed/patch.ss
+++ b/collects/tests/typed-scheme/succeed/patch.ss
@@ -1,3 +1,3 @@
 (module patch scheme
   (define srfi48::format format)
-  (provide srfi48::format))
\ No newline at end of file
+  (provide srfi48::format))
diff --git a/collects/tests/typed-scheme/succeed/pr9046.ss b/collects/tests/typed-scheme/succeed/pr9046.ss
index 1385769921..6bfa62b58a 100644
--- a/collects/tests/typed-scheme/succeed/pr9046.ss
+++ b/collects/tests/typed-scheme/succeed/pr9046.ss
@@ -8,4 +8,4 @@
 
 (module foo typed-scheme
 
-  (require/opaque-type Srcloc s:srcloc? 'srcloc))
\ No newline at end of file
+  (require/opaque-type Srcloc s:srcloc? 'srcloc))
diff --git a/collects/tests/typed-scheme/succeed/pr9048.ss b/collects/tests/typed-scheme/succeed/pr9048.ss
index 412121e7e3..d2c8fdcfb3 100644
--- a/collects/tests/typed-scheme/succeed/pr9048.ss
+++ b/collects/tests/typed-scheme/succeed/pr9048.ss
@@ -2,7 +2,7 @@
 
 (module source mzscheme
 
-    (require (lib "contract.ss"))
+    (require mzlib/contract)
 
     (define-struct ast (loc))
 
@@ -11,4 +11,4 @@
 
 (module client typed-scheme
   
-  (require-typed-struct ast ([loc : Any]) 'source))
\ No newline at end of file
+  (require-typed-struct ast ([loc : Any]) 'source))
diff --git a/collects/tests/typed-scheme/succeed/pr9053.ss b/collects/tests/typed-scheme/succeed/pr9053.ss
index f66df690b6..27d4d4211f 100644
--- a/collects/tests/typed-scheme/succeed/pr9053.ss
+++ b/collects/tests/typed-scheme/succeed/pr9053.ss
@@ -14,4 +14,4 @@
   (require-typed-struct term ([posn : Number]) 'source)
   (require-typed-struct var (
                              [id : Symbol])
-                        'source))
\ No newline at end of file
+                        'source))
diff --git a/collects/tests/typed-scheme/succeed/pr9054.ss b/collects/tests/typed-scheme/succeed/pr9054.ss
index cee0aa2979..ed1ea61fe8 100644
--- a/collects/tests/typed-scheme/succeed/pr9054.ss
+++ b/collects/tests/typed-scheme/succeed/pr9054.ss
@@ -13,4 +13,4 @@
  
   (define-type-alias Srcloc Any)
  
-  (require-typed-struct term ([posn : Srcloc]) 'source))
\ No newline at end of file
+  (require-typed-struct term ([posn : Srcloc]) 'source))
diff --git a/collects/tests/typed-scheme/succeed/provide-struct.ss b/collects/tests/typed-scheme/succeed/provide-struct.ss
index ad29cb5244..278bca7450 100644
--- a/collects/tests/typed-scheme/succeed/provide-struct.ss
+++ b/collects/tests/typed-scheme/succeed/provide-struct.ss
@@ -13,4 +13,4 @@
   (m:foo (m:make-x 1 #f))
   m:x?)
 
-(require 'n)
\ No newline at end of file
+(require 'n)
diff --git a/collects/tests/typed-scheme/succeed/provide-syntax.ss b/collects/tests/typed-scheme/succeed/provide-syntax.ss
index ba99a6ed9e..057a42664b 100644
--- a/collects/tests/typed-scheme/succeed/provide-syntax.ss
+++ b/collects/tests/typed-scheme/succeed/provide-syntax.ss
@@ -2,4 +2,4 @@
 
 (define-syntax-rule (foo) 1)
 
-(provide foo)
\ No newline at end of file
+(provide foo)
diff --git a/collects/tests/typed-scheme/succeed/random-bits.ss b/collects/tests/typed-scheme/succeed/random-bits.ss
index 094cb2f471..725d7e5a88 100644
--- a/collects/tests/typed-scheme/succeed/random-bits.ss
+++ b/collects/tests/typed-scheme/succeed/random-bits.ss
@@ -11,14 +11,14 @@
 ; 3. The non-generic parts (record type, time, error) are here.
 ;
 ; load the module with
-;   (require (lib "random-bits.ss" "srfi"))
+;   (require srfi/random-bits)
 ;
 ; history of this file:
 ;   SE, 17-May-2003: initial version
 
 (module random-bits typed-scheme
-  #;(require (lib "9.ss" "srfi"))
-  #;(require (lib "23.ss" "srfi"))
+  #;(require srfi/9)
+  #;(require srfi/23)
 
   (provide 
    random-integer random-real default-random-source
diff --git a/collects/tests/typed-scheme/succeed/require-poly.ss b/collects/tests/typed-scheme/succeed/require-poly.ss
index 5c12f98fb1..68f90fc92c 100644
--- a/collects/tests/typed-scheme/succeed/require-poly.ss
+++ b/collects/tests/typed-scheme/succeed/require-poly.ss
@@ -1,3 +1,3 @@
 #lang typed-scheme
 
-(require "simple-poly.ss")
\ No newline at end of file
+(require "simple-poly.ss")
diff --git a/collects/tests/typed-scheme/succeed/require-tests.ss b/collects/tests/typed-scheme/succeed/require-tests.ss
index 50f16b0b8c..692278f503 100644
--- a/collects/tests/typed-scheme/succeed/require-tests.ss
+++ b/collects/tests/typed-scheme/succeed/require-tests.ss
@@ -8,4 +8,4 @@
 (module trequire typed-scheme
   (require 'bang-tests)
   (define: y : Number x)
-  (display y))
\ No newline at end of file
+  (display y))
diff --git a/collects/tests/typed-scheme/succeed/seasoned-schemer.ss b/collects/tests/typed-scheme/succeed/seasoned-schemer.ss
index 361ff9ff18..3c52ea0125 100644
--- a/collects/tests/typed-scheme/succeed/seasoned-schemer.ss
+++ b/collects/tests/typed-scheme/succeed/seasoned-schemer.ss
@@ -1,7 +1,7 @@
 #lang typed-scheme  
-#;(require (lib "etc.ss"))
+#;(require mzlib/etc)
 #;(require "prims.ss")
-(require (lib "match.ss"))
+(require mzlib/match)
 
 (define-type-alias number Number)
 (define-type-alias boolean Boolean)
diff --git a/collects/tests/typed-scheme/succeed/simple-poly.ss b/collects/tests/typed-scheme/succeed/simple-poly.ss
index d4e8db726b..e52545f1f4 100644
--- a/collects/tests/typed-scheme/succeed/simple-poly.ss
+++ b/collects/tests/typed-scheme/succeed/simple-poly.ss
@@ -2,4 +2,4 @@
   (: f (All (a) (a -> a)))
   (define (f x) x)
   (define: z : Any 2)
-  (provide f))
\ No newline at end of file
+  (provide f))
diff --git a/collects/tests/typed-scheme/succeed/string-const.ss b/collects/tests/typed-scheme/succeed/string-const.ss
index 39354bc72a..9437ae1437 100644
--- a/collects/tests/typed-scheme/succeed/string-const.ss
+++ b/collects/tests/typed-scheme/succeed/string-const.ss
@@ -2,4 +2,4 @@
 
 (require string-constants/string-constant)
 
-(string-constant cancel)
\ No newline at end of file
+(string-constant cancel)
diff --git a/collects/tests/typed-scheme/succeed/struct-cert.ss b/collects/tests/typed-scheme/succeed/struct-cert.ss
index f0317d1a53..0cd05d156c 100644
--- a/collects/tests/typed-scheme/succeed/struct-cert.ss
+++ b/collects/tests/typed-scheme/succeed/struct-cert.ss
@@ -13,4 +13,4 @@
   ;; Comment out the below and it works fine.
   (provide (all-defined-out)))
 
-(require 'broken)
\ No newline at end of file
+(require 'broken)
diff --git a/collects/tests/typed-scheme/succeed/struct-exec.ss b/collects/tests/typed-scheme/succeed/struct-exec.ss
index 01e1dd8239..23fb3d0641 100644
--- a/collects/tests/typed-scheme/succeed/struct-exec.ss
+++ b/collects/tests/typed-scheme/succeed/struct-exec.ss
@@ -1,4 +1,3 @@
 #lang typed-scheme
 (define-typed-struct/exec X ([a : Number] [b : Boolean]) [(lambda: ([x : X]) (+ 3 )) : (X -> Number)])
 ((make-X 1 #f))
-  
\ No newline at end of file
diff --git a/collects/tests/typed-scheme/succeed/typeann-letrec.ss b/collects/tests/typed-scheme/succeed/typeann-letrec.ss
index ed6a4d655d..3a56eb16ce 100644
--- a/collects/tests/typed-scheme/succeed/typeann-letrec.ss
+++ b/collects/tests/typed-scheme/succeed/typeann-letrec.ss
@@ -2,4 +2,4 @@
 
 (letrec-syntaxes+values () ([(#{x : Number}) (values 1)]) #{(vector x) :: (Vectorof Number)})
 (letrec-values ([(#{x : Number}) (values 1)]) #{(vector x) :: (Vectorof Number)})
-(letrec ([#{x : Number} (values 1)]) #{(vector x) :: (Vectorof Number)})
\ No newline at end of file
+(letrec ([#{x : Number} (values 1)]) #{(vector x) :: (Vectorof Number)})
diff --git a/collects/tests/typed-scheme/unit-tests/new-fv-tests.ss b/collects/tests/typed-scheme/unit-tests/new-fv-tests.ss
index fe53582b39..7e24d23ca2 100644
--- a/collects/tests/typed-scheme/unit-tests/new-fv-tests.ss
+++ b/collects/tests/typed-scheme/unit-tests/new-fv-tests.ss
@@ -96,7 +96,6 @@
                     (check-not-false (subtype p d)))))
   
   (define-go fv-tests meet-join-tests)
-  
-  
-  
-  )
\ No newline at end of file
+
+
+  )
diff --git a/collects/tests/units/test-runtime.ss b/collects/tests/units/test-runtime.ss
index b90d56cd2e..6ca24e944b 100644
--- a/collects/tests/units/test-runtime.ss
+++ b/collects/tests/units/test-runtime.ss
@@ -1,5 +1,5 @@
 (require "test-harness.ss"
-         (lib "unit-runtime.ss" "mzlib" "private"))
+         mzlib/private/unit-runtime)
 
 ;; check-unit
 (test-runtime-error exn:fail:contract? "check-unit: not a unit"
diff --git a/collects/tests/units/test-unit-compiletime.ss b/collects/tests/units/test-unit-compiletime.ss
index 7d29f20850..3584b2e337 100644
--- a/collects/tests/units/test-unit-compiletime.ss
+++ b/collects/tests/units/test-unit-compiletime.ss
@@ -1,9 +1,9 @@
-(require (for-syntax (lib "unit-compiletime.ss" "mzlib" "private")
-                     (lib "unit-syntax.ss" "mzlib" "private")))
+(require (for-syntax mzlib/private/unit-compiletime
+                     mzlib/private/unit-syntax))
 (require "test-harness.ss"
-         (lib "unit-compiletime.ss" "mzlib" "private")
-         (lib "unit-keywords.ss" "mzlib" "private")
-         (lib "unit-syntax.ss" "mzlib" "private"))
+         mzlib/private/unit-compiletime
+         mzlib/private/unit-keywords
+         mzlib/private/unit-syntax)
 
 
 ;; split-requires
diff --git a/collects/tests/units/test-unit-syntax.ss b/collects/tests/units/test-unit-syntax.ss
index 0eb475de22..c91bd56d20 100644
--- a/collects/tests/units/test-unit-syntax.ss
+++ b/collects/tests/units/test-unit-syntax.ss
@@ -1,6 +1,6 @@
 (require "test-harness.ss"
          ;unit-syntax
-         (lib "unit-syntax.ss" "mzlib" "private")
+         mzlib/private/unit-syntax
 	 )
 
  ;; check-id
diff --git a/collects/tests/units/test-unit.ss b/collects/tests/units/test-unit.ss
index e1c2ac2f2d..b02dd94937 100644
--- a/collects/tests/units/test-unit.ss
+++ b/collects/tests/units/test-unit.ss
@@ -1,5 +1,5 @@
-(require (for-syntax (lib "unit-compiletime.ss" "mzlib" "private")
-                     (lib "unit-syntax.ss" "mzlib" "private")))
+(require (for-syntax mzlib/private/unit-compiletime
+                     mzlib/private/unit-syntax))
 (require "test-harness.ss"
          ;unit
          scheme/unit)
diff --git a/collects/tests/utils/sexp-diff.ss b/collects/tests/utils/sexp-diff.ss
index bc340e07f5..e37d2fc909 100644
--- a/collects/tests/utils/sexp-diff.ss
+++ b/collects/tests/utils/sexp-diff.ss
@@ -1,5 +1,5 @@
 (module sexp-diff mzscheme
-  (require (lib "mz-testing.ss" "tests" "utils"))
+  (require tests/utils/mz-testing)
 
   (define-syntax (test-begin stx)
     (syntax-case stx ()
diff --git a/collects/tests/web-server/build-plt.ss b/collects/tests/web-server/build-plt.ss
index 17a916c534..b8ec1fa065 100644
--- a/collects/tests/web-server/build-plt.ss
+++ b/collects/tests/web-server/build-plt.ss
@@ -1,5 +1,5 @@
 (module build-plt mzscheme
-  (require (lib "pack.ss" "setup")
+  (require setup/pack
            mzlib/date
            "suite.ss")
   
diff --git a/collects/tests/web-server/new/pr7823.ss b/collects/tests/web-server/new/pr7823.ss
index 48cdb06731..668784742c 100644
--- a/collects/tests/web-server/new/pr7823.ss
+++ b/collects/tests/web-server/new/pr7823.ss
@@ -1,5 +1,5 @@
 (module pr7823 mzscheme
-  (require (lib "response-structs.ss" "web-server"))
+  (require web-server/response-structs)
   
   (define x (make-response/full
              200 "OK" (current-seconds) #"text/html" '()
diff --git a/collects/tests/web-server/scheme-units/assertions.ss b/collects/tests/web-server/scheme-units/assertions.ss
index 603075f486..dde3e5ea95 100644
--- a/collects/tests/web-server/scheme-units/assertions.ss
+++ b/collects/tests/web-server/scheme-units/assertions.ss
@@ -1,9 +1,9 @@
 ;; Mike Burns, July 8th, 2004, netgeek@speakeasy.net
 ;; Useful assertions
 (module assertions mzscheme
-  (require (lib "test.ss" "schemeunit")
-           (lib "web-server.ss" "web-server")
-           (lib "configuration.ss" "web-server")
+  (require schemeunit/test
+           web-server/web-server
+           web-server/configuration
            net/url
            net/head
            mzlib/contract)
diff --git a/collects/tests/web-server/scheme-units/test-authentication.ss b/collects/tests/web-server/scheme-units/test-authentication.ss
index a73c60dfd6..cdfba7a71c 100644
--- a/collects/tests/web-server/scheme-units/test-authentication.ss
+++ b/collects/tests/web-server/scheme-units/test-authentication.ss
@@ -2,7 +2,7 @@
 ;; Test serving files that require authentication.
 (module test-authentication mzscheme
   (require mzlib/contract
-           (lib "test.ss" "schemeunit")
+           schemeunit/test
            net/url
            net/head
            net/base64
diff --git a/collects/tests/web-server/scheme-units/test-channel.ss b/collects/tests/web-server/scheme-units/test-channel.ss
index 4c960d7e04..20d5470ab6 100644
--- a/collects/tests/web-server/scheme-units/test-channel.ss
+++ b/collects/tests/web-server/scheme-units/test-channel.ss
@@ -1,8 +1,8 @@
 ;; Mike Burns, July 8th, 2004, netgeek@speakeasy.net
 ;; Test async-channel:
 (module test-channel mzscheme
-  (require (lib "test.ss" "schemeunit")
-           (lib "channel.ss" "web-server"))
+  (require schemeunit/test
+           web-server/channel)
 
   (provide test-channel)
 
diff --git a/collects/tests/web-server/scheme-units/test-errors.ss b/collects/tests/web-server/scheme-units/test-errors.ss
index 15ca97f44e..5ac0cf9e96 100644
--- a/collects/tests/web-server/scheme-units/test-errors.ss
+++ b/collects/tests/web-server/scheme-units/test-errors.ss
@@ -1,7 +1,7 @@
 ;; Mike Burns, July 28th, 2004, netgeek@speakeasy.net
 ;; Test the error messages for both headers and content.
 (module test-errors mzscheme
-  (require (lib "test.ss" "schemeunit")
+  (require schemeunit/test
            net/url
            "assertions.ss"
            )
diff --git a/collects/tests/web-server/scheme-units/test-serve-static-html.ss b/collects/tests/web-server/scheme-units/test-serve-static-html.ss
index 3d4024d0d6..462377869c 100644
--- a/collects/tests/web-server/scheme-units/test-serve-static-html.ss
+++ b/collects/tests/web-server/scheme-units/test-serve-static-html.ss
@@ -1,7 +1,7 @@
 ;; Mike Burns, July 28th, 2004, netgeek@speakeasy.net
 ;; Test whether a static, HTML file can be sent correctly.
 (module test-serve-static-html mzscheme
-  (require (lib "test.ss" "schemeunit")
+  (require schemeunit/test
            mzlib/contract
            "assertions.ss"
            )
diff --git a/collects/tests/web-server/scheme-units/test-serve-static-jpeg.ss b/collects/tests/web-server/scheme-units/test-serve-static-jpeg.ss
index 111052c2b9..7444b87a61 100644
--- a/collects/tests/web-server/scheme-units/test-serve-static-jpeg.ss
+++ b/collects/tests/web-server/scheme-units/test-serve-static-jpeg.ss
@@ -2,7 +2,7 @@
 ;; Test serving JPEGs. This also tests PR #6302.
 (module test-serve-static-jpeg mzscheme
   (require mzlib/contract
-           (lib "test.ss" "schemeunit")
+           schemeunit/test
            "assertions.ss")
 
   (provide/contract
diff --git a/collects/tests/web-server/scheme-units/test-servlets.ss b/collects/tests/web-server/scheme-units/test-servlets.ss
index 5879a63c87..0fd8154f6e 100644
--- a/collects/tests/web-server/scheme-units/test-servlets.ss
+++ b/collects/tests/web-server/scheme-units/test-servlets.ss
@@ -7,7 +7,7 @@
 ;; - URL paths
 (module test-servlets mzscheme
   (require mzlib/contract
-           (lib "test.ss" "schemeunit")
+           schemeunit/test
            "assertions.ss"
            )
 
diff --git a/collects/tests/web-server/scheme-units/test-suite.ss b/collects/tests/web-server/scheme-units/test-suite.ss
index 9ff6be89ec..cff49e58e8 100644
--- a/collects/tests/web-server/scheme-units/test-suite.ss
+++ b/collects/tests/web-server/scheme-units/test-suite.ss
@@ -4,7 +4,7 @@ exec mzscheme -r "$0" "$@"
 |#
 ;; Mike Burns, July 28th, 2004, netgeek@speakeasy.net
 ;; Run from collects/tests/web-server/scheme-units
-(require (lib "text-ui.ss" "schemeunit")
+(require schemeunit/text-ui
          "test-authentication.ss"
          "test-serve-static-html.ss"
          "test-serve-static-jpeg.ss"
diff --git a/collects/tests/web-server/scheme-units/test-timeout.ss b/collects/tests/web-server/scheme-units/test-timeout.ss
index a17989f402..c218d47e57 100644
--- a/collects/tests/web-server/scheme-units/test-timeout.ss
+++ b/collects/tests/web-server/scheme-units/test-timeout.ss
@@ -1,7 +1,7 @@
 ;; Mike Burns, July 28th, 2004, netgeek@speakeasy.net
 ;; Test if the server does timeout
 (module test-timeout mzscheme
-  (require (lib "test.ss" "schemeunit")
+  (require schemeunit/test
            "assertions.ss"
            )
 
diff --git a/collects/tests/web-server/scheme-units/test-web-root/servlets/test2-incremental-unitsig.ss b/collects/tests/web-server/scheme-units/test-web-root/servlets/test2-incremental-unitsig.ss
index 4c2915a2a7..25af0ab582 100644
--- a/collects/tests/web-server/scheme-units/test-web-root/servlets/test2-incremental-unitsig.ss
+++ b/collects/tests/web-server/scheme-units/test-web-root/servlets/test2-incremental-unitsig.ss
@@ -1,7 +1,7 @@
 ;; Incremental servlet with no arguments on the URL, in text/html, with URL
 ;; path.
 (require mzlib/unitsig
-         (lib "servlet-sig.ss" "web-server")
+         web-server/servlet-sig
          )
 (unit/sig ()
   (import servlet^)
diff --git a/collects/tests/web-server/scheme-units/test-web-server-process.ss b/collects/tests/web-server/scheme-units/test-web-server-process.ss
index 87a3063fb3..7644f452dc 100644
--- a/collects/tests/web-server/scheme-units/test-web-server-process.ss
+++ b/collects/tests/web-server/scheme-units/test-web-server-process.ss
@@ -2,7 +2,7 @@
 ;; Test if the Web server can start and stop via the command line.
 ;; Not sure if this is needed, but it was in Paul's.
 (module test-web-server-process mzscheme
-  (require (lib "test.ss" "schemeunit")
+  (require schemeunit/test
            mzlib/process)
 
   (provide test-web-server-process)
diff --git a/collects/tests/web-server/scheme-units/test-web-server.ss b/collects/tests/web-server/scheme-units/test-web-server.ss
index 1e8c543d42..d20fa9483f 100644
--- a/collects/tests/web-server/scheme-units/test-web-server.ss
+++ b/collects/tests/web-server/scheme-units/test-web-server.ss
@@ -1,9 +1,9 @@
 ;; Mike Burns, July 26th, 2004, netgeek@speakeasy.net
 ;; Test the ability to start and stop the server via the library.
 (module test-web-server mzscheme
-  (require (lib "web-server.ss" "web-server")
-           (lib "configuration.ss" "web-server")
-           (lib "test.ss" "schemeunit")
+  (require web-server/web-server
+           web-server/configuration
+           schemeunit/test
            mzlib/etc)
 
   (provide test-web-server)
diff --git a/collects/tests/web-server/suite.ss b/collects/tests/web-server/suite.ss
index a644d9fcb3..e0a73b4a25 100644
--- a/collects/tests/web-server/suite.ss
+++ b/collects/tests/web-server/suite.ss
@@ -14,8 +14,8 @@
            mzlib/etc
            "my-url.ss"
            net/base64
-           (lib "xml.ss" "xml")
-           (lib "channel.ss" "web-server"))
+           xml/xml
+           web-server/channel)
 
   (define myprint void)
   
diff --git a/collects/tests/web-server/web-root/servlets/configure.ss b/collects/tests/web-server/web-root/servlets/configure.ss
index a62aea6ff3..64e42bdbf5 100644
--- a/collects/tests/web-server/web-root/servlets/configure.ss
+++ b/collects/tests/web-server/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 web-server/configure)
 
 servlet
diff --git a/collects/tests/web-server/web-root/servlets/tests/b-module.ss b/collects/tests/web-server/web-root/servlets/tests/b-module.ss
index 05f67857a8..911c5f3bf9 100644
--- a/collects/tests/web-server/web-root/servlets/tests/b-module.ss
+++ b/collects/tests/web-server/web-root/servlets/tests/b-module.ss
@@ -1,6 +1,6 @@
 (module b-module mzscheme
   (provide interface-version timeout start)
-  (require (lib "servlet-sig.ss" "web-server"))
+  (require web-server/servlet-sig)
   
   (define interface-version 'v1)
   
diff --git a/collects/tests/web-server/web-root/servlets/tests/bad-return.ss b/collects/tests/web-server/web-root/servlets/tests/bad-return.ss
index f0ef799885..1ee1fde3af 100644
--- a/collects/tests/web-server/web-root/servlets/tests/bad-return.ss
+++ b/collects/tests/web-server/web-root/servlets/tests/bad-return.ss
@@ -1,5 +1,5 @@
 (require mzlib/unitsig)
-(require (lib "servlet-sig.ss" "web-server"))
+(require web-server/servlet-sig)
 (unit/sig ()
   (import servlet^)
   5)
diff --git a/collects/tests/web-server/web-root/servlets/tests/broken.ss b/collects/tests/web-server/web-root/servlets/tests/broken.ss
index 1514823489..4468ee618d 100644
--- a/collects/tests/web-server/web-root/servlets/tests/broken.ss
+++ b/collects/tests/web-server/web-root/servlets/tests/broken.ss
@@ -1,5 +1,5 @@
 (require mzlib/unitsig)
-(require (lib "servlet-sig.ss" "web-server"))
+(require web-server/servlet-sig)
 (unit/sig ()
   (import servlet^)
   (raise 'kablooie))
diff --git a/collects/tests/web-server/web-root/servlets/tests/cut-module.ss b/collects/tests/web-server/web-root/servlets/tests/cut-module.ss
index 0f1940f48c..7fb64a7500 100644
--- a/collects/tests/web-server/web-root/servlets/tests/cut-module.ss
+++ b/collects/tests/web-server/web-root/servlets/tests/cut-module.ss
@@ -2,7 +2,7 @@
 (module cut-module mzscheme
   (provide interface-version timeout start)
   (require web-server/servlet
-           (lib "servlet-sig.ss" "web-server"))
+           web-server/servlet-sig)
   
   (define interface-version 'v1)
   
diff --git a/collects/tests/web-server/web-root/servlets/tests/incremental.ss b/collects/tests/web-server/web-root/servlets/tests/incremental.ss
index cf20aaf801..9711557aaa 100644
--- a/collects/tests/web-server/web-root/servlets/tests/incremental.ss
+++ b/collects/tests/web-server/web-root/servlets/tests/incremental.ss
@@ -1,4 +1,4 @@
-(require (lib "servlet-sig.ss" "web-server")
+(require web-server/servlet-sig
          mzlib/unitsig)
 
 (unit/sig ()
diff --git a/collects/tests/web-server/web-root/servlets/tests/mime.ss b/collects/tests/web-server/web-root/servlets/tests/mime.ss
index 7c75886d30..3c82d20ee6 100644
--- a/collects/tests/web-server/web-root/servlets/tests/mime.ss
+++ b/collects/tests/web-server/web-root/servlets/tests/mime.ss
@@ -1,5 +1,5 @@
 (require mzlib/unitsig)
-(require (lib "servlet-sig.ss" "web-server"))
+(require web-server/servlet-sig)
 (unit/sig ()
   (import servlet^)
   `("text/uber-format"
diff --git a/collects/tests/web-server/web-root/servlets/tests/module-suspended-init.ss b/collects/tests/web-server/web-root/servlets/tests/module-suspended-init.ss
index d8c3f294cb..f6957265e7 100644
--- a/collects/tests/web-server/web-root/servlets/tests/module-suspended-init.ss
+++ b/collects/tests/web-server/web-root/servlets/tests/module-suspended-init.ss
@@ -1,7 +1,7 @@
 (module module-suspended-init mzscheme
   (provide interface-version timeout start)
   (require web-server/servlet
-           (lib "servlet-sig.ss" "web-server"))
+           web-server/servlet-sig)
   
   (define interface-version 'v1)
   
diff --git a/collects/tests/web-server/web-root/servlets/tests/size.ss b/collects/tests/web-server/web-root/servlets/tests/size.ss
index 10e954febc..3ff7595c77 100644
--- a/collects/tests/web-server/web-root/servlets/tests/size.ss
+++ b/collects/tests/web-server/web-root/servlets/tests/size.ss
@@ -1,5 +1,5 @@
 (require mzlib/unitsig)
-(require (lib "servlet-sig.ss" "web-server"))
+(require web-server/servlet-sig)
 
 (let* ([line-size 80]
        [build-a-str
diff --git a/collects/tests/web-server/web-root/servlets/tests/suspended-module.ss b/collects/tests/web-server/web-root/servlets/tests/suspended-module.ss
index 4c1bd78a95..a6c3f33f5e 100644
--- a/collects/tests/web-server/web-root/servlets/tests/suspended-module.ss
+++ b/collects/tests/web-server/web-root/servlets/tests/suspended-module.ss
@@ -1,7 +1,7 @@
 (module suspended-module mzscheme
   (provide interface-version timeout start)
   (require web-server/servlet
-           (lib "servlet-sig.ss" "web-server"))
+           web-server/servlet-sig)
   
   (define interface-version 'v1)
   
diff --git a/collects/tests/web-server/web-root/servlets/tests/test.ss b/collects/tests/web-server/web-root/servlets/tests/test.ss
index d2482239d9..65953cdb95 100644
--- a/collects/tests/web-server/web-root/servlets/tests/test.ss
+++ b/collects/tests/web-server/web-root/servlets/tests/test.ss
@@ -1,5 +1,5 @@
 (require mzlib/unitsig)
-(require (lib "servlet-sig.ss" "web-server"))
+(require web-server/servlet-sig)
 (let ([count 0])
   (unit/sig ()
     (import servlet^)
diff --git a/collects/tests/web-server/web-root/servlets/tests/url.ss b/collects/tests/web-server/web-root/servlets/tests/url.ss
index fb91ca1f56..ca7a44e28a 100644
--- a/collects/tests/web-server/web-root/servlets/tests/url.ss
+++ b/collects/tests/web-server/web-root/servlets/tests/url.ss
@@ -1,5 +1,5 @@
 (require mzlib/unitsig
-         (lib "servlet-sig.ss" "web-server")
+         web-server/servlet-sig
          net/url)
 (let ([count 0])
   (unit/sig ()
diff --git a/collects/tex2page/tex2page-aux.ss b/collects/tex2page/tex2page-aux.ss
index f4325f098f..70359d7f0d 100644
--- a/collects/tex2page/tex2page-aux.ss
+++ b/collects/tex2page/tex2page-aux.ss
@@ -13,8 +13,8 @@
                    require
                    require-for-syntax
                    provide))
-  (require (lib "process.ss"))
-  (require (lib "date.ss")
+  (require mzlib/process)
+  (require mzlib/date
            (only mzscheme
                  make-hash-table hash-table-get hash-table-put!
                  hash-table-for-each
diff --git a/collects/texpict/mrpict-unit.ss b/collects/texpict/mrpict-unit.ss
index 6acc42366c..076bcebeda 100644
--- a/collects/texpict/mrpict-unit.ss
+++ b/collects/texpict/mrpict-unit.ss
@@ -2,7 +2,7 @@
 (module mrpict-unit mzscheme
   (require mzlib/unit)
 
-  (require (lib "mred-sig.ss" "mred"))
+  (require mred/mred-sig)
 
   (require "private/mrpict-sig.ss"
 	   "private/common-sig.ss"
diff --git a/collects/texpict/mrpict.ss b/collects/texpict/mrpict.ss
index 4eb84a0669..6554bb087f 100644
--- a/collects/texpict/mrpict.ss
+++ b/collects/texpict/mrpict.ss
@@ -5,8 +5,8 @@
            mzlib/class
            mred)
 
-  (require (lib "mred-sig.ss" "mred")
-	   (lib "mred-unit.ss" "mred"))
+  (require mred/mred-sig
+	   mred/mred-unit)
   (require "private/mrpict-sig.ss"
 	   "private/common-sig.ss")
   (require "mrpict-sig.ss"
diff --git a/collects/texpict/private/mrpict-extra.ss b/collects/texpict/private/mrpict-extra.ss
index f11586833c..bc069b8e8a 100644
--- a/collects/texpict/private/mrpict-extra.ss
+++ b/collects/texpict/private/mrpict-extra.ss
@@ -4,7 +4,7 @@
   (require mzlib/class
            mzlib/etc)
 
-  (require (lib "mred-sig.ss" "mred"))
+  (require mred/mred-sig)
 
   (require "mrpict-sig.ss"
 	   "common-sig.ss")
diff --git a/collects/texpict/utils.ss b/collects/texpict/utils.ss
index 1929ff0b33..f787dd868f 100644
--- a/collects/texpict/utils.ss
+++ b/collects/texpict/utils.ss
@@ -1082,4 +1082,3 @@
        (* large-rad 2)
        0
        0)))
- 
\ No newline at end of file
diff --git a/collects/typed-scheme/private/base-types.ss b/collects/typed-scheme/private/base-types.ss
index aca610a8c3..1790b12bb8 100644
--- a/collects/typed-scheme/private/base-types.ss
+++ b/collects/typed-scheme/private/base-types.ss
@@ -85,4 +85,4 @@
   Parameter Tuple Class
   )  
 
-(provide-extra-tnames)
\ No newline at end of file
+(provide-extra-tnames)
diff --git a/collects/typed-scheme/private/defstruct-unit.ss b/collects/typed-scheme/private/defstruct-unit.ss
index 285954df9f..3fed9fb241 100644
--- a/collects/typed-scheme/private/defstruct-unit.ss
+++ b/collects/typed-scheme/private/defstruct-unit.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (lib "struct.ss") (lib "unit.ss"))
+(require mzlib/struct mzlib/unit)
 (provide #;(all-defined))
 
 (define-syntax defstructs/sig/unit
diff --git a/collects/typed-scheme/private/effect-rep.ss b/collects/typed-scheme/private/effect-rep.ss
index e33977f9b6..892c889584 100644
--- a/collects/typed-scheme/private/effect-rep.ss
+++ b/collects/typed-scheme/private/effect-rep.ss
@@ -1,7 +1,7 @@
 #lang scheme/base
 
-(require (lib "plt-match.ss"))
-(require (lib "etc.ss"))
+(require mzlib/plt-match)
+(require mzlib/etc)
 (require "rep-utils.ss" "free-variance.ss")
 
 (de True-Effect () [#:frees #f] [#:fold-rhs #:base])
diff --git a/collects/typed-scheme/private/infer.ss b/collects/typed-scheme/private/infer.ss
index 295c38599c..96443b45c6 100644
--- a/collects/typed-scheme/private/infer.ss
+++ b/collects/typed-scheme/private/infer.ss
@@ -7,9 +7,9 @@
          "planet-requires.ss" "tc-utils.ss" "union.ss"
          "resolve-type.ss"
          "type-effect-convenience.ss"
-         (lib "trace.ss")
-         (lib "plt-match.ss")
-         (lib "list.ss"))
+         mzlib/trace
+         mzlib/plt-match
+         mzlib/list)
 (require (galore))
 
 #;(provide infer infer/list infer/list/vararg combine table:un exn:infer?)
diff --git a/collects/typed-scheme/private/prims.ss b/collects/typed-scheme/private/prims.ss
index 862ad9298c..7d05106293 100644
--- a/collects/typed-scheme/private/prims.ss
+++ b/collects/typed-scheme/private/prims.ss
@@ -25,20 +25,20 @@ This file defines two sorts of primitives. All of them are provided into any mod
 (require (for-syntax 
           scheme/base
           "type-rep.ss"
-          (lib "match.ss")
+          mzlib/match
           "parse-type.ss"
-          (lib "struct.ss" "syntax")
-          (lib "stx.ss" "syntax")
-          "utils.ss"   
+          syntax/struct
+          syntax/stx
+          "utils.ss"
           "tc-utils.ss"
           "type-name-env.ss"
           "type-contract.ss"))
 
 (require "require-contract.ss"
          "internal-forms.ss"
-         (except-in (lib "contract.ss") ->)
-         (only-in (lib "contract.ss") [-> c->])
-         (lib "struct.ss")
+         (except-in mzlib/contract ->)
+         (only-in mzlib/contract [-> c->])
+         mzlib/struct
          "base-types.ss")
 
 (define-for-syntax (ignore stx) (syntax-property stx 'typechecker:ignore #t))
diff --git a/collects/typed-scheme/private/tables.ss b/collects/typed-scheme/private/tables.ss
index c7b28535dc..08b94a026a 100644
--- a/collects/typed-scheme/private/tables.ss
+++ b/collects/typed-scheme/private/tables.ss
@@ -28,4 +28,4 @@
 
 (define (lookup k t) (hash-ref t k #f))
 
-(define (insert k v t) (hash-set t k v))
\ No newline at end of file
+(define (insert k v t) (hash-set t k v))
diff --git a/collects/typed-scheme/private/tc-lambda-unit.ss b/collects/typed-scheme/private/tc-lambda-unit.ss
index 1cf62f7e17..e17ad5fe9e 100644
--- a/collects/typed-scheme/private/tc-lambda-unit.ss
+++ b/collects/typed-scheme/private/tc-lambda-unit.ss
@@ -1,7 +1,7 @@
 #lang scheme/unit
 
 (require "signatures.ss"
-         (lib "trace.ss")
+         mzlib/trace
          (except-in "type-rep.ss" make-arr) ;; doesn't need tests
          "type-effect-convenience.ss" ;; maybe needs tests
          "type-environments.ss" ;; doesn't need tests
@@ -13,7 +13,7 @@
          "tc-utils.ss"
          "union.ss"
          "resolve-type.ss"
-         (lib "plt-match.ss")
+         mzlib/plt-match
          (only-in "type-effect-convenience.ss" [make-arr* make-arr]))
 (require (for-template scheme/base "internal-forms.ss"))
 
diff --git a/collects/typed-scheme/private/tc-toplevel.ss b/collects/typed-scheme/private/tc-toplevel.ss
index a681733716..831105a79b 100644
--- a/collects/typed-scheme/private/tc-toplevel.ss
+++ b/collects/typed-scheme/private/tc-toplevel.ss
@@ -23,7 +23,7 @@
          "type-contract.ss"
          (for-template
           "internal-forms.ss"
-          (lib "contract.ss")
+          mzlib/contract
           scheme/base))
 
 (import tc-expr^ check-subforms^)
diff --git a/collects/typed-scheme/private/type-contract.ss b/collects/typed-scheme/private/type-contract.ss
index 53aea61515..b0cd7f70c1 100644
--- a/collects/typed-scheme/private/type-contract.ss
+++ b/collects/typed-scheme/private/type-contract.ss
@@ -124,5 +124,5 @@
              #`syntax?
              #`(syntax/c #,(t->c t)))]
         [(Value: v) #`(flat-named-contract #,(format "~a" v) (lambda (x) (equal? x '#,v)))]
-        [else          
-         (exit (fail))]))))
\ No newline at end of file
+        [else
+         (exit (fail))]))))
diff --git a/collects/typed-scheme/private/type-env.ss b/collects/typed-scheme/private/type-env.ss
index 7467776502..01f0721fae 100644
--- a/collects/typed-scheme/private/type-env.ss
+++ b/collects/typed-scheme/private/type-env.ss
@@ -1,6 +1,6 @@
 #lang scheme/base
 
-(require (lib "boundmap.ss" "syntax")
+(require syntax/boundmap
          "tc-utils.ss")
 
 (provide register-type
diff --git a/collects/typed-scheme/private/utils.ss b/collects/typed-scheme/private/utils.ss
index 1d3275c9a7..ee6e940df6 100644
--- a/collects/typed-scheme/private/utils.ss
+++ b/collects/typed-scheme/private/utils.ss
@@ -37,7 +37,7 @@
 (define log-file (make-parameter #f))
 (define-for-syntax logging? #f)
 
-(require (only-in (lib "file.ss") file-name-from-path))
+(require (only-in mzlib/file file-name-from-path))
 
 (define-syntax (printf/log stx)
   (if logging?         
diff --git a/collects/waterworld/waterworld.ss b/collects/waterworld/waterworld.ss
index 28fd126a99..b8b04b27df 100644
--- a/collects/waterworld/waterworld.ss
+++ b/collects/waterworld/waterworld.ss
@@ -4,7 +4,7 @@
   (require mzlib/list)
   (require mzlib/etc)
   (require mred)
-  (require (lib "external.ss" "browser"))
+  (require browser/external)
   
   (define *progname* "WaterWorld")
 
diff --git a/collects/waterworld/wwdoc.ss b/collects/waterworld/wwdoc.ss
index 6a6da81480..2f45e74652 100644
--- a/collects/waterworld/wwdoc.ss
+++ b/collects/waterworld/wwdoc.ss
@@ -1,5 +1,5 @@
 (module wwdoc mzscheme
-  (require (lib "xml.ss" "xml"))
+  (require xml/xml)
 
   (define *the-file* "ww.html")
   (define *the-page* 
diff --git a/collects/web-server/bench/bench.ss b/collects/web-server/bench/bench.ss
index 9655673b7c..ae8a266232 100644
--- a/collects/web-server/bench/bench.ss
+++ b/collects/web-server/bench/bench.ss
@@ -2,8 +2,8 @@
 (require #;mzlib/file
          mzlib/list
          mzlib/process
-         (lib "web-server.ss" "web-server")
-         (prefix-in files: (lib "dispatch-files.ss" "web-server" "dispatchers"))
+         web-server/web-server
+         (prefix-in files: web-server/dispatchers/dispatch-files)
          (planet "csv.ss" ("neil" "csv.plt" 1 1)))
 
 (define data-path (collection-path "web-server" "bench" "data"))
diff --git a/collects/web-server/default-web-root/htdocs/lang-servlets/add01.ss b/collects/web-server/default-web-root/htdocs/lang-servlets/add01.ss
index 7e2e0ac2e6..3b4d02c8fb 100644
--- a/collects/web-server/default-web-root/htdocs/lang-servlets/add01.ss
+++ b/collects/web-server/default-web-root/htdocs/lang-servlets/add01.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (lib "request-structs.ss" "web-server" "private")
+(require web-server/private/request-structs
          net/url)
 (provide start)
 
diff --git a/collects/web-server/default-web-root/htdocs/lang-servlets/wc-comp.ss b/collects/web-server/default-web-root/htdocs/lang-servlets/wc-comp.ss
index d6388e0085..f519eae359 100644
--- a/collects/web-server/default-web-root/htdocs/lang-servlets/wc-comp.ss
+++ b/collects/web-server/default-web-root/htdocs/lang-servlets/wc-comp.ss
@@ -1,5 +1,5 @@
 #lang web-server
-(require (lib "web-cell-component.ss" "web-server" "lang"))
+(require web-server/lang/web-cell-component)
 (provide start)
 
 (define (start initial-request)
diff --git a/collects/web-server/default-web-root/servlets/examples/add-v2.ss b/collects/web-server/default-web-root/servlets/examples/add-v2.ss
index 419c405406..14944d6eea 100644
--- a/collects/web-server/default-web-root/servlets/examples/add-v2.ss
+++ b/collects/web-server/default-web-root/servlets/examples/add-v2.ss
@@ -1,6 +1,6 @@
 #lang scheme/base
 (require web-server/servlet
-         (lib "timeouts.ss" "web-server" "managers"))
+         web-server/managers/timeouts)
 (provide (all-defined-out))
 (define interface-version 'v2)
 (define manager
diff --git a/collects/web-server/dispatchers/dispatch-lang.ss b/collects/web-server/dispatchers/dispatch-lang.ss
index 2d3af2e4b9..67c6fd9b3e 100644
--- a/collects/web-server/dispatchers/dispatch-lang.ss
+++ b/collects/web-server/dispatchers/dispatch-lang.ss
@@ -1,10 +1,10 @@
 #lang scheme/base
 (require mzlib/list
          scheme/contract
-         (lib "session.ss" "web-server" "private")
+         web-server/private/session
          (only-in "../lang/web.ss"
                   initialize-servlet)           
-         (lib "web-cells.ss" "web-server" "lang")
+         web-server/lang/web-cells
          "../private/request-structs.ss"
          "../private/response-structs.ss"
          "dispatch.ss"
@@ -55,10 +55,10 @@
                (define cust (make-custodian (current-server-custodian)))
                (define ns (make-servlet-namespace
                            #:additional-specs
-                           '((lib "web-cells.ss" "web-server" "lang")
-                             (lib "abort-resume.ss" "web-server" "lang")
-                             (lib "session.ss" "web-server" "private")
-                             (lib "request-structs.ss" "web-server" "private"))))
+                           '(web-server/lang/web-cells
+                             web-server/lang/abort-resume
+                             web-server/private/session
+                             web-server/private/request-structs)))
                (define ses (new-session cust ns uri url-servlet-paths))
                (parameterize ([current-custodian cust]
                               [current-directory (directory-part a-path)]
diff --git a/collects/web-server/dispatchers/dispatch-servlets.ss b/collects/web-server/dispatchers/dispatch-servlets.ss
index b1728cf45c..880c8b20a2 100644
--- a/collects/web-server/dispatchers/dispatch-servlets.ss
+++ b/collects/web-server/dispatchers/dispatch-servlets.ss
@@ -159,9 +159,9 @@
     (parameterize ([current-namespace (make-servlet-namespace
                                        #:additional-specs
                                        '(web-server/servlet
-                                         (lib "servlet.ss" "web-server" "private")
-                                         (lib "web.ss" "web-server" "servlet")
-                                         (lib "web-cells.ss" "web-server" "servlet")))]
+                                         web-server/private/servlet
+                                         web-server/servlet/web
+                                         web-server/servlet/web-cells))]
                    [current-custodian (make-servlet-custodian)])
       ; XXX load/use-compiled breaks errortrace
       (define s (load/use-compiled a-path))
diff --git a/collects/web-server/private/configure.ss b/collects/web-server/private/configure.ss
index db7c308ab4..627adc0f5e 100644
--- a/collects/web-server/private/configure.ss
+++ b/collects/web-server/private/configure.ss
@@ -6,9 +6,9 @@
          mzlib/pretty
          (only-in mzlib/file
                   make-directory*)
-         (lib "configuration-table-structs.ss" "web-server" "configuration")
+         web-server/configuration/configuration-table-structs
          web-server/configuration/configuration-table
-         (lib "util.ss" "web-server" "private"))
+         web-server/private/util)
 (provide
  interface-version timeout
  start)
diff --git a/collects/web-server/private/response-structs.ss b/collects/web-server/private/response-structs.ss
index 672e74d27f..b7133694e3 100644
--- a/collects/web-server/private/response-structs.ss
+++ b/collects/web-server/private/response-structs.ss
@@ -1,6 +1,6 @@
 #lang scheme/base
 (require mzlib/contract
-         (lib "xml.ss" "xml")
+         xml/xml
          "request-structs.ss")
 
 (define TEXT/HTML-MIME-TYPE #"text/html; charset=utf-8")
diff --git a/collects/web-server/private/response.ss b/collects/web-server/private/response.ss
index 24b981ed69..5548598345 100644
--- a/collects/web-server/private/response.ss
+++ b/collects/web-server/private/response.ss
@@ -6,7 +6,7 @@
          mzlib/plt-match
          (only-in srfi/1/list fold filter-map)
          (only-in srfi/13/string string-join)
-         (lib "xml.ss" "xml")
+         xml/xml
          "connection-manager.ss"
          "../private/request-structs.ss"
          "../private/response-structs.ss"
diff --git a/collects/web-server/private/util.ss b/collects/web-server/private/util.ss
index fcf17aa97f..3182371845 100644
--- a/collects/web-server/private/util.ss
+++ b/collects/web-server/private/util.ss
@@ -4,7 +4,7 @@
          mzlib/contract
          mzlib/serialize
          mzlib/pretty
-         (lib "xml.ss" "xml")
+         xml/xml
          net/url)
 (define path-element?
   (or/c string? path? (symbols 'up 'same)))
diff --git a/collects/web-server/run.ss b/collects/web-server/run.ss
index 4cfaa2c32c..ef3462485c 100644
--- a/collects/web-server/run.ss
+++ b/collects/web-server/run.ss
@@ -3,17 +3,17 @@
 (require mzlib/cmdline
          (only-in mzlib/file
                   normalize-path)
-         (lib "web-server.ss" "web-server")
-         (lib "responders.ss" "web-server" "configuration")
-         (lib "mime-types.ss" "web-server" "private")
-         (prefix-in fsmap: (lib "filesystem-map.ss" "web-server" "dispatchers"))
-         (prefix-in timeout: (lib "dispatch-timeout.ss" "web-server" "dispatchers"))
-         (prefix-in files: (lib "dispatch-files.ss" "web-server" "dispatchers"))
-         (prefix-in filter: (lib "dispatch-filter.ss" "web-server" "dispatchers"))
-         (prefix-in lift: (lib "dispatch-lift.ss" "web-server" "dispatchers"))
-         (prefix-in sequencer: (lib "dispatch-sequencer.ss" "web-server" "dispatchers"))
-         (prefix-in lang: (lib "dispatch-lang.ss" "web-server" "dispatchers"))
-         (prefix-in stat: (lib "dispatch-stat.ss" "web-server" "dispatchers")))
+         web-server/web-server
+         web-server/configuration/responders
+         web-server/private/mime-types
+         (prefix-in fsmap: web-server/dispatchers/filesystem-map)
+         (prefix-in timeout: web-server/dispatchers/dispatch-timeout)
+         (prefix-in files: web-server/dispatchers/dispatch-files)
+         (prefix-in filter: web-server/dispatchers/dispatch-filter)
+         (prefix-in lift: web-server/dispatchers/dispatch-lift)
+         (prefix-in sequencer: web-server/dispatchers/dispatch-sequencer)
+         (prefix-in lang: web-server/dispatchers/dispatch-lang)
+         (prefix-in stat: web-server/dispatchers/dispatch-stat))
 
 (define server-root-path (make-parameter (collection-path "web-server" "default-web-root")))
 (define port (make-parameter 8080))
diff --git a/collects/web-server/scribblings/web-server.ss b/collects/web-server/scribblings/web-server.ss
index 66d71082f6..399b8ba935 100644
--- a/collects/web-server/scribblings/web-server.ss
+++ b/collects/web-server/scribblings/web-server.ss
@@ -1,6 +1,6 @@
 #lang scheme/base
-(require (lib "manual.ss" "scribble")
-         (lib "eval.ss" "scribble")
+(require scribble/manual
+         scribble/eval
          (for-label scheme/base
                     scheme/contract
                     scheme/unit))
@@ -20,8 +20,8 @@
 (define (href-link url label)
   (elem label " (" url ")")) 
 
-(provide (all-from-out (lib "manual.ss" "scribble"))
-         (all-from-out (lib "eval.ss" "scribble"))
+(provide (all-from-out scribble/manual)
+         (all-from-out scribble/eval)
          (for-label (all-from-out scheme/base
                                   scheme/contract
                                   scheme/unit))
diff --git a/collects/web-server/tests/dispatchers/dispatch-files-test.ss b/collects/web-server/tests/dispatchers/dispatch-files-test.ss
index cc60469754..0212f76e73 100644
--- a/collects/web-server/tests/dispatchers/dispatch-files-test.ss
+++ b/collects/web-server/tests/dispatchers/dispatch-files-test.ss
@@ -5,11 +5,11 @@
                   make-temporary-file)
          net/url
          mzlib/list
-         (lib "xml.ss" "xml")
-         (lib "request-structs.ss" "web-server" "private")
-         (lib "util.ss" "web-server" "private")
-         (lib "dispatch.ss" "web-server" "dispatchers")
-         (prefix-in files: (lib "dispatch-files.ss" "web-server" "dispatchers"))
+         xml/xml
+         web-server/private/request-structs
+         web-server/private/util
+         web-server/dispatchers/dispatch
+         (prefix-in files: web-server/dispatchers/dispatch-files)
          "../util.ss")
 (provide dispatch-files-tests)
 
diff --git a/collects/web-server/tests/dispatchers/dispatch-host-test.ss b/collects/web-server/tests/dispatchers/dispatch-host-test.ss
index f47d216c9b..c659642df9 100644
--- a/collects/web-server/tests/dispatchers/dispatch-host-test.ss
+++ b/collects/web-server/tests/dispatchers/dispatch-host-test.ss
@@ -5,12 +5,12 @@
                   make-temporary-file)
          net/url
          mzlib/list
-         (lib "request-structs.ss" "web-server" "private")
-         (lib "dispatch.ss" "web-server" "dispatchers")
-         (prefix-in host: (lib "dispatch-host.ss" "web-server" "dispatchers")))
+         web-server/private/request-structs
+         web-server/dispatchers/dispatch
+         (prefix-in host: web-server/dispatchers/dispatch-host))
 (provide dispatch-host-tests)
 
-(require/expose (lib "dispatch-host.ss" "web-server" "dispatchers")
+(require/expose web-server/dispatchers/dispatch-host
                 (get-host))
 
 (define lower-url (make-url #f #f "www.plt-scheme.org" #f #t empty empty #f))
@@ -54,4 +54,4 @@
                 'none
                 (get-host no-host-url empty))
    
-   ))
\ No newline at end of file
+   ))
diff --git a/collects/web-server/tests/dispatchers/dispatch-lang-test.ss b/collects/web-server/tests/dispatchers/dispatch-lang-test.ss
index 33464fda69..5fbeecff74 100644
--- a/collects/web-server/tests/dispatchers/dispatch-lang-test.ss
+++ b/collects/web-server/tests/dispatchers/dispatch-lang-test.ss
@@ -3,10 +3,10 @@
          (planet "sxml.ss" ("lizorkin" "sxml.plt" 2 0))
          mzlib/etc
          mzlib/list
-         (lib "dispatch.ss" "web-server" "dispatchers")
-         (lib "request-structs.ss" "web-server" "private")
-         (lib "namespace.ss" "web-server" "configuration")
-         (prefix-in lang: (lib "dispatch-lang.ss" "web-server" "dispatchers"))
+         web-server/dispatchers/dispatch
+         web-server/private/request-structs
+         web-server/configuration/namespace
+         (prefix-in lang: web-server/dispatchers/dispatch-lang)
          "../util.ss")
 (provide dispatch-lang-tests)
 
diff --git a/collects/web-server/tests/dispatchers/dispatch-passwords-test.ss b/collects/web-server/tests/dispatchers/dispatch-passwords-test.ss
index 1d6361faf1..4d39ebace8 100644
--- a/collects/web-server/tests/dispatchers/dispatch-passwords-test.ss
+++ b/collects/web-server/tests/dispatchers/dispatch-passwords-test.ss
@@ -6,13 +6,13 @@
          net/url
          mzlib/list
          mzlib/serialize
-         (lib "request-structs.ss" "web-server" "private")
-         (lib "dispatch.ss" "web-server" "dispatchers")
-         (prefix-in passwords: (lib "dispatch-passwords.ss" "web-server" "dispatchers"))
+         web-server/private/request-structs
+         web-server/dispatchers/dispatch
+         (prefix-in passwords: web-server/dispatchers/dispatch-passwords)
          "../util.ss")
 (provide dispatch-passwords-tests)
 
-(require/expose (lib "dispatch-passwords.ss" "web-server" "dispatchers")
+(require/expose web-server/dispatchers/dispatch-passwords
                 (read-passwords))
 
 (define default-passwords (build-path (collection-path "web-server") "default-web-root" "passwords"))
diff --git a/collects/web-server/tests/dispatchers/dispatch-servlets-test.ss b/collects/web-server/tests/dispatchers/dispatch-servlets-test.ss
index f92c6f3d58..83c9e00dcf 100644
--- a/collects/web-server/tests/dispatchers/dispatch-servlets-test.ss
+++ b/collects/web-server/tests/dispatchers/dispatch-servlets-test.ss
@@ -3,11 +3,11 @@
          (planet "sxml.ss" ("lizorkin" "sxml.plt" 2 0))
          mzlib/etc
          mzlib/list
-         (lib "request-structs.ss" "web-server" "private")
-         (lib "cache-table.ss" "web-server" "private")
-         (lib "web-server-structs.ss" "web-server" "private")
-         (lib "namespace.ss" "web-server" "configuration")
-         (prefix-in servlets: (lib "dispatch-servlets.ss" "web-server" "dispatchers"))
+         web-server/private/request-structs
+         web-server/private/cache-table
+         web-server/private/web-server-structs
+         web-server/configuration/namespace
+         (prefix-in servlets: web-server/dispatchers/dispatch-servlets)
          "../util.ss")
 (provide dispatch-servlets-tests)
 
diff --git a/collects/web-server/tests/dispatchers/filesystem-map-test.ss b/collects/web-server/tests/dispatchers/filesystem-map-test.ss
index 01325cb8e1..05f070a377 100644
--- a/collects/web-server/tests/dispatchers/filesystem-map-test.ss
+++ b/collects/web-server/tests/dispatchers/filesystem-map-test.ss
@@ -1,8 +1,8 @@
 #lang scheme/base
 (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
          net/url
-         (lib "util.ss" "web-server" "private")
-         (lib "filesystem-map.ss" "web-server" "dispatchers"))
+         web-server/private/util
+         web-server/dispatchers/filesystem-map)
 (provide filesystem-map-tests)
 
 (define base-dir (collection-path "web-server"))
diff --git a/collects/web-server/tests/lang/anormal-test.ss b/collects/web-server/tests/lang/anormal-test.ss
index f2f9c4f52d..56202f7cf7 100644
--- a/collects/web-server/tests/lang/anormal-test.ss
+++ b/collects/web-server/tests/lang/anormal-test.ss
@@ -1,7 +1,7 @@
 #lang scheme/base
 (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-         (lib "anormal.ss" "web-server" "lang")
-         (lib "util.ss" "web-server" "lang"))
+         web-server/lang/anormal
+         web-server/lang/util)
 (provide anormal-tests)
 
 (define (empty-env var)
diff --git a/collects/web-server/tests/lang/defun-test.ss b/collects/web-server/tests/lang/defun-test.ss
index 2a78f4289f..be3b2b9259 100644
--- a/collects/web-server/tests/lang/defun-test.ss
+++ b/collects/web-server/tests/lang/defun-test.ss
@@ -1,7 +1,7 @@
 #lang scheme/base
 (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-         (lib "defun.ss" "web-server" "lang")
-         (lib "util.ss" "web-server" "lang"))
+         web-server/lang/defun
+         web-server/lang/util)
 (provide defun-tests)
 
 (define-syntax vwrap
diff --git a/collects/web-server/tests/lang/file-box-test.ss b/collects/web-server/tests/lang/file-box-test.ss
index 0fb1f616cf..2cb4fef533 100644
--- a/collects/web-server/tests/lang/file-box-test.ss
+++ b/collects/web-server/tests/lang/file-box-test.ss
@@ -1,6 +1,6 @@
 #lang scheme/base
 (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-         (lib "file-box.ss" "web-server" "lang")
+         web-server/lang/file-box
          (only-in mzlib/file make-temporary-file))
 (provide file-box-tests)
 
diff --git a/collects/web-server/tests/lang/labels-test.ss b/collects/web-server/tests/lang/labels-test.ss
index 883bfea347..cf8ee4db2f 100644
--- a/collects/web-server/tests/lang/labels-test.ss
+++ b/collects/web-server/tests/lang/labels-test.ss
@@ -1,6 +1,6 @@
 #lang scheme/base
 (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-         (lib "labels.ss" "web-server" "lang"))
+         web-server/lang/labels)
 (provide labels-tests)
 
 (define l1 (make-labeling #"foo"))
diff --git a/collects/web-server/tests/lang/stuff-url-test.ss b/collects/web-server/tests/lang/stuff-url-test.ss
index b7d57af41b..319b009e3a 100644
--- a/collects/web-server/tests/lang/stuff-url-test.ss
+++ b/collects/web-server/tests/lang/stuff-url-test.ss
@@ -1,9 +1,9 @@
 #lang scheme/base
-(require (lib "stuff-url.ss" "web-server" "lang")
+(require web-server/lang/stuff-url
          (planet "test.ss" ("schematics" "schemeunit.plt" 2))
          net/url
          mzlib/serialize
-         "../util.ss")  
+         "../util.ss")
 (provide stuff-url-tests)
 
 (define uri0 (string->url "www.google.com"))  
diff --git a/collects/web-server/tests/private/cache-table-test.ss b/collects/web-server/tests/private/cache-table-test.ss
index d38d0f1ebe..071d55a33e 100644
--- a/collects/web-server/tests/private/cache-table-test.ss
+++ b/collects/web-server/tests/private/cache-table-test.ss
@@ -1,6 +1,6 @@
 #lang scheme/base
 (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-         (lib "cache-table.ss" "web-server" "private"))
+         web-server/private/cache-table)
 (provide cache-table-tests)
 
 (define cache-table-tests
diff --git a/collects/web-server/tests/private/connection-manager-test.ss b/collects/web-server/tests/private/connection-manager-test.ss
index 3ced8d03e6..c4fa0d0d8e 100644
--- a/collects/web-server/tests/private/connection-manager-test.ss
+++ b/collects/web-server/tests/private/connection-manager-test.ss
@@ -1,6 +1,6 @@
 #lang scheme/base
 (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-         (lib "connection-manager.ss" "web-server" "private"))
+         web-server/private/connection-manager)
 (provide connection-manager-tests)
 
 (start-connection-manager (current-custodian))
diff --git a/collects/web-server/tests/private/define-closure-test.ss b/collects/web-server/tests/private/define-closure-test.ss
index 5a53f6649c..75b602edfd 100644
--- a/collects/web-server/tests/private/define-closure-test.ss
+++ b/collects/web-server/tests/private/define-closure-test.ss
@@ -2,7 +2,7 @@
 (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
          mzlib/serialize
          mzlib/match
-         (lib "define-closure.ss" "web-server" "private"))
+         web-server/private/define-closure)
 (provide define-closure-tests)
 
 (define-closure id (x) () x)
diff --git a/collects/web-server/tests/private/mime-types-test.ss b/collects/web-server/tests/private/mime-types-test.ss
index 64a1f55e54..632b6396bf 100644
--- a/collects/web-server/tests/private/mime-types-test.ss
+++ b/collects/web-server/tests/private/mime-types-test.ss
@@ -1,8 +1,8 @@
 #lang scheme/base
 (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
          (only-in mzlib/file make-temporary-file)
-         (lib "mime-types.ss" "web-server" "private")
-         (lib "response-structs.ss" "web-server" "private"))
+         web-server/private/mime-types
+         web-server/private/response-structs)
 (provide mime-types-tests)
 
 (define test-file (make-temporary-file))
diff --git a/collects/web-server/tests/private/mod-map-test.ss b/collects/web-server/tests/private/mod-map-test.ss
index 4c05b32c28..ecb1328465 100644
--- a/collects/web-server/tests/private/mod-map-test.ss
+++ b/collects/web-server/tests/private/mod-map-test.ss
@@ -1,6 +1,6 @@
 #lang scheme/base
 (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-         (lib "mod-map.ss" "web-server" "private")
+         web-server/private/mod-map
          mzlib/serialize
          "../util.ss")
 (provide mod-map-tests)
diff --git a/collects/web-server/tests/private/request-test.ss b/collects/web-server/tests/private/request-test.ss
index 1272053652..edd41a82b9 100644
--- a/collects/web-server/tests/private/request-test.ss
+++ b/collects/web-server/tests/private/request-test.ss
@@ -1,12 +1,12 @@
 #lang scheme/base
 (require (planet "util.ss" ("schematics" "schemeunit.plt" 2))
          (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-         (lib "connection-manager.ss" "web-server" "private")
-         (lib "timer.ss" "web-server" "private")
-         (lib "request-structs.ss" "web-server" "private"))
+         web-server/private/connection-manager
+         web-server/private/timer
+         web-server/private/request-structs)
 (provide request-tests)
 
-(require/expose (lib "request.ss" "web-server" "private")
+(require/expose web-server/private/request
                 (read-bindings&post-data/raw))
 
 ;; mock connection object for test on post body parsing
diff --git a/collects/web-server/tests/private/response-test.ss b/collects/web-server/tests/private/response-test.ss
index 319132d078..38825d69e0 100644
--- a/collects/web-server/tests/private/response-test.ss
+++ b/collects/web-server/tests/private/response-test.ss
@@ -1,15 +1,15 @@
 #lang scheme/base
 (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
          (planet "util.ss" ("schematics" "schemeunit.plt" 2))
-         (lib "xml.ss" "xml")
+         xml/xml
          (only-in mzlib/file
                   make-temporary-file)
-         (lib "response.ss" "web-server" "private")
-         (lib "request-structs.ss" "web-server" "private")
-         (lib "response-structs.ss" "web-server" "private")
+         web-server/private/response
+         web-server/private/request-structs
+         web-server/private/response-structs
          "../util.ss")
 
-(require/expose (lib "response.ss" "web-server" "private")
+(require/expose web-server/private/response
                 (convert-http-ranges
                  make-content-length-header
                  make-content-range-header
diff --git a/collects/web-server/tests/private/session-test.ss b/collects/web-server/tests/private/session-test.ss
index acb92d766b..0606e0dd5f 100644
--- a/collects/web-server/tests/private/session-test.ss
+++ b/collects/web-server/tests/private/session-test.ss
@@ -2,7 +2,7 @@
 (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
          mzlib/list
          net/url
-         (lib "session.ss" "web-server" "private"))
+         web-server/private/session)
 (provide session-tests)
 
 (define url0 (string->url "http://test.com/foo"))
diff --git a/collects/web-server/tests/private/url-param-test.ss b/collects/web-server/tests/private/url-param-test.ss
index 0957f1b244..a7a1f6f8eb 100644
--- a/collects/web-server/tests/private/url-param-test.ss
+++ b/collects/web-server/tests/private/url-param-test.ss
@@ -1,7 +1,7 @@
 #lang scheme/base
 (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
          net/url
-         (lib "url-param.ss" "web-server" "private"))
+         web-server/private/url-param)
 (provide url-param-tests)
 
 (define url0 (string->url "http://www.test.com/somewhere"))
diff --git a/collects/web-server/tests/private/util-test.ss b/collects/web-server/tests/private/util-test.ss
index 8815a3daf3..8ef7ecb0f2 100644
--- a/collects/web-server/tests/private/util-test.ss
+++ b/collects/web-server/tests/private/util-test.ss
@@ -1,9 +1,9 @@
 #lang scheme/base
 (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
          net/url
-         (lib "xml.ss" "xml")
+         xml/xml
          mzlib/contract
-         (lib "util.ss" "web-server" "private"))
+         web-server/private/util)
 (provide util-tests)
 
 (define util-tests
diff --git a/collects/web-server/tests/servlet/basic-auth-test.ss b/collects/web-server/tests/servlet/basic-auth-test.ss
index d1b8ff607f..b01a587ed3 100644
--- a/collects/web-server/tests/servlet/basic-auth-test.ss
+++ b/collects/web-server/tests/servlet/basic-auth-test.ss
@@ -1,7 +1,7 @@
 #lang scheme/base
 (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-         (lib "request-structs.ss" "web-server" "private")
-         (lib "basic-auth.ss" "web-server" "servlet"))
+         web-server/private/request-structs
+         web-server/servlet/basic-auth)
 (provide basic-auth-tests)
 
 (define basic-auth-tests
diff --git a/collects/web-server/tests/servlet/bindings-test.ss b/collects/web-server/tests/servlet/bindings-test.ss
index 43528fe6eb..0e12dab395 100644
--- a/collects/web-server/tests/servlet/bindings-test.ss
+++ b/collects/web-server/tests/servlet/bindings-test.ss
@@ -2,8 +2,8 @@
 (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
          mzlib/list
          net/url
-         (lib "request-structs.ss" "web-server" "private")
-         (lib "bindings.ss" "web-server" "servlet"))
+         web-server/private/request-structs
+         web-server/servlet/bindings)
 (provide bindings-tests)
 
 (define bs `([foo . 3] [foos . 1] [foos . 2]))
diff --git a/collects/web-server/tests/servlet/helpers-test.ss b/collects/web-server/tests/servlet/helpers-test.ss
index 0be77d3684..7d2b840fd8 100644
--- a/collects/web-server/tests/servlet/helpers-test.ss
+++ b/collects/web-server/tests/servlet/helpers-test.ss
@@ -1,8 +1,8 @@
 #lang scheme/base
 (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-         (lib "response-structs.ss" "web-server" "private")
-         (lib "request-structs.ss" "web-server" "private")
-         (lib "helpers.ss" "web-server" "servlet"))
+         web-server/private/response-structs
+         web-server/private/request-structs
+         web-server/servlet/helpers)
 (provide helpers-tests)
 
 (define (dehead hs)
diff --git a/collects/web-server/tests/servlet/servlet-url-test.ss b/collects/web-server/tests/servlet/servlet-url-test.ss
index e2d6a0264a..e3055a1277 100644
--- a/collects/web-server/tests/servlet/servlet-url-test.ss
+++ b/collects/web-server/tests/servlet/servlet-url-test.ss
@@ -2,8 +2,8 @@
 (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
          mzlib/list
          net/url
-         (lib "servlet-url.ss" "web-server" "servlet")
-         (lib "request-structs.ss" "web-server" "private"))
+         web-server/servlet/servlet-url
+         web-server/private/request-structs)
 (provide servlet-url-tests)
 
 (define servlet-url-tests
diff --git a/collects/web-server/tests/servlet/web-test.ss b/collects/web-server/tests/servlet/web-test.ss
index 87e077de76..65f9eac2b2 100644
--- a/collects/web-server/tests/servlet/web-test.ss
+++ b/collects/web-server/tests/servlet/web-test.ss
@@ -1,7 +1,7 @@
 #lang scheme/base
 (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
          net/url
-         (lib "web.ss" "web-server" "servlet"))
+         web-server/servlet/web)
 (provide web-tests)
 
 (define url0 (string->url "http://test.com/servlets/example.ss"))
diff --git a/collects/web-server/tests/util.ss b/collects/web-server/tests/util.ss
index 0bcb417e24..0d83521bec 100644
--- a/collects/web-server/tests/util.ss
+++ b/collects/web-server/tests/util.ss
@@ -1,14 +1,14 @@
 #lang scheme/base
 (require (for-syntax scheme/base)
-         (lib "connection-manager.ss" "web-server" "private")
+         web-server/private/connection-manager
          (only-in (planet "ssax.ss" ("lizorkin" "ssax.plt" 2 0))
                   ssax:xml->sxml)
-         (lib "request-structs.ss" "web-server" "private")
-         (lib "web-server-structs.ss" "web-server" "private")
+         web-server/private/request-structs
+         web-server/private/web-server-structs
          net/url
          mzlib/pretty
          mzlib/list
-         (lib "timer.ss" "web-server" "private"))
+         web-server/private/timer)
 (provide make-module-eval
          make-eval/mod-path
          make-mock-connection
@@ -53,8 +53,8 @@
      #'(let ([ns (make-base-empty-namespace)])
          (parameterize ([current-namespace ns])
            (namespace-require 'scheme/base)
-           (namespace-require '(lib "abort-resume.ss" "web-server" "lang"))
-           (namespace-require '(lib "serialize.ss"))
+           (namespace-require 'web-server/lang/abort-resume)
+           (namespace-require 'mzlib/serialize)
            (eval '(module m-id . rest))
            (eval '(require 'm-id)))
          
@@ -68,8 +68,8 @@
   (let ([ns (make-base-empty-namespace)])
     (parameterize ([current-namespace ns])
       (namespace-require 'scheme/base)
-      (namespace-require '(lib "abort-resume.ss" "web-server" "lang"))
-      (namespace-require '(lib "serialize.ss"))
+      (namespace-require 'web-server/lang/abort-resume)
+      (namespace-require 'mzlib/serialize)
       (namespace-require pth))
     (lambda (expr)
       (parameterize ([current-namespace ns])
diff --git a/collects/web-server/web-server-unit.ss b/collects/web-server/web-server-unit.ss
index 4226a4c99a..1f4a54f42c 100644
--- a/collects/web-server/web-server-unit.ss
+++ b/collects/web-server/web-server-unit.ss
@@ -13,7 +13,7 @@
 (require "dispatchers/dispatch.ss"
          (prefix-in fsmap: "dispatchers/filesystem-map.ss")
          (prefix-in sequencer: "dispatchers/dispatch-sequencer.ss")
-         (prefix-in timeout: (lib "dispatch-timeout.ss" "web-server" "dispatchers"))
+         (prefix-in timeout: web-server/dispatchers/dispatch-timeout)
          (prefix-in passwords: "dispatchers/dispatch-passwords.ss")
          (prefix-in files: "dispatchers/dispatch-files.ss")
          (prefix-in servlets: "dispatchers/dispatch-servlets.ss")
diff --git a/collects/wxme/xml.ss b/collects/wxme/xml.ss
index f68df07938..ddb2547e29 100644
--- a/collects/wxme/xml.ss
+++ b/collects/wxme/xml.ss
@@ -1,7 +1,7 @@
 
 (module xml mzscheme
   (require mzlib/class
-           (lib "xml.ss" "xml")
+           xml/xml
            mzlib/list
            "wxme.ss"
            "editor.ss"
diff --git a/collects/xml/scheme-snipclass.ss b/collects/xml/scheme-snipclass.ss
index b4be1059c0..3012902b98 100644
--- a/collects/xml/scheme-snipclass.ss
+++ b/collects/xml/scheme-snipclass.ss
@@ -1,5 +1,5 @@
 (module scheme-snipclass mzscheme
-  (require (lib "xml-snip-helpers.ss" "stepper" "private")
+  (require stepper/private/xml-snip-helpers
            mzlib/class
            mred)
   
diff --git a/collects/xml/test.ss b/collects/xml/test.ss
index ca99430627..3cc340c2e8 100644
--- a/collects/xml/test.ss
+++ b/collects/xml/test.ss
@@ -2,7 +2,7 @@
 ;;  % mzscheme --require test.ss
 
 (module test mzscheme
-  (require (lib "xml.ss" "xml"))
+  (require xml/xml)
 
 
   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/collects/xml/text-box-tool.ss b/collects/xml/text-box-tool.ss
index 8b52ad93d1..936e16403f 100644
--- a/collects/xml/text-box-tool.ss
+++ b/collects/xml/text-box-tool.ss
@@ -1,5 +1,5 @@
 (module text-box-tool mzscheme
-  (require (lib "tool.ss" "drscheme")
+  (require drscheme/tool
            mred
            framework
            "text-snipclass.ss"
@@ -7,7 +7,7 @@
            mzlib/class
 	   mzlib/contract
            string-constants
-           (lib "include-bitmap.ss" "mrlib"))
+           mrlib/include-bitmap)
   
   (provide tool@)
 
diff --git a/collects/xml/xml-snipclass.ss b/collects/xml/xml-snipclass.ss
index 55e025cd87..884e7fe0bb 100644
--- a/collects/xml/xml-snipclass.ss
+++ b/collects/xml/xml-snipclass.ss
@@ -1,5 +1,5 @@
 (module xml-snipclass mzscheme
-  (require (lib "xml-snip-helpers.ss" "stepper" "private")
+  (require stepper/private/xml-snip-helpers
            mzlib/class
            mred)