added classes for provider glass, moved some classes around