First commit to adjust the installation; The next step is add support to module verification