Refactored FileProvider
Merge pull request #167 from nmusienko/new_providers

Refactored FileProvider