Big refactory install to include news packages install options