Restructuring travis script