Description of problem:

Version-Release number of selected component (if applicable):
all

How reproducible:
n/a

The download tree is starting to deviate from the standard.

The root level will contain the overall package sets.
[core|extras|alternatives|3rd party|...]

Each of these package sets will contain subsets of packages in
differentstates of development.  The numbered release will freeze
atapproximately 2-3 month intervals.  Development and Testing are
rollingreleases.
[1|2|...|development|test]

Each of these Releases may be compiled for a number of archs. 
[i386|i386_64|...]

Additionally, the numbered release will have updates and possibly
legacypackages.  Updates will continue for approximately 12 months and
thelegacy will continue as long as maintainers are interested.
[updates|legacy]
This should result in a tree looking as such.fedora
  -core
    -1
      -i386
      -i86_64
      -updates
        -i386
      -legacy
        -i386
     -2
      -i386
      -i86_64
    -development
      -i386
      -i386_64
    -test
       -i386
  -extras
    -1
      -i386
    -2
      -i386

There is already some deviance from this tree with
  -core
    -updates
      -1
      -testing

Because each numbered release will contain updates, updates should be
achild of it's numbered parent.  -updates/test either needs to merge
into-test or -1/updates.