Moved some files around to let a system test pass.
Authored by: bugman 2008-09-26
Parent: [r7396]
Child: [r7398]