Restructure travis file