Remove depreciated hooks
Move into Spree namespace