generate Wrapper and Proxy in 1 bsv file.  Changed selected filenames when conflicts