Merge pull request #19 from louridas/master

fix directory structure
Merge pull request #20 from louridas/master

fix tests
make providers json work (and update pkgs)