Restructured in order to use install script