Removed variable class to factory for dataprovider
Changed dependency stuff to factory model
Added factories
Adding some changes advised by scrut
Refactor for duplication issues
Merge pull request #28 from arnovr/fix-adapter-dependency

Fix adapter dependency