Changed the file structure. Updated the Travis script