Restructure packages a bit