Correct references after move of Manifest into storage package