rework installer, adding optional modules