Moving more stuff to new install script