Service Providers

Move service providers out of models namespace.