trying to pack everything in a custom class file, still work to do

Signed-off-by: Thomas Quaritsch <t.quaritsch@gmail.com>