Reorganize, new install script