Big updates to layout, gave each provider its own namespace and service area enum.