Moved providers into separate folder