First refactor and modularizing of installation options