diff --git a/collects/typed-scheme/lang/reader.ss b/collects/typed-scheme/lang/reader.ss
index 27caa224..6af4b48a 100644
--- a/collects/typed-scheme/lang/reader.ss
+++ b/collects/typed-scheme/lang/reader.ss
@@ -3,10 +3,10 @@
 	   (only-in syntax/module-reader wrap-read-all))
   
   (define (*read in)
-    (wrap-read-all 'typed-scheme/lang/main in r:read))
+    (wrap-read-all 'typed-scheme in r:read))
   
   (define (*read-syntax src in)
-    (wrap-read-all 'typed-scheme/lang/main
+    (wrap-read-all 'typed-scheme
 		   in
 		   (lambda (in)
 		     (r:read-syntax src in))))
diff --git a/collects/typed-scheme/lang/main.ss b/collects/typed-scheme/main.ss
similarity index 100%
rename from collects/typed-scheme/lang/main.ss
rename to collects/typed-scheme/main.ss
diff --git a/collects/typed-scheme/lang/minimal.ss b/collects/typed-scheme/minimal.ss
similarity index 95%
rename from collects/typed-scheme/lang/minimal.ss
rename to collects/typed-scheme/minimal.ss
index 7c9b94e0..1ec695a2 100644
--- a/collects/typed-scheme/lang/minimal.ss
+++ b/collects/typed-scheme/minimal.ss
@@ -5,7 +5,7 @@
 
 (require (for-syntax scheme/base))
 
-(define-for-syntax ts-mod "../typed-scheme.ss")
+(define-for-syntax ts-mod "typed-scheme.ss")
 
 (define-syntax (providing stx)
   (syntax-case stx (libs from basics except)
diff --git a/collects/typed-scheme/typed-scheme.scrbl b/collects/typed-scheme/typed-scheme.scrbl
index c534db2b..101ef3ff 100644
--- a/collects/typed-scheme/typed-scheme.scrbl
+++ b/collects/typed-scheme/typed-scheme.scrbl
@@ -1,7 +1,7 @@
 #lang scribble/doc
 
 @begin[(require scribble/manual)
-       (require (for-label typed-scheme/lang/main))]
+       (require (for-label typed-scheme))]
 
 @begin[
 (define (item* header . args) (apply item @bold[header]{: } args))
@@ -10,7 +10,7 @@
 
 @title[#:tag "top"]{@bold{Typed Scheme}: Scheme with Static Types}
 
-@(defmodulelang typed-scheme #:use-sources (typed-scheme/lang/main))
+@(defmodulelang typed-scheme)
 
 Typed Scheme is a Scheme-like language, with a type system that
 supports common Scheme programming idioms.  Explicit type declarations