Move providers into separate packages