Restructuring master for Travis convention