preparation for gap filling; package reorganisation