Moved custom providers to their own place; extended provider names in Providers