changed packaging (some test failures yet)