CFY-1231 start moving things around with the final goal of having all provider specific related code isolated and put in deprecated mode