Improved C/C++ choice in wizard + conf + new src-gen files