Move back to many packages as deps