Restructure install commands