Re-structure Providers into their own namespace