REMOVED: unused directory.
CHANGED: Generics improved.

Signed-off-by: Michael Grammling <m.grammling@external.telekom.de>