Reorganized install script