factory package reorganisation