Add Travis script + re-organize bits and pieces