diff --git a/collects/profj/build-info.ss b/collects/profj/build-info.ss
index 199a40115d..43f57e489a 100644
--- a/collects/profj/build-info.ss
+++ b/collects/profj/build-info.ss
@@ -35,7 +35,7 @@
                               (map (lambda (p) (build-path p "profj" "libs"))
                                    (current-library-collection-paths))))
            (htdch-lib? (ormap (lambda (p) (same-base-dir? dir p))
-                              (map (lambda (p) (build-path p "htdch"))
+                              (map (lambda (p) (build-path p "profj" "htdch"))
                                    (current-library-collection-paths))))
            (scheme-lib? (ormap (lambda (p) (same-base-dir? dir p))
                                (current-library-collection-paths)))
@@ -43,7 +43,7 @@
                      (cond
                        (profj-lib? `(lib ,name "profj" "libs" ,@path))
                        (htdch-lib? 
-                        `(lib ,name "htdch" ,@(if scheme? (cdddr path) path)))
+                        `(lib ,name "profj" "htdch" ,@(if scheme? (cdddr path) path)))
                        (scheme-lib? `(lib ,name ,@(cddr path)))
                        ((and local? (not (to-file))) `(quote ,name))
                        (else `(file ,(path->string (build-path dir name)))))))
@@ -230,6 +230,7 @@
               (let* ([dir (find-directory path err)]
                      [class-list (get-class-list dir)]
                      [package-contents null])
+                (printf "~a~n~a~n" dir class-list)
                 (for-each (check-dup-import
                            (lambda (class)
                              (import-class class path dir file type-recs level (import-src imp) #t)
@@ -379,7 +380,7 @@
                 (send type-recs set-location! original-loc)))))
   
   ;(make-directory path bool)
-  (define-struct dir-path (path scheme?))
+  (define-struct dir-path (path scheme?) #:transparent)
   
   ;find-directory: (list string) ( -> void) -> dir-path
   (define (find-directory path fail)
diff --git a/collects/htdch/Examples/blink-java.ss b/collects/profj/htdch/Examples/blink-java.ss
similarity index 100%
rename from collects/htdch/Examples/blink-java.ss
rename to collects/profj/htdch/Examples/blink-java.ss
diff --git a/collects/htdch/Examples/draw-multiple-canvas.java b/collects/profj/htdch/Examples/draw-multiple-canvas.java
similarity index 100%
rename from collects/htdch/Examples/draw-multiple-canvas.java
rename to collects/profj/htdch/Examples/draw-multiple-canvas.java
diff --git a/collects/htdch/Examples/draw-multiple-worlds.java b/collects/profj/htdch/Examples/draw-multiple-worlds.java
similarity index 100%
rename from collects/htdch/Examples/draw-multiple-worlds.java
rename to collects/profj/htdch/Examples/draw-multiple-worlds.java
diff --git a/collects/htdch/Examples/draw-world-close-canvas.java b/collects/profj/htdch/Examples/draw-world-close-canvas.java
similarity index 100%
rename from collects/htdch/Examples/draw-world-close-canvas.java
rename to collects/profj/htdch/Examples/draw-world-close-canvas.java
diff --git a/collects/htdch/Examples/iblink-java.ss b/collects/profj/htdch/Examples/iblink-java.ss
similarity index 100%
rename from collects/htdch/Examples/iblink-java.ss
rename to collects/profj/htdch/Examples/iblink-java.ss
diff --git a/collects/htdch/colors/Black.java b/collects/profj/htdch/colors/Black.java
similarity index 100%
rename from collects/htdch/colors/Black.java
rename to collects/profj/htdch/colors/Black.java
diff --git a/collects/htdch/colors/Blue.java b/collects/profj/htdch/colors/Blue.java
similarity index 100%
rename from collects/htdch/colors/Blue.java
rename to collects/profj/htdch/colors/Blue.java
diff --git a/collects/htdch/colors/Green.java b/collects/profj/htdch/colors/Green.java
similarity index 100%
rename from collects/htdch/colors/Green.java
rename to collects/profj/htdch/colors/Green.java
diff --git a/collects/htdch/colors/IColor.java b/collects/profj/htdch/colors/IColor.java
similarity index 100%
rename from collects/htdch/colors/IColor.java
rename to collects/profj/htdch/colors/IColor.java
diff --git a/collects/htdch/colors/Red.java b/collects/profj/htdch/colors/Red.java
similarity index 100%
rename from collects/htdch/colors/Red.java
rename to collects/profj/htdch/colors/Red.java
diff --git a/collects/htdch/colors/White.java b/collects/profj/htdch/colors/White.java
similarity index 100%
rename from collects/htdch/colors/White.java
rename to collects/profj/htdch/colors/White.java
diff --git a/collects/htdch/colors/Yellow.java b/collects/profj/htdch/colors/Yellow.java
similarity index 100%
rename from collects/htdch/colors/Yellow.java
rename to collects/profj/htdch/colors/Yellow.java
diff --git a/collects/htdch/colors/info.ss b/collects/profj/htdch/colors/info.ss
similarity index 100%
rename from collects/htdch/colors/info.ss
rename to collects/profj/htdch/colors/info.ss
diff --git a/collects/htdch/colors/installer.ss b/collects/profj/htdch/colors/installer.ss
similarity index 90%
rename from collects/htdch/colors/installer.ss
rename to collects/profj/htdch/colors/installer.ss
index 8271ace39a..a1a0657b19 100644
--- a/collects/htdch/colors/installer.ss
+++ b/collects/profj/htdch/colors/installer.ss
@@ -6,7 +6,7 @@
     (fprintf a (current-error-port)))
   
   (define (installer plthome)
-    (let ((draw-path (build-path (collection-path "htdch" "colors"))))
+    (let ((draw-path (build-path (collection-path "profj" "htdch" "colors"))))
       (let ((javac
              (lambda (file)
                (parameterize ([current-load-relative-directory draw-path]
diff --git a/collects/htdch/draw/Canvas-native-methods.ss b/collects/profj/htdch/draw/Canvas-native-methods.ss
similarity index 80%
rename from collects/htdch/draw/Canvas-native-methods.ss
rename to collects/profj/htdch/draw/Canvas-native-methods.ss
index 37db05ac6c..20c0caa567 100644
--- a/collects/htdch/draw/Canvas-native-methods.ss
+++ b/collects/profj/htdch/draw/Canvas-native-methods.ss
@@ -1,6 +1,6 @@
 #lang scheme
 
-(require (lib "htdch/draw/support.scm")
+(require (lib "profj/htdch/draw/support.scm")
          mzlib/unit)
 
 (define void-or-true #t)
diff --git a/collects/htdch/draw/Canvas.java b/collects/profj/htdch/draw/Canvas.java
similarity index 100%
rename from collects/htdch/draw/Canvas.java
rename to collects/profj/htdch/draw/Canvas.java
diff --git a/collects/htdch/draw/Makefile b/collects/profj/htdch/draw/Makefile
similarity index 100%
rename from collects/htdch/draw/Makefile
rename to collects/profj/htdch/draw/Makefile
diff --git a/collects/htdch/draw/SillyCanvas.java b/collects/profj/htdch/draw/SillyCanvas.java
similarity index 100%
rename from collects/htdch/draw/SillyCanvas.java
rename to collects/profj/htdch/draw/SillyCanvas.java
diff --git a/collects/htdch/draw/World-native-methods.ss b/collects/profj/htdch/draw/World-native-methods.ss
similarity index 85%
rename from collects/htdch/draw/World-native-methods.ss
rename to collects/profj/htdch/draw/World-native-methods.ss
index 66be8cf2b7..fdbda49514 100644
--- a/collects/htdch/draw/World-native-methods.ss
+++ b/collects/profj/htdch/draw/World-native-methods.ss
@@ -1,6 +1,6 @@
 #lang scheme
 
-(require (lib "htdch/draw/support.scm")
+(require (lib "profj/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/World.java b/collects/profj/htdch/draw/World.java
similarity index 100%
rename from collects/htdch/draw/World.java
rename to collects/profj/htdch/draw/World.java
diff --git a/collects/htdch/draw/design-note.txt b/collects/profj/htdch/draw/design-note.txt
similarity index 100%
rename from collects/htdch/draw/design-note.txt
rename to collects/profj/htdch/draw/design-note.txt
diff --git a/collects/htdch/draw/doc.txt b/collects/profj/htdch/draw/doc.txt
similarity index 100%
rename from collects/htdch/draw/doc.txt
rename to collects/profj/htdch/draw/doc.txt
diff --git a/collects/htdch/draw/info.ss b/collects/profj/htdch/draw/info.ss
similarity index 100%
rename from collects/htdch/draw/info.ss
rename to collects/profj/htdch/draw/info.ss
diff --git a/collects/htdch/draw/installer.ss b/collects/profj/htdch/draw/installer.ss
similarity index 69%
rename from collects/htdch/draw/installer.ss
rename to collects/profj/htdch/draw/installer.ss
index ee561173c5..b4ffb5c610 100644
--- a/collects/htdch/draw/installer.ss
+++ b/collects/profj/htdch/draw/installer.ss
@@ -1,16 +1,16 @@
 (module installer mzscheme
   (require profj/compile
-           (prefix colors: htdch/colors/installer)
-           (prefix geometry: htdch/geometry/installer))
+           (prefix colors: profj/htdch/colors/installer)
+           (prefix geometry: profj/htdch/geometry/installer))
   (provide installer)
   
   (define (mprintf . a)
     (fprintf a (current-error-port)))
   
   (define (installer plthome)
-    (colors:installer plthome)
-    (geometry:installer plthome)
-    (let ((draw-path (build-path (collection-path "htdch" "draw"))))
+    #;(colors:installer plthome)
+    #;(geometry:installer plthome)
+    (let ((draw-path (build-path (collection-path "profj" "htdch" "draw"))))
       (let ((javac
              (lambda (file)
                (parameterize ([current-load-relative-directory draw-path]
diff --git a/collects/htdch/draw/pre-installer.ss b/collects/profj/htdch/draw/pre-installer.ss
similarity index 84%
rename from collects/htdch/draw/pre-installer.ss
rename to collects/profj/htdch/draw/pre-installer.ss
index afd6ca7d33..75f49e9ce0 100644
--- a/collects/htdch/draw/pre-installer.ss
+++ b/collects/profj/htdch/draw/pre-installer.ss
@@ -3,7 +3,7 @@
   (provide pre-installer)
   
   (define (pre-installer plthome)
-    (let ((draw-path (build-path (collection-path "htdch" "draw"))))
+    (let ((draw-path (build-path (collection-path "profj" "htdch" "draw"))))
       (let ((javac
              (lambda (file)
                (parameterize ([current-load-relative-directory draw-path])
diff --git a/collects/htdch/draw/support.scm b/collects/profj/htdch/draw/support.scm
similarity index 100%
rename from collects/htdch/draw/support.scm
rename to collects/profj/htdch/draw/support.scm
diff --git a/collects/htdch/geometry/Posn.java b/collects/profj/htdch/geometry/Posn.java
similarity index 100%
rename from collects/htdch/geometry/Posn.java
rename to collects/profj/htdch/geometry/Posn.java
diff --git a/collects/htdch/geometry/info.ss b/collects/profj/htdch/geometry/info.ss
similarity index 100%
rename from collects/htdch/geometry/info.ss
rename to collects/profj/htdch/geometry/info.ss
diff --git a/collects/htdch/geometry/installer.ss b/collects/profj/htdch/geometry/installer.ss
similarity index 87%
rename from collects/htdch/geometry/installer.ss
rename to collects/profj/htdch/geometry/installer.ss
index 137fb0b2c2..41c8a04cfc 100644
--- a/collects/htdch/geometry/installer.ss
+++ b/collects/profj/htdch/geometry/installer.ss
@@ -6,7 +6,7 @@
     (fprintf a (current-error-port)))
   
   (define (installer plthome)
-    (let ((draw-path (build-path (collection-path "htdch" "geometry"))))
+    (let ((draw-path (build-path (collection-path "profj" "htdch" "geometry"))))
       (let ((javac
              (lambda (file)
                (parameterize ([current-load-relative-directory draw-path]
diff --git a/collects/htdch/graphics/Black.java b/collects/profj/htdch/graphics/Black.java
similarity index 100%
rename from collects/htdch/graphics/Black.java
rename to collects/profj/htdch/graphics/Black.java
diff --git a/collects/htdch/graphics/Blue.java b/collects/profj/htdch/graphics/Blue.java
similarity index 100%
rename from collects/htdch/graphics/Blue.java
rename to collects/profj/htdch/graphics/Blue.java
diff --git a/collects/htdch/graphics/Brown.java b/collects/profj/htdch/graphics/Brown.java
similarity index 100%
rename from collects/htdch/graphics/Brown.java
rename to collects/profj/htdch/graphics/Brown.java
diff --git a/collects/htdch/graphics/Color.java b/collects/profj/htdch/graphics/Color.java
similarity index 100%
rename from collects/htdch/graphics/Color.java
rename to collects/profj/htdch/graphics/Color.java
diff --git a/collects/htdch/graphics/Command.djava b/collects/profj/htdch/graphics/Command.djava
similarity index 100%
rename from collects/htdch/graphics/Command.djava
rename to collects/profj/htdch/graphics/Command.djava
diff --git a/collects/htdch/graphics/CommandSequence.java b/collects/profj/htdch/graphics/CommandSequence.java
similarity index 100%
rename from collects/htdch/graphics/CommandSequence.java
rename to collects/profj/htdch/graphics/CommandSequence.java
diff --git a/collects/htdch/graphics/DrawImage.djava b/collects/profj/htdch/graphics/DrawImage.djava
similarity index 90%
rename from collects/htdch/graphics/DrawImage.djava
rename to collects/profj/htdch/graphics/DrawImage.djava
index e8bf871de8..210b164021 100644
--- a/collects/htdch/graphics/DrawImage.djava
+++ b/collects/profj/htdch/graphics/DrawImage.djava
@@ -1,6 +1,6 @@
 package graphics;
 
-import scheme.lib.htdch.graphics.rename;
+import scheme.lib.profj.htdch.graphics.rename;
 import scheme.lib.mred.mred;
         
 public class DrawImage extends Command {
diff --git a/collects/htdch/graphics/DrawLine.djava b/collects/profj/htdch/graphics/DrawLine.djava
similarity index 90%
rename from collects/htdch/graphics/DrawLine.djava
rename to collects/profj/htdch/graphics/DrawLine.djava
index b0299f4fd7..7ed13d3066 100644
--- a/collects/htdch/graphics/DrawLine.djava
+++ b/collects/profj/htdch/graphics/DrawLine.djava
@@ -1,6 +1,6 @@
 package graphics;
 
-import scheme.lib.htdch.graphics.rename;
+import scheme.lib.profj.htdch.graphics.rename;
 
 public class DrawLine extends Command {
 
diff --git a/collects/htdch/graphics/DrawRectangle.djava b/collects/profj/htdch/graphics/DrawRectangle.djava
similarity index 92%
rename from collects/htdch/graphics/DrawRectangle.djava
rename to collects/profj/htdch/graphics/DrawRectangle.djava
index 2bdff0d3da..80071924df 100644
--- a/collects/htdch/graphics/DrawRectangle.djava
+++ b/collects/profj/htdch/graphics/DrawRectangle.djava
@@ -1,6 +1,6 @@
 package graphics;
 
-import scheme.lib.htdch.graphics.rename;
+import scheme.lib.profj.htdch.graphics.rename;
 
 public class DrawRectangle extends Command {
 
diff --git a/collects/htdch/graphics/EmptySeq.java b/collects/profj/htdch/graphics/EmptySeq.java
similarity index 100%
rename from collects/htdch/graphics/EmptySeq.java
rename to collects/profj/htdch/graphics/EmptySeq.java
diff --git a/collects/htdch/graphics/GameWorld.djava b/collects/profj/htdch/graphics/GameWorld.djava
similarity index 96%
rename from collects/htdch/graphics/GameWorld.djava
rename to collects/profj/htdch/graphics/GameWorld.djava
index 8a1d7867d6..4c25cc5966 100644
--- a/collects/htdch/graphics/GameWorld.djava
+++ b/collects/profj/htdch/graphics/GameWorld.djava
@@ -1,6 +1,6 @@
 package graphics;
 
-import scheme.lib.htdch.graphics.rename;
+import scheme.lib.profj.htdch.graphics.rename;
 import scheme.lib.mred.mred;
 
 public abstract class GameWorld extends World {
diff --git a/collects/htdch/graphics/Green.java b/collects/profj/htdch/graphics/Green.java
similarity index 100%
rename from collects/htdch/graphics/Green.java
rename to collects/profj/htdch/graphics/Green.java
diff --git a/collects/htdch/graphics/Image.djava b/collects/profj/htdch/graphics/Image.djava
similarity index 96%
rename from collects/htdch/graphics/Image.djava
rename to collects/profj/htdch/graphics/Image.djava
index 9b70d1003c..6af513b7b0 100644
--- a/collects/htdch/graphics/Image.djava
+++ b/collects/profj/htdch/graphics/Image.djava
@@ -2,7 +2,7 @@ package graphics;
 
 import scheme.lib.htdp.image;
 import scheme.lib.graphics.graphics;
-import scheme.lib.htdch.graphics.rename;
+import scheme.lib.profj.htdch.graphics.rename;
 
 public class Image {
   dynamic theImage;
diff --git a/collects/htdch/graphics/LargerSeq.java b/collects/profj/htdch/graphics/LargerSeq.java
similarity index 100%
rename from collects/htdch/graphics/LargerSeq.java
rename to collects/profj/htdch/graphics/LargerSeq.java
diff --git a/collects/htdch/graphics/Orange.java b/collects/profj/htdch/graphics/Orange.java
similarity index 100%
rename from collects/htdch/graphics/Orange.java
rename to collects/profj/htdch/graphics/Orange.java
diff --git a/collects/htdch/graphics/PictureFactory.djava b/collects/profj/htdch/graphics/PictureFactory.djava
similarity index 96%
rename from collects/htdch/graphics/PictureFactory.djava
rename to collects/profj/htdch/graphics/PictureFactory.djava
index 6e1141e822..29af8b8e52 100644
--- a/collects/htdch/graphics/PictureFactory.djava
+++ b/collects/profj/htdch/graphics/PictureFactory.djava
@@ -1,7 +1,7 @@
 package graphics;
 
 import scheme.lib.htdp.image;
-import scheme.lib.htdch.graphics.rename;
+import scheme.lib.profj.htdch.graphics.rename;
 
 public class PictureFactory {
 
diff --git a/collects/htdch/graphics/Posn.java b/collects/profj/htdch/graphics/Posn.java
similarity index 100%
rename from collects/htdch/graphics/Posn.java
rename to collects/profj/htdch/graphics/Posn.java
diff --git a/collects/htdch/graphics/Purple.java b/collects/profj/htdch/graphics/Purple.java
similarity index 100%
rename from collects/htdch/graphics/Purple.java
rename to collects/profj/htdch/graphics/Purple.java
diff --git a/collects/htdch/graphics/Red.java b/collects/profj/htdch/graphics/Red.java
similarity index 100%
rename from collects/htdch/graphics/Red.java
rename to collects/profj/htdch/graphics/Red.java
diff --git a/collects/htdch/graphics/View.djava b/collects/profj/htdch/graphics/View.djava
similarity index 98%
rename from collects/htdch/graphics/View.djava
rename to collects/profj/htdch/graphics/View.djava
index b3499b1a3d..f16d170ae5 100644
--- a/collects/htdch/graphics/View.djava
+++ b/collects/profj/htdch/graphics/View.djava
@@ -1,7 +1,7 @@
 package graphics;
 
 import scheme.lib.mred.mred;
-import scheme.lib.htdch.graphics.rename;
+import scheme.lib.profj.htdch.graphics.rename;
 
 public class View {
 
diff --git a/collects/htdch/graphics/White.java b/collects/profj/htdch/graphics/White.java
similarity index 100%
rename from collects/htdch/graphics/White.java
rename to collects/profj/htdch/graphics/White.java
diff --git a/collects/htdch/graphics/World.java b/collects/profj/htdch/graphics/World.java
similarity index 100%
rename from collects/htdch/graphics/World.java
rename to collects/profj/htdch/graphics/World.java
diff --git a/collects/htdch/graphics/Yellow.java b/collects/profj/htdch/graphics/Yellow.java
similarity index 100%
rename from collects/htdch/graphics/Yellow.java
rename to collects/profj/htdch/graphics/Yellow.java
diff --git a/collects/htdch/graphics/doc.txt b/collects/profj/htdch/graphics/doc.txt
similarity index 100%
rename from collects/htdch/graphics/doc.txt
rename to collects/profj/htdch/graphics/doc.txt
diff --git a/collects/htdch/graphics/info.ss b/collects/profj/htdch/graphics/info.ss
similarity index 100%
rename from collects/htdch/graphics/info.ss
rename to collects/profj/htdch/graphics/info.ss
diff --git a/collects/htdch/graphics/installer.ss b/collects/profj/htdch/graphics/installer.ss
similarity index 93%
rename from collects/htdch/graphics/installer.ss
rename to collects/profj/htdch/graphics/installer.ss
index 55e628f9f8..c666c108dc 100644
--- a/collects/htdch/graphics/installer.ss
+++ b/collects/profj/htdch/graphics/installer.ss
@@ -3,7 +3,7 @@
   (provide installer)
   
   (define (installer plthome)
-    (let ((draw-path (build-path (collection-path "htdch" "graphics"))))
+    (let ((draw-path (build-path (collection-path "profj" "htdch" "graphics"))))
       (let ((javac
              (lambda (file)
                (parameterize ([current-load-relative-directory draw-path]
diff --git a/collects/htdch/graphics/rename.ss b/collects/profj/htdch/graphics/rename.ss
similarity index 100%
rename from collects/htdch/graphics/rename.ss
rename to collects/profj/htdch/graphics/rename.ss
diff --git a/collects/htdch/idraw/Canvas-native-methods.ss b/collects/profj/htdch/idraw/Canvas-native-methods.ss
similarity index 81%
rename from collects/htdch/idraw/Canvas-native-methods.ss
rename to collects/profj/htdch/idraw/Canvas-native-methods.ss
index f604c31bf6..06f988a7c8 100644
--- a/collects/htdch/idraw/Canvas-native-methods.ss
+++ b/collects/profj/htdch/idraw/Canvas-native-methods.ss
@@ -1,6 +1,6 @@
 #lang scheme
 
-(require (lib "htdch/draw/support.scm")
+(require (lib "profj/htdch/draw/support.scm")
          mzlib/unit)
 
 (define void-or-true (void))
diff --git a/collects/htdch/idraw/Canvas.java b/collects/profj/htdch/idraw/Canvas.java
similarity index 100%
rename from collects/htdch/idraw/Canvas.java
rename to collects/profj/htdch/idraw/Canvas.java
diff --git a/collects/htdch/idraw/World-native-methods.ss b/collects/profj/htdch/idraw/World-native-methods.ss
similarity index 84%
rename from collects/htdch/idraw/World-native-methods.ss
rename to collects/profj/htdch/idraw/World-native-methods.ss
index fa760dd6eb..65b6a3c454 100644
--- a/collects/htdch/idraw/World-native-methods.ss
+++ b/collects/profj/htdch/idraw/World-native-methods.ss
@@ -1,5 +1,5 @@
 #lang scheme 
-  (require (lib "htdch/draw/support.scm")
+  (require (lib "profj/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/idraw/World.java b/collects/profj/htdch/idraw/World.java
similarity index 100%
rename from collects/htdch/idraw/World.java
rename to collects/profj/htdch/idraw/World.java
diff --git a/collects/htdch/idraw/doc.txt b/collects/profj/htdch/idraw/doc.txt
similarity index 100%
rename from collects/htdch/idraw/doc.txt
rename to collects/profj/htdch/idraw/doc.txt
diff --git a/collects/htdch/idraw/info.ss b/collects/profj/htdch/idraw/info.ss
similarity index 100%
rename from collects/htdch/idraw/info.ss
rename to collects/profj/htdch/idraw/info.ss
diff --git a/collects/htdch/idraw/installer.ss b/collects/profj/htdch/idraw/installer.ss
similarity index 86%
rename from collects/htdch/idraw/installer.ss
rename to collects/profj/htdch/idraw/installer.ss
index 017f4db82a..985f1ba00e 100644
--- a/collects/htdch/idraw/installer.ss
+++ b/collects/profj/htdch/idraw/installer.ss
@@ -3,7 +3,7 @@
   (provide installer)
 
   (define (installer plthome)
-    (let ((draw-path (build-path (collection-path "htdch" "idraw"))))
+    (let ((draw-path (build-path (collection-path "profj" "htdch" "idraw"))))
       (let ((javac
              (lambda (file)
                (parameterize ([current-load-relative-directory draw-path]
diff --git a/collects/htdch/idraw/pre-installer.ss b/collects/profj/htdch/idraw/pre-installer.ss
similarity index 100%
rename from collects/htdch/idraw/pre-installer.ss
rename to collects/profj/htdch/idraw/pre-installer.ss
diff --git a/collects/htdch/info.ss b/collects/profj/htdch/info.ss
similarity index 67%
rename from collects/htdch/info.ss
rename to collects/profj/htdch/info.ss
index 6fe073f5e6..c20fd45871 100644
--- a/collects/htdch/info.ss
+++ b/collects/profj/htdch/info.ss
@@ -3,4 +3,4 @@
 (define name "Java Teachpacks")
 
 (define compile-omit-paths '("Examples"))
-(define install-collection "installer.scm")
+#;(define install-collection "installer.scm")
diff --git a/collects/htdch/installer.scm b/collects/profj/htdch/installer.scm
similarity index 93%
rename from collects/htdch/installer.scm
rename to collects/profj/htdch/installer.scm
index 421af89e65..616005c355 100644
--- a/collects/htdch/installer.scm
+++ b/collects/profj/htdch/installer.scm
@@ -12,4 +12,4 @@
   (color:installer plthome)
   (draw:installer  plthome)
   (idraw:installer plthome)
-  (graph:installer plthome))
+  #;(graph:installer plthome))
diff --git a/collects/profj/installer.ss b/collects/profj/installer.ss
index 39f20a4d1a..5bbde99eec 100644
--- a/collects/profj/installer.ss
+++ b/collects/profj/installer.ss
@@ -3,6 +3,7 @@
            (prefix io: profj/libs/java/io/installer)
            (prefix test: profj/libs/java/tester/installer)
            (prefix util: profj/libs/java/util/installer)
+           (prefix htdch: (lib "installer.scm" "profj" "htdch"))
            )
   (provide installer)
 
@@ -10,4 +11,5 @@
     (io:installer plthome)
     (lang:installer plthome)
     (test:installer plthome)
-    (util:installer plthome)))
+    (util:installer plthome)
+    (htdch:installer plthome)))
diff --git a/collects/profj/profj-pref.ss b/collects/profj/profj-pref.ss
index a143469b9d..7b800d3db5 100644
--- a/collects/profj/profj-pref.ss
+++ b/collects/profj/profj-pref.ss
@@ -10,7 +10,7 @@
                   (get-preference 'projf:classpath (lambda () null)))
             (map (lambda (p) (build-path p "profj" "libs"))
                  (current-library-collection-paths))
-            (map (lambda (p) (build-path p "htdch"))
+            (map (lambda (p) (build-path p "profj" "htdch"))
                  (current-library-collection-paths))))
   
   ;reset-classpath: -> void