Fixed #125
Fixed #124
Moved some files around
Updated travisCI with the new path
Updated readme