Start adjusting the project structures. Not finished yet....
Merge branch 'master' of https://github.com/sachafournier/pact