Further refactored code of NewProjectWizard to ease reuse
Regenerated CS with current SDK