Change to handle new GitHub structure