John, Balaji: package restructurings