massive rework of packages etc