First cut with renamed packages