[2] Integration of the main and the installer

Integration of the main and the installer