diff --git a/collects/meta/build/build b/collects/meta/build/build
index 2b603c8d69..ba8eb16c3d 100755
--- a/collects/meta/build/build
+++ b/collects/meta/build/build
@@ -1922,7 +1922,7 @@ BUILD_WEB() {
   _rmcd "$maindir/$webdir"
   local webflags=""
   webflags="$webflags -w -f -o $maindir/$webdir"
-  webflags="$webflags -e $maindir/$internaldir/web/main.rkt"
+  webflags="$webflags -e $maindir/$internaldir/web/all.rkt"
   # distribute only if this is a normal build
   if [[ "$prewebdir" = "$prewebdir_default" ]]; then
     separator "Making and distributing web content"
diff --git a/collects/meta/web/README b/collects/meta/web/README
index be6e6c259d..201017f07c 100644
--- a/collects/meta/web/README
+++ b/collects/meta/web/README
@@ -4,7 +4,13 @@
 
 * download: content of download site (only installer pages and such)
 
-* minis: smaller sites which are implemented in one-file each.
+* */all.rkt: files that just require all the necessary modules to build
+  the ahole site
+
+* */resources.rkt: files that define the resources for a site (icon,
+  css, logo)
+
+* minis: smaller sites which are implemented in one-file each
 
 * stubs: template "sites" that are intended to be hooked into other
   systems to get the plt look.
diff --git a/collects/meta/web/navbar.rkt b/collects/meta/web/all.rkt
similarity index 56%
rename from collects/meta/web/navbar.rkt
rename to collects/meta/web/all.rkt
index ad73ff38a7..ba4ade335a 100644
--- a/collects/meta/web/navbar.rkt
+++ b/collects/meta/web/all.rkt
@@ -1,5 +1,5 @@
 #lang meta/web
 
-(require "www/main.rkt" "download/main.rkt" "minis/main.rkt" "stubs/main.rkt")
+(require "www/all.rkt" "download/all.rkt" "minis/all.rkt" "stubs/all.rkt")
 (set-navbar! (list main download -docs planet community learning)
              help)
diff --git a/collects/meta/web/build.rkt b/collects/meta/web/build.rkt
index 689707974a..d649256f9a 100755
--- a/collects/meta/web/build.rkt
+++ b/collects/meta/web/build.rkt
@@ -8,7 +8,7 @@ exec "$exe" "$0" "$@"
 #lang racket/base
 
 (require racket/cmdline racket/runtime-path racket/file scribble/html
-         "common/distribute.rkt" "config.rkt" "navbar.rkt")
+         "common/distribute.rkt" "config.rkt" "all.rkt")
 
 (define build-mode #f)
 (define output-dir (current-directory))
diff --git a/collects/meta/web/common/resources.rkt b/collects/meta/web/common/resources.rkt
index 02a299f54e..7535b5ecba 100644
--- a/collects/meta/web/common/resources.rkt
+++ b/collects/meta/web/common/resources.rkt
@@ -6,7 +6,7 @@
 ;; sites.  They could be included from a single place, but then when one
 ;; machine crashes the rest won't work right.  (Note: do not add
 ;; resources that are specific to only one site here, do so in the
-;; site's shared.rkt file)
+;; site's "resources.rkt" file)
 
 (require "utils.ss")
 
diff --git a/collects/meta/web/download/all.rkt b/collects/meta/web/download/all.rkt
new file mode 100644
index 0000000000..e4a1a410d0
--- /dev/null
+++ b/collects/meta/web/download/all.rkt
@@ -0,0 +1,3 @@
+#lang racket/base
+
+(require "index.rkt" "version.rkt")
diff --git a/collects/meta/web/download/download-pages.rkt b/collects/meta/web/download/download-pages.rkt
index 7a0e3f3532..5d8c8360c4 100644
--- a/collects/meta/web/download/download-pages.rkt
+++ b/collects/meta/web/download/download-pages.rkt
@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt" "data.rkt" "installer-pages.rkt"
+(require "resources.rkt" "data.rkt" "installer-pages.rkt"
          (prefix-in pre: "../stubs/pre.rkt"))
 
 (provide render-download-page)
diff --git a/collects/meta/web/download/index.rkt b/collects/meta/web/download/index.rkt
index d0279b09e1..5b2d0ccdb4 100644
--- a/collects/meta/web/download/index.rkt
+++ b/collects/meta/web/download/index.rkt
@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt" "data.rkt" "../www/download.rkt")
+(require "resources.rkt" "data.rkt" "../www/download.rkt")
 
 (define (in-ftp . paths)
   (string-join (cons "/var/ftp/pub/racket" paths) "/"))
diff --git a/collects/meta/web/download/installer-pages.rkt b/collects/meta/web/download/installer-pages.rkt
index a8498d025e..5cdc06f995 100644
--- a/collects/meta/web/download/installer-pages.rkt
+++ b/collects/meta/web/download/installer-pages.rkt
@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt" "data.rkt")
+(require "resources.rkt" "data.rkt")
 
 (define (render-installer-page installer)
   (define path (installer-path installer))
diff --git a/collects/meta/web/download/main.rkt b/collects/meta/web/download/main.rkt
deleted file mode 100644
index 183932f458..0000000000
--- a/collects/meta/web/download/main.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-
-(require "shared.rkt" "index.rkt" "version.rkt")
diff --git a/collects/meta/web/download/shared.rkt b/collects/meta/web/download/resources.rkt
similarity index 100%
rename from collects/meta/web/download/shared.rkt
rename to collects/meta/web/download/resources.rkt
diff --git a/collects/meta/web/download/version.rkt b/collects/meta/web/download/version.rkt
index a97a3c6363..8498cc2876 100644
--- a/collects/meta/web/download/version.rkt
+++ b/collects/meta/web/download/version.rkt
@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt" "data.rkt")
+(require "resources.rkt" "data.rkt")
 
 (define version.txt
   (plain (format "~s" `((recent ,current-version) (stable ,current-version)))))
diff --git a/collects/meta/web/minis/main.rkt b/collects/meta/web/minis/all.rkt
similarity index 100%
rename from collects/meta/web/minis/main.rkt
rename to collects/meta/web/minis/all.rkt
diff --git a/collects/meta/web/minis/bugs.rkt b/collects/meta/web/minis/bugs.rkt
index 188f78f86e..ae0d694b44 100644
--- a/collects/meta/web/minis/bugs.rkt
+++ b/collects/meta/web/minis/bugs.rkt
@@ -42,7 +42,7 @@
       @option[selected: 'true value: (caddr s)]{@(cadr s)}
       @option[value: (cadr s)]{@(car s)})))
 
-(require "../www/main.rkt")
+(require (only-in "../www/all.rkt" download))
 
 (define (cgi-link from . to)
   (apply symlink (format "/www/cgi-bin/~a" from) to))
diff --git a/collects/meta/web/minis/drracket.rkt b/collects/meta/web/minis/drracket.rkt
index 1bd9932b67..96ee0b91d3 100644
--- a/collects/meta/web/minis/drracket.rkt
+++ b/collects/meta/web/minis/drracket.rkt
@@ -9,7 +9,7 @@
 (define index
   (page #:title "DrRacket" #:extra-headers (delay headers) (center-div logo)))
 
-(require (only-in "../www/main.rkt" main))
+(require (only-in "../www/all.rkt" main))
 
 (define (logo)
   (define (text->lines text)
diff --git a/collects/meta/web/stubs/main.rkt b/collects/meta/web/stubs/all.rkt
similarity index 100%
rename from collects/meta/web/stubs/main.rkt
rename to collects/meta/web/stubs/all.rkt
diff --git a/collects/meta/web/stubs/blog.rkt b/collects/meta/web/stubs/blog.rkt
index 2c23918195..c3646caa7b 100644
--- a/collects/meta/web/stubs/blog.rkt
+++ b/collects/meta/web/stubs/blog.rkt
@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require (prefix-in www: (only-in "../www/shared.rkt" the-resources))
+(require (prefix-in www: (only-in "../www/resources.rkt" the-resources))
          racket/port)
 
 (define-context "stubs/blog" #:resources www:the-resources)
diff --git a/collects/meta/web/stubs/dirlist.rkt b/collects/meta/web/stubs/dirlist.rkt
index 692bf28548..54f4765779 100644
--- a/collects/meta/web/stubs/dirlist.rkt
+++ b/collects/meta/web/stubs/dirlist.rkt
@@ -2,7 +2,7 @@
 
 ;; This stub is to generate fancy directory listings with the Racket style
 
-(require (prefix-in dnld: (only-in "../download/shared.rkt" the-resources)))
+(require (prefix-in dnld: (only-in "../download/resources.rkt" the-resources)))
 
 (define-context "stubs/dirlist" #:resources dnld:the-resources)
 
diff --git a/collects/meta/web/stubs/wiki.rkt b/collects/meta/web/stubs/wiki.rkt
index d7f44d786f..11c3f29732 100644
--- a/collects/meta/web/stubs/wiki.rkt
+++ b/collects/meta/web/stubs/wiki.rkt
@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require (prefix-in www: (only-in "../www/shared.rkt" the-resources)))
+(require (prefix-in www: (only-in "../www/resources.rkt" the-resources)))
 
 (define-context "stubs/wiki" #:resources www:the-resources)
 
diff --git a/collects/meta/web/www/main.rkt b/collects/meta/web/www/all.rkt
similarity index 100%
rename from collects/meta/web/www/main.rkt
rename to collects/meta/web/www/all.rkt
diff --git a/collects/meta/web/www/bib.rkt b/collects/meta/web/www/bib.rkt
index 7e54b00dd0..50c74ad0d8 100644
--- a/collects/meta/web/www/bib.rkt
+++ b/collects/meta/web/www/bib.rkt
@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt")
+(require "resources.rkt")
 
 ;; bib values are hash tables mapping field names (symbols) to strings.
 ;; Keywords can also be used for the field names, which makes them meta-fields
diff --git a/collects/meta/web/www/code.rkt b/collects/meta/web/www/code.rkt
index 3622a4d844..9eb09a2b76 100644
--- a/collects/meta/web/www/code.rkt
+++ b/collects/meta/web/www/code.rkt
@@ -1,7 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt"
-         syntax-color/module-lexer setup/xref scribble/xref)
+(require syntax-color/module-lexer setup/xref scribble/xref)
 
 (provide code)
 
diff --git a/collects/meta/web/www/community.rkt b/collects/meta/web/www/community.rkt
index 156bef72fa..074459e8bd 100644
--- a/collects/meta/web/www/community.rkt
+++ b/collects/meta/web/www/community.rkt
@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt" "people.rkt" "irc.rkt"
+(require "resources.rkt" "people.rkt" "irc.rkt"
          "../minis/lists.rkt"
          "../stubs/blog.rkt" "../stubs/git.rkt"
          (prefix-in pre: "../stubs/pre.rkt"))
diff --git a/collects/meta/web/www/download.rkt b/collects/meta/web/www/download.rkt
index 36098621c5..a9d3eb2e01 100644
--- a/collects/meta/web/www/download.rkt
+++ b/collects/meta/web/www/download.rkt
@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt" "../download/download-pages.rkt")
+(require "resources.rkt" "../download/download-pages.rkt")
 
 (provide download-button download)
 
diff --git a/collects/meta/web/www/guidelines.rkt b/collects/meta/web/www/guidelines.rkt
index 6672cc4948..074b32aa4c 100644
--- a/collects/meta/web/www/guidelines.rkt
+++ b/collects/meta/web/www/guidelines.rkt
@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt")
+(require "resources.rkt")
 
 (define styles
   @style/inline{
diff --git a/collects/meta/web/www/help.rkt b/collects/meta/web/www/help.rkt
index a1733b752d..fb5bc0c236 100644
--- a/collects/meta/web/www/help.rkt
+++ b/collects/meta/web/www/help.rkt
@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt" "community.rkt")
+(require "resources.rkt" "community.rkt")
 
 (provide help)
 (define help
diff --git a/collects/meta/web/www/index.rkt b/collects/meta/web/www/index.rkt
index 70ed3f8196..f90c4151f8 100644
--- a/collects/meta/web/www/index.rkt
+++ b/collects/meta/web/www/index.rkt
@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt" "code.rkt" "download.rkt" "learning.rkt")
+(require "resources.rkt" "code.rkt" "download.rkt" "learning.rkt")
 
 (define (doc s)
   (string-append "http://docs.racket-lang.org/" s))
diff --git a/collects/meta/web/www/irc.rkt b/collects/meta/web/www/irc.rkt
index e25c3ccfc7..5e10970200 100644
--- a/collects/meta/web/www/irc.rkt
+++ b/collects/meta/web/www/irc.rkt
@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt")
+(require "resources.rkt")
 
 (provide irc-quick)
 
diff --git a/collects/meta/web/www/learning.rkt b/collects/meta/web/www/learning.rkt
index e0ecadfd28..42852f3f79 100644
--- a/collects/meta/web/www/learning.rkt
+++ b/collects/meta/web/www/learning.rkt
@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt" "people.rkt" "techreports.rkt")
+(require "resources.rkt" "people.rkt" "techreports.rkt")
 
 (provide learning)
 (define learning
diff --git a/collects/meta/web/www/new-name.rkt b/collects/meta/web/www/new-name.rkt
index e04c063cb7..4c1b0cefc8 100644
--- a/collects/meta/web/www/new-name.rkt
+++ b/collects/meta/web/www/new-name.rkt
@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt")
+(require "resources.rkt")
 
 (define name i)
 
diff --git a/collects/meta/web/www/people.rkt b/collects/meta/web/www/people.rkt
index cbd9cb62b5..a10ce4bda1 100644
--- a/collects/meta/web/www/people.rkt
+++ b/collects/meta/web/www/people.rkt
@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt")
+(require "resources.rkt")
 
 (define (make-all place person)
   ;; The first person in a place is the one responsible for it
diff --git a/collects/meta/web/www/shared.rkt b/collects/meta/web/www/resources.rkt
similarity index 100%
rename from collects/meta/web/www/shared.rkt
rename to collects/meta/web/www/resources.rkt
diff --git a/collects/meta/web/www/techreports.rkt b/collects/meta/web/www/techreports.rkt
index b8811edcea..11ee7835f4 100644
--- a/collects/meta/web/www/techreports.rkt
+++ b/collects/meta/web/www/techreports.rkt
@@ -1,6 +1,6 @@
 #lang meta/web
 
-(require "shared.rkt" "people.rkt" "../download/data.rkt"
+(require "resources.rkt" "people.rkt" "../download/data.rkt"
          "bib.rkt" (prefix-in - version/utils))
 
 ;; New style TR entries -------------------------------------------------------