Updated dependencies

As said in the previous pull request, I updated only the dependencies, keeping original project layout.

Thanks for your help!