Update/Organize pom and update travis