removed unused code. moved classes
Authored by: panneck-conradi 2013-11-23
Parent: [r119]
Child: [r121]