package rename plus small changes to MainExample