Streamlined package hierachy

Signed-off-by: Thomas Pasch <thomas.pasch@gmx.de>