reorganisation into a package