move more usecase-specific classes in the relevant packages
Authored by: thibautd 2015-05-13
Parent: [r33129]
Child: [r33131]