More on /staging, and some top-level organization