Reorder install steps