refactoring to level 2 - more to come
Authored by: vsp_neumann 2010-10-29
Parent: [r13222]
Child: [r13224]