Restructured install script