Refactoring based on the moving of three classes
Authored by: hotzst 2009-08-24
Parent: [r2055]
Child: [r2057]