Refactoring based on the moving of classes
Authored by: hotzst 2009-09-30
Parent: [r2507]
Child: [r2509]