mover provider classes to new package