Modularize install generator correctly