diff --git a/pkgs/distro-build-pkgs/distro-build-client/LICENSE.txt b/distro-build-client/LICENSE.txt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-client/LICENSE.txt
rename to distro-build-client/LICENSE.txt
diff --git a/pkgs/distro-build-pkgs/distro-build-client/display-time.rkt b/distro-build-client/display-time.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-client/display-time.rkt
rename to distro-build-client/display-time.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build-client/doc.txt b/distro-build-client/doc.txt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-client/doc.txt
rename to distro-build-client/doc.txt
diff --git a/pkgs/distro-build-pkgs/distro-build-client/info.rkt b/distro-build-client/info.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-client/info.rkt
rename to distro-build-client/info.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build-client/installer-dmg.rkt b/distro-build-client/installer-dmg.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-client/installer-dmg.rkt
rename to distro-build-client/installer-dmg.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build-client/installer-exe.rkt b/distro-build-client/installer-exe.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-client/installer-exe.rkt
rename to distro-build-client/installer-exe.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build-client/installer-pkg.rkt b/distro-build-client/installer-pkg.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-client/installer-pkg.rkt
rename to distro-build-client/installer-pkg.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build-client/installer-sh.rkt b/distro-build-client/installer-sh.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-client/installer-sh.rkt
rename to distro-build-client/installer-sh.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build-client/installer-tgz.rkt b/distro-build-client/installer-tgz.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-client/installer-tgz.rkt
rename to distro-build-client/installer-tgz.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build-client/installer.rkt b/distro-build-client/installer.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-client/installer.rkt
rename to distro-build-client/installer.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build-client/macosx-installer/pkg-bg.png b/distro-build-client/macosx-installer/pkg-bg.png
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-client/macosx-installer/pkg-bg.png
rename to distro-build-client/macosx-installer/pkg-bg.png
diff --git a/pkgs/distro-build-pkgs/distro-build-client/macosx-installer/racket-rising.png b/distro-build-client/macosx-installer/racket-rising.png
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-client/macosx-installer/racket-rising.png
rename to distro-build-client/macosx-installer/racket-rising.png
diff --git a/pkgs/distro-build-pkgs/distro-build-client/set-config.rkt b/distro-build-client/set-config.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-client/set-config.rkt
rename to distro-build-client/set-config.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build-client/unix-installer/installer-header b/distro-build-client/unix-installer/installer-header
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-client/unix-installer/installer-header
rename to distro-build-client/unix-installer/installer-header
diff --git a/pkgs/distro-build-pkgs/distro-build-client/unpack-collects.rkt b/distro-build-client/unpack-collects.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-client/unpack-collects.rkt
rename to distro-build-client/unpack-collects.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build-client/windows-installer/header-r.bmp b/distro-build-client/windows-installer/header-r.bmp
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-client/windows-installer/header-r.bmp
rename to distro-build-client/windows-installer/header-r.bmp
diff --git a/pkgs/distro-build-pkgs/distro-build-client/windows-installer/header.bmp b/distro-build-client/windows-installer/header.bmp
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-client/windows-installer/header.bmp
rename to distro-build-client/windows-installer/header.bmp
diff --git a/pkgs/distro-build-pkgs/distro-build-client/windows-installer/installer.ico b/distro-build-client/windows-installer/installer.ico
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-client/windows-installer/installer.ico
rename to distro-build-client/windows-installer/installer.ico
diff --git a/pkgs/distro-build-pkgs/distro-build-client/windows-installer/uninstaller.ico b/distro-build-client/windows-installer/uninstaller.ico
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-client/windows-installer/uninstaller.ico
rename to distro-build-client/windows-installer/uninstaller.ico
diff --git a/pkgs/distro-build-pkgs/distro-build-client/windows-installer/welcome.bmp b/distro-build-client/windows-installer/welcome.bmp
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-client/windows-installer/welcome.bmp
rename to distro-build-client/windows-installer/welcome.bmp
diff --git a/pkgs/distro-build-pkgs/distro-build-lib/LICENSE.txt b/distro-build-lib/LICENSE.txt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-lib/LICENSE.txt
rename to distro-build-lib/LICENSE.txt
diff --git a/pkgs/distro-build-pkgs/distro-build-lib/info.rkt b/distro-build-lib/info.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-lib/info.rkt
rename to distro-build-lib/info.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build-server/LICENSE.txt b/distro-build-server/LICENSE.txt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-server/LICENSE.txt
rename to distro-build-server/LICENSE.txt
diff --git a/pkgs/distro-build-pkgs/distro-build-server/assemble-site.rkt b/distro-build-server/assemble-site.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-server/assemble-site.rkt
rename to distro-build-server/assemble-site.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build-server/config.rkt b/distro-build-server/config.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-server/config.rkt
rename to distro-build-server/config.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build-server/download-page.rkt b/distro-build-server/download-page.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-server/download-page.rkt
rename to distro-build-server/download-page.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build-server/drive-clients.rkt b/distro-build-server/drive-clients.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-server/drive-clients.rkt
rename to distro-build-server/drive-clients.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build-server/email.rkt b/distro-build-server/email.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-server/email.rkt
rename to distro-build-server/email.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build-server/indexes.rkt b/distro-build-server/indexes.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-server/indexes.rkt
rename to distro-build-server/indexes.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build-server/info.rkt b/distro-build-server/info.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-server/info.rkt
rename to distro-build-server/info.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build-server/install-for-docs.rkt b/distro-build-server/install-for-docs.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-server/install-for-docs.rkt
rename to distro-build-server/install-for-docs.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build-server/install-pkgs.rkt b/distro-build-server/install-pkgs.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-server/install-pkgs.rkt
rename to distro-build-server/install-pkgs.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build-server/manage-snapshots.rkt b/distro-build-server/manage-snapshots.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-server/manage-snapshots.rkt
rename to distro-build-server/manage-snapshots.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build-server/pack-built.rkt b/distro-build-server/pack-built.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-server/pack-built.rkt
rename to distro-build-server/pack-built.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build-server/pack-collects.rkt b/distro-build-server/pack-collects.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-server/pack-collects.rkt
rename to distro-build-server/pack-collects.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build-server/pkg-info.rkt b/distro-build-server/pkg-info.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-server/pkg-info.rkt
rename to distro-build-server/pkg-info.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build-server/readme.rkt b/distro-build-server/readme.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-server/readme.rkt
rename to distro-build-server/readme.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build-server/serve-catalog.rkt b/distro-build-server/serve-catalog.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-server/serve-catalog.rkt
rename to distro-build-server/serve-catalog.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build-server/set-server-config.rkt b/distro-build-server/set-server-config.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-server/set-server-config.rkt
rename to distro-build-server/set-server-config.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build-server/url-options.rkt b/distro-build-server/url-options.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build-server/url-options.rkt
rename to distro-build-server/url-options.rkt
diff --git a/pkgs/distro-build-pkgs/distro-build/LICENSE.txt b/distro-build/LICENSE.txt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build/LICENSE.txt
rename to distro-build/LICENSE.txt
diff --git a/pkgs/distro-build-pkgs/distro-build/info.rkt b/distro-build/info.rkt
similarity index 100%
rename from pkgs/distro-build-pkgs/distro-build/info.rkt
rename to distro-build/info.rkt