Re-organized installation instructions in two steps