rename package, cleanup