Updated and working so far

-Add Travis
-Reorgnised