Added cleanup script.
Rename package