Refactoring file layout
Travis CI dependencies