Package changes, cleanup