Renamed package and reformatted generated code.