Rearranged some packages including blocks and items