Rename package, reformat code.