Reorg and simpler install.sh