further reorganisation, multiple changes for structuring package